update surf to 0.7

ok gsoares
2015-12-23 20:40:03 +00:00 · 2015-12-23 20:40:03 +00:00 · efc2ac4925
commit efc2ac4925
parent 4eed7e16fa
5 changed files with 104 additions and 37 deletions
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2015/07/19 05:58:59 czarkoff Exp $
+# $OpenBSD: Makefile,v 1.22 2015/12/23 20:40:03 jung Exp $

 COMMENT =	simple webbrowser based on webkit/gtk+

-DISTNAME =	surf-0.6
+DISTNAME =	surf-0.7
 CATEGORIES =	www
 HOMEPAGE =	http://surf.suckless.org/
-REVISION =	2

 MAINTAINER=	Joerg Jung <jung@openbsd.org>

@ -15,7 +14,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 javascriptcoregtk-1.0 m pango-1.0 pangocairo-1.0
+WANTLIB += gtk-x11-2.0 javascriptcoregtk-1.0 pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pthread soup-2.4 webkitgtk-1.0 z

 MASTER_SITES =	http://dl.suckless.org/surf/
@ -28,6 +27,10 @@ RUN_DEPENDS =	x11/dmenu
 # 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>
--- a/www/surf/distinfo
+++ b/www/surf/distinfo
@ -1,2 +1,2 @@
-SHA256 (surf-0.6.tar.gz) = /cHM+u5cTwCO64/l+SANOtcSlujXr1K91qdx8RGGaAU=
-SIZE (surf-0.6.tar.gz) = 14781
+SHA256 (surf-0.7.tar.gz) = lWCFRvtk0Bx6gVPDVr4OKE6+Egw8WWqU6z861H4cSUo=
+SIZE (surf-0.7.tar.gz) = 18792
--- a/www/surf/patches/patch-Makefile
+++ b/www/surf/patches/patch-Makefile
@ -0,0 +1,44 @@
+$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}
+ 
+ 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
+	${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:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--- a/www/surf/patches/patch-config_def_h
+++ b/www/surf/patches/patch-config_def_h
@ -1,27 +1,43 @@
-$OpenBSD: patch-config_def_h,v 1.3 2013/03/11 17:08:51 bcallah Exp $
--- config.def.h.orig	Sun Mar 10 22:54:36 2013
-+++ config.def.h	Sun Mar 10 22:59:08 2013
-@@ -12,7 +12,7 @@ static char *stylefile      = "~/.surf/style.css";
- static char *scriptfile     = "~/.surf/script.js";
+$OpenBSD: patch-config_def_h,v 1.4 2015/12/23 20:40:03 jung Exp $
+--- config.def.h.orig	Sat Dec 19 15:59:30 2015
+++ config.def.h	Sat Dec 19 20:45:50 2015
+@@ -16,9 +16,9 @@ static gfloat zoomlevel = 1.0;       /* Default zoom l
+ 
+ /* Soup default features */
 static char *cookiefile     = "~/.surf/cookies.txt";
- static time_t sessiontime   = 3600;
+-static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing,
+static char *cookiepolicies = "@Aa"; /* A: accept all; a: accept nothing,
+                                       * @: accept all except third party */
 -static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 +static char *cafile         = "/etc/ssl/cert.pem";
- static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
- static int   indicator_thickness = 2;
+ static Bool strictssl       = FALSE; /* Refuse untrusted SSL connections */
+ static time_t sessiontime   = 3600;
 
-@@ -35,11 +35,9 @@ static Bool hidebackground  = FALSE;
+@@ -29,11 +29,11 @@ static Bool enablediskcache       = TRUE;
+ static int diskcachebytes         = 5 * 1024 * 1024;
+ static Bool enableplugins         = TRUE;
+ static Bool enablescripts         = TRUE;
+-static Bool enableinspector       = TRUE;
+static Bool enableinspector       = FALSE;
+ static Bool enablestyle           = TRUE;
+ static Bool loadimages            = TRUE;
+ static Bool hidebackground        = FALSE;
+-static Bool allowgeolocation      = TRUE;
+static Bool allowgeolocation      = FALSE;
+ 
+ #define SETPROP(p, q) { \
+ 	.v = (char *[]){ "/bin/sh", "-c", \
+@@ -48,10 +48,9 @@ static Bool allowgeolocation      = TRUE;
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
 	.v = (char *[]){ "/bin/sh", "-c", \
-		"st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
-		" --referer '$2'" \
-		" -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
-		" sleep 5;\"", \
-		d, useragent, r, NULL \
-+		"xterm -e \"ftp '$0' \
-+		-c ~/.surf/cookies.txt \
-+		; sleep 5\"", d, NULL \
+-	     "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \
+-	     " --referer '$2' -b $3 -c $3 '$0';" \
+-	     " sleep 5;\"", \
+-	     d, useragent, r, cookiefile, NULL \
+	     "xterm -e \"ftp -c '$2' -U '$1' '$0';" \
+	     "sleep 5;\"", \
+	     d, useragent, cookiefile, NULL \
 	} \
 }
 
--- a/www/surf/patches/patch-config_mk
+++ b/www/surf/patches/patch-config_mk
@ -1,18 +1,20 @@
-$OpenBSD: patch-config_mk,v 1.6 2015/07/19 05:58:59 czarkoff Exp $
+$OpenBSD: patch-config_mk,v 1.7 2015/12/23 20:40:03 jung Exp $
 use TRUEPREFIX instead of patching Makefile to remove DESTDIR
--- config.mk.orig	Sun Mar 10 22:59:36 2013
-+++ config.mk	Sun Mar 10 23:01:27 2013
-@@ -4,22 +4,22 @@ VERSION = 0.6
+--- config.mk.orig	Sat Dec 19 15:59:30 2015
+++ config.mk	Sat Dec 19 20:58:35 2015
+@@ -4,27 +4,27 @@ VERSION = 0.7
 # Customize below to fit your system
 
 # paths
 -PREFIX = /usr/local
 -MANPREFIX = ${PREFIX}/share/man
-+PREFIX = ${TRUEPREFIX}
-+MANPREFIX = ${TRUEPREFIX}/man
+PREFIX ?= /usr/local 
+MANPREFIX = ${PREFIX}/man
 
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
+X11INC = ${X11BASE}/include
+X11LIB = ${X11BASE}/lib
 
 -GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
 -GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
@ -22,17 +24,19 @@ use TRUEPREFIX instead of patching Makefile to remove DESTDIR
 # includes and libs
 -INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
 -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
-+INCS = ${GTKINC}
-+LIBS = ${GTKLIB}
+INCS = -I${X11INC} ${GTKINC}
+LIBS = -L${X11LIB} -lX11 ${GTKLIB}
 
 # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
- LDFLAGS = -g ${LIBS}
+-LDFLAGS = -g ${LIBS}
+CPPFLAGS += -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
 
 # Solaris
-@@ -27,4 +27,4 @@ LDFLAGS = -g ${LIBS}
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
 
 # compiler and linker