Surf 2.1 was released seven months ago, but we still have 2.0 in ports.
Patch attached.
diff -ur surf.dist/Makefile surf/Makefile --- surf.dist/Makefile Fri Jul 12 17:51:06 2019 +++ surf/Makefile Mon Dec 20 15:19:39 2021 @@ -2,10 +2,10 @@ COMMENT = simple webbrowser based on webkit/gtk+ -DISTNAME = surf-2.0 +DISTNAME = surf-2.1 CATEGORIES = www HOMEPAGE = http://surf.suckless.org/ -REVISION = 1 +REVISION = 0 MAINTAINER= Joerg Jung <j...@openbsd.org> diff -ur surf.dist/distinfo surf/distinfo --- surf.dist/distinfo Fri May 26 17:37:56 2017 +++ surf/distinfo Mon Dec 20 13:59:06 2021 @@ -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 diff -ur surf.dist/patches/patch-Makefile surf/patches/patch-Makefile --- surf.dist/patches/patch-Makefile Wed Dec 23 17:40:03 2015 +++ surf/patches/patch-Makefile Mon Dec 20 14:26:38 2021 @@ -1,38 +1,20 @@ -$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}" +--- Makefile.dist Sun May 9 19:34:33 2021 ++++ Makefile Mon Dec 20 14:26:26 2021 +@@ -53,17 +53,12 @@ + rm -rf surf-$(VERSION) - .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} - 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_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1 @@ -41,4 +23,4 @@ + ${BSD_INSTALL_MAN} surf.1 ${DESTDIR}${MANPREFIX}/man1 uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin + rm -f $(DESTDIR)$(PREFIX)/bin/surf diff -ur surf.dist/patches/patch-config_def_h surf/patches/patch-config_def_h --- surf.dist/patches/patch-config_def_h Fri May 26 17:37:56 2017 +++ surf/patches/patch-config_def_h Mon Dec 20 14:30:20 2021 @@ -1,22 +1,11 @@ -$OpenBSD: patch-config_def_h,v 1.5 2017/05/26 20:37:56 jung Exp $ -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 +--- config.def.h.dist Sun May 9 19:34:33 2021 ++++ config.def.h Mon Dec 20 14:30:08 2021 +@@ -76,7 +76,7 @@ + /* 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 \ diff -ur surf.dist/patches/patch-config_mk surf/patches/patch-config_mk --- surf.dist/patches/patch-config_mk Fri May 26 17:37:56 2017 +++ surf/patches/patch-config_mk Mon Dec 20 15:11:01 2021 @@ -1,45 +1,44 @@ -$OpenBSD: patch-config_mk,v 1.8 2017/05/26 20:37:56 jung Exp $ -Index: config.mk ---- config.mk.orig -+++ config.mk -@@ -4,28 +4,28 @@ VERSION = 2.0 +--- config.mk.dist Sun May 9 19:34:33 2021 ++++ config.mk Mon Dec 20 14:59:23 2021 +@@ -4,29 +4,29 @@ # 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 +-X11INC = `pkg-config --cflags x11` +-X11LIB = `pkg-config --libs x11` ++X11INC != pkg-config --cflags x11 ++X11LIB != pkg-config --libs x11 --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 +-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` +-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` +-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` +-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` ++GTKINC != pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0 ++GTKLIB != pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0 ++WEBEXTINC != pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0 ++WEBEXTLIBS != pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.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} + INCS = $(X11INC) $(GTKINC) +-LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 ++LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 -lX11 # 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} +-CPPFLAGS = -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \ ++CPPFLAGS += -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \ + -DLIBPREFIX=\"$(LIBPREFIX)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ + -D_DEFAULT_SOURCE +-SURFCFLAGS = -fPIC $(INCS) $(CPPFLAGS) +-WEBEXTCFLAGS = -fPIC $(WEBEXTINC) ++SURFCFLAGS += -fPIC $(INCS) $(CPPFLAGS) ++WEBEXTCFLAGS += -fPIC $(WEBEXTINC) - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+#CC = cc + # compiler + #CC = c99
