Hi, On Sat, Jul 14, 2012 at 08:14:20PM +0200, Joerg Zinke wrote:
> please find below an update for www/surf to version 0.5. > > OKs? Please find below an adjusted version for recent -current. Any OKs, please? Regards, Joerg Index: Makefile =================================================================== RCS file: /cvs/ports/www/surf/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 3 Oct 2012 06:36:23 -0000 1.14 +++ Makefile 28 Oct 2012 18:06:32 -0000 @@ -2,8 +2,7 @@ COMMENT = simple webbrowser based on webkit/gtk+ -DISTNAME = surf-0.4.1 -REVISION= 5 +DISTNAME = surf-0.5 CATEGORIES = www HOMEPAGE = http://surf.suckless.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/www/surf/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 17 Sep 2010 13:07:55 -0000 1.3 +++ distinfo 28 Oct 2012 18:06:32 -0000 @@ -1,5 +1,2 @@ -MD5 (surf-0.4.1.tar.gz) = KKx6bRk9JYRKprHbd/y6+g== -RMD160 (surf-0.4.1.tar.gz) = kV4y8aW4OCgMV8pEFl0kZUvBFpA= -SHA1 (surf-0.4.1.tar.gz) = L2qhnEirZh3K/Tj/c9RQydxGpZk= -SHA256 (surf-0.4.1.tar.gz) = k3Cbo+hLryEYZ26WpbLl1BdvKMNceC//2AplwKW+pUY= -SIZE (surf-0.4.1.tar.gz) = 10102 +SHA256 (surf-0.5.tar.gz) = vQoXhNAovMGNx9H0o14l519fZ7hM02stZ7BcMxufDqc= +SIZE (surf-0.5.tar.gz) = 10714 Index: patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/www/surf/patches/patch-config_def_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-config_def_h --- patches/patch-config_def_h 9 Jul 2012 15:01:26 -0000 1.1 +++ patches/patch-config_def_h 28 Oct 2012 18:06:32 -0000 @@ -1,12 +1,16 @@ $OpenBSD: patch-config_def_h,v 1.1 2012/07/09 15:01:26 zinke Exp $ ---- config.def.h.orig Sat Jul 7 17:24:23 2012 -+++ config.def.h Sat Jul 7 17:24:50 2012 -@@ -14,7 +14,7 @@ static time_t sessiontime = 3600; +--- config.def.h.orig Sun Oct 28 18:51:53 2012 ++++ config.def.h Sun Oct 28 18:53:59 2012 +@@ -18,9 +18,9 @@ static char *strictssl = FALSE; /* Refuse untrust p, q, winid, NULL } } - #define DOWNLOAD(d) { \ + #define DOWNLOAD(d) { \ .v = (char *[]){ "/bin/sh", "-c", \ -- "xterm -e \"wget --load-cookies ~/.surf/cookies.txt '$0';\"", \ -+ "xterm -e \"ftp -c ~/.surf/cookies.txt '$0';\"", \ - d, NULL } } +- "xterm -e \"wget '$0' \ +---load-cookies ~/.surf/cookies.txt \ +---user-agent '$1' ; sleep 5\"", d, useragent, NULL } } ++ "xterm -e \"ftp '$0' \ ++-c ~/.surf/cookies.txt \ ++; sleep 5\"", d, NULL } } #define MODKEY GDK_CONTROL_MASK static Key keys[] = { + /* modifier keyval function arg Focus */ Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/www/surf/patches/patch-config_mk,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_mk --- patches/patch-config_mk 7 Jun 2010 07:24:00 -0000 1.3 +++ patches/patch-config_mk 28 Oct 2012 18:06:32 -0000 @@ -1,25 +1,28 @@ $OpenBSD: patch-config_mk,v 1.3 2010/06/07 07:24:00 landry Exp $ use TRUEPREFIX instead of patching Makefile to remove DESTDIR ---- config.mk.orig Sun May 30 22:05:25 2010 -+++ config.mk Mon Jun 7 09:20:47 2010 -@@ -4,20 +4,20 @@ VERSION = 0.4 +--- config.mk.orig Sun Oct 28 18:52:06 2012 ++++ config.mk Sun Oct 28 18:59:47 2012 +@@ -4,23 +4,22 @@ VERSION = 0.5 # Customize below to fit your system # paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +PREFIX = ${TRUEPREFIX} -+MANPREFIX = ${PREFIX}/man ++MANPREFIX = ${TRUEPREFIX}/man --GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) --GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) + X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib + +-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` +-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` +GTKINC!= pkg-config --cflags gtk+-2.0 webkit-1.0 +GTKLIB!= pkg-config --libs gtk+-2.0 webkit-1.0 - # includes and libs --INCS = -I. -I/usr/include ${GTKINC} --LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 +-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} +-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 +-# -ljavascriptcoregtk-1.0 +INCS = ${GTKINC} +LIBS = -pthread ${GTKLIB} @@ -30,7 +33,7 @@ use TRUEPREFIX instead of patching Makef LDFLAGS = -g ${LIBS} # Solaris -@@ -25,4 +25,4 @@ LDFLAGS = -g ${LIBS} +@@ -28,4 +27,4 @@ LDFLAGS = -g ${LIBS} #LDFLAGS = ${LIBS} # compiler and linker
