Surf 2.1 was released seven months ago, but we still have 2.0 in ports.

The attached files update us to 2.1.
COMMENT =       simple webbrowser based on webkit/gtk+

DISTNAME =      surf-2.1
CATEGORIES =    www
HOMEPAGE =      http://surf.suckless.org/
REVISION =      0

MAINTAINER=     Joerg Jung <j...@openbsd.org>

# MIT
PERMIT_PACKAGE =        Yes

WANTLIB += X11 atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 javascriptcoregtk-4.0
WANTLIB += pango-1.0 pangocairo-1.0 soup-2.4 webkit2gtk-4.0 intl

MASTER_SITES =  http://dl.suckless.org/surf/

LIB_DEPENDS =   devel/gettext,-runtime \
                www/webkitgtk4
RUN_DEPENDS =   x11/dmenu \
                net/curl

# webkit browsing
RUN_DEPENDS +=  multimedia/gstreamer1/plugins-libav

MAKE_FLAGS=     CC="${CC}"
MAKE_ENV=       LDFLAGS="${LDFLAGS}"
FAKE_FLAGS=     DESTDIR=""

NO_TEST =       Yes

.include <bsd.port.mk>
SHA256 (surf-2.1.tar.gz) = cuWCkguiWmRiA+k8LSMx2H8DA3ooiU1sfpmvAO4EMlc=
SIZE (surf-2.1.tar.gz) = 22555
--- 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)
 
 install: all
-       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
+       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:
        rm -f $(DESTDIR)$(PREFIX)/bin/surf
--- 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(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 \
--- 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
+PREFIX ?= /usr/local
+MANPREFIX = $(PREFIX)/man
 LIBPREFIX = $(PREFIX)/lib
 LIBDIR = $(LIBPREFIX)/surf
 
-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 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 = $(X11INC) $(GTKINC)
-LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
+LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 -lX11
 
 # flags
-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)
 
 # compiler
 #CC = c99

Reply via email to