On Wed, Dec 22, 2021 at 04:33:11PM +0100, Joerg Jung wrote: > > Am 20.12.2021 um 20:02 schrieb Crystal Kolipe <[email protected]>: > > > > Surf 2.1 was released seven months ago, but we still have 2.0 in ports. > > Thanks, I’ll take care soon. > > > Patch attached. > > <surf_2.0_2.1>
Your diff had multiple issues, i.e. not needed REVISION, missing PLIST update etc. and it did not compile (for me) at all. Please find below a better one for testing, which seems to work fine. OKs? Regards, Joerg Index: Makefile =================================================================== RCS file: /cvs/ports/www/surf/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 12 Jul 2019 20:51:06 -0000 1.26 +++ Makefile 22 Dec 2021 22:21:35 -0000 @@ -2,10 +2,9 @@ COMMENT = simple webbrowser based on webkit/gtk+ -DISTNAME = surf-2.0 +DISTNAME = surf-2.1 CATEGORIES = www HOMEPAGE = http://surf.suckless.org/ -REVISION = 1 MAINTAINER= Joerg Jung <[email protected]> Index: distinfo =================================================================== RCS file: /cvs/ports/www/surf/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 26 May 2017 20:37:56 -0000 1.7 +++ distinfo 22 Dec 2021 22:21:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (surf-2.0.tar.gz) = +u5MemLDj8l5Hv8a0GeHw8myt58ziAaCf1FSp7xUlR0= -SIZE (surf-2.0.tar.gz) = 19056 +SHA256 (surf-2.1.tar.gz) = cuWCkguiWmRiA+k8LSMx2H8DA3ooiU1sfpmvAO4EMlc= +SIZE (surf-2.1.tar.gz) = 22555 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/www/surf/patches/patch-Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile --- patches/patch-Makefile 23 Dec 2015 20:40:03 -0000 1.1 +++ patches/patch-Makefile 22 Dec 2021 22:21:35 -0000 @@ -1,44 +1,30 @@ $OpenBSD: patch-Makefile,v 1.1 2015/12/23 20:40:03 jung Exp $ ---- Makefile.orig Sat Dec 19 20:52:53 2015 -+++ Makefile Sat Dec 19 20:55:19 2015 -@@ -15,8 +15,7 @@ options: - @echo "CC = ${CC}" - - .c.o: -- @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ ${CC} -c ${CFLAGS} $< - - ${OBJ}: config.h config.mk - -@@ -25,8 +24,7 @@ config.h: - @cp config.def.h $@ - - surf: ${OBJ} -- @echo CC -o $@ -- @${CC} -o $@ surf.o ${LDFLAGS} -+ ${CC} -o $@ surf.o ${LDFLAGS} - - clean: - @echo cleaning -@@ -43,14 +41,12 @@ dist: clean - @rm -rf surf-${VERSION} +Index: Makefile +--- Makefile.orig ++++ Makefile +@@ -53,17 +53,14 @@ dist: distclean + rm -rf surf-$(VERSION) install: all -- @echo installing executable file to ${DESTDIR}${PREFIX}/bin -- @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f surf ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf -- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 -- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 -- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 -- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 +- mkdir -p $(DESTDIR)$(PREFIX)/bin +- cp -f surf $(DESTDIR)$(PREFIX)/bin +- chmod 755 $(DESTDIR)$(PREFIX)/bin/surf +- mkdir -p $(DESTDIR)$(LIBDIR) +- cp -f $(WLIB) $(DESTDIR)$(LIBDIR) +- for wlib in $(WLIB); do \ +- chmod 644 $(DESTDIR)$(LIBDIR)/$$wlib; \ +- done +- mkdir -p $(DESTDIR)$(MANPREFIX)/man1 +- sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 +- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 + ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} surf ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LIBDIR) ++ ${BSD_INSTALL_DATA} $(WLIB) $(DESTDIR)$(LIBDIR) + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1 + sed "s/VERSION/${VERSION}/g" < surf.1 > surf.1.tmp + mv surf.1.tmp surf.1 + ${BSD_INSTALL_MAN} surf.1 ${DESTDIR}${MANPREFIX}/man1 uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin + rm -f $(DESTDIR)$(PREFIX)/bin/surf Index: patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/www/surf/patches/patch-config_def_h,v retrieving revision 1.5 diff -u -p -r1.5 patch-config_def_h --- patches/patch-config_def_h 26 May 2017 20:37:56 -0000 1.5 +++ patches/patch-config_def_h 22 Dec 2021 22:21:35 -0000 @@ -2,21 +2,12 @@ $OpenBSD: patch-config_def_h,v 1.5 2017/ Index: config.def.h --- config.def.h.orig +++ config.def.h -@@ -30,7 +30,7 @@ static Parameter defconfig[ParameterLast] = { - SETB(SiteQuirks, 1), - SETB(SpellChecking, 0), - SETV(SpellLanguages, ((char *[]){ "en_US", NULL })), -- SETB(StrictSSL, 0), -+ SETB(StrictSSL, 1), - SETB(Style, 1), - SETF(ZoomLevel, 1.0), - }; -@@ -58,7 +58,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTION +@@ -76,7 +76,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTION + /* DOWNLOAD(URI, referer) */ - #define DOWNLOAD(d, r) { \ - .v = (const char *[]){ "/bin/sh", "-c", \ -- "st -e /bin/sh -c \"curl -g -L -J -O --user-agent '$1'" \ -+ "xterm -e /bin/sh -c \"curl -g -L -J -O --user-agent '$1'" \ - " --referer '$2' -b $3 -c $3 '$0';" \ - " sleep 5;\"", \ - d, useragent, r, cookiefile, NULL \ + #define DOWNLOAD(u, r) { \ +- .v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\ ++ .v = (const char *[]){ "xterm", "-e", "/bin/sh", "-c",\ + "curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \ + " -e \"$3\" \"$4\"; read", \ + "surf-download", useragent, cookiefile, r, u, NULL \ Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/www/surf/patches/patch-config_mk,v retrieving revision 1.8 diff -u -p -r1.8 patch-config_mk --- patches/patch-config_mk 26 May 2017 20:37:56 -0000 1.8 +++ patches/patch-config_mk 22 Dec 2021 22:21:35 -0000 @@ -2,44 +2,14 @@ $OpenBSD: patch-config_mk,v 1.8 2017/05/ Index: config.mk --- config.mk.orig +++ config.mk -@@ -4,28 +4,28 @@ VERSION = 2.0 +@@ -4,8 +4,8 @@ VERSION = 2.1 # Customize below to fit your system # paths -PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man +-MANPREFIX = $(PREFIX)/share/man +PREFIX ?= /usr/local -+MANPREFIX = ${PREFIX}/man - LIBPREFIX = ${PREFIX}/lib/surf ++MANPREFIX ?= $(PREFIX)/man + LIBPREFIX = $(PREFIX)/lib + LIBDIR = $(LIBPREFIX)/surf --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = ${X11BASE}/include -+X11LIB = ${X11BASE}/lib - --GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0` --GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0` -+GTKINC != pkg-config --cflags gtk+-3.0 webkit2gtk-4.0 -+GTKLIB != pkg-config --libs gtk+-3.0 webkit2gtk-4.0 - - # includes and libs --INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 -+INCS = -I${X11INC} ${GTKINC} -+LIBS = -L${X11LIB} -lX11 ${GTKLIB} - - # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CPPFLAGS += -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE -+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} -+LDFLAGS += ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+#CC = cc Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/surf/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 23 Jun 2017 19:50:42 -0000 1.2 +++ pkg/PLIST 22 Dec 2021 22:21:35 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.2 2017/06/23 19:50:42 czarkoff Exp $ @pkgpath www/surf2 @bin bin/surf +lib/surf/ +@so lib/surf/webext-surf.so @man man/man1/surf.1
