Update to 0.2.9, add DOCS and NLS options

Approved by:	tabthorpe
Differential Revision:	https://reviews.freebsd.org/D5552

8 files changed, 90 insertions, 41 deletions

diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index fe5cadc796dd..e8abca8de8f1 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	surfer
-PORTVERSION=	0.2.7
+PORTVERSION=	0.2.9
 CATEGORIES=	www
-MASTER_SITES=	http://www.defora.org/os/download/download/4345/
+MASTER_SITES=	http://www.defora.org/os/download/download/4411/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Surfer-${PORTVERSION}
 
@@ -12,9 +12,8 @@ MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	DeforaOS desktop web browser
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
 		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
 		libgnet-2.0.so:${PORTSDIR}/net/gnet2 \
@@ -22,13 +21,30 @@ LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 USE_GNOME=	gtk20
-USES=		desktop-file-utils pkgconfig gettext
+USES=		desktop-file-utils pkgconfig
 INSTALLS_ICONS=	yes
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
-MANDIRS=	${PREFIX}/share/man/man1
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} 's|= data doc|= data|' \
+		${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|po src tools|src tools|' \
+		${WRKSRC}/Makefile
+
+post-patch:
+	${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
diff --git a/www/deforaos-surfer/distinfo b/www/deforaos-surfer/distinfo
index d13a26f9c9dd..bf7aeb0080b3 100644
--- a/www/deforaos-surfer/distinfo
+++ b/www/deforaos-surfer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Surfer-0.2.7.tar.gz) = ddabc709866a067b086cfd25ab488ce153685c4298f31bb343e330a3ba3d145c
-SIZE (Surfer-0.2.7.tar.gz) = 88108
+SHA256 (Surfer-0.2.9.tar.gz) = 47d02e87fec5564c9caf9fbe3b2372b81871e0484f5b394a9a741fafa78d9b1d
+SIZE (Surfer-0.2.9.tar.gz) = 94394
diff --git a/www/deforaos-surfer/files/patch-doc_Makefile b/www/deforaos-surfer/files/patch-doc_Makefile
new file mode 100644
index 000000000000..acc56e037320
--- /dev/null
+++ b/www/deforaos-surfer/files/patch-doc_Makefile
@@ -0,0 +1,22 @@
+--- doc/Makefile.orig	2016-02-07 03:47:06 UTC
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS	= $(OBJDIR)download.1 $(OBJDIR)download.html $(OBJDIR)helper.1 $(OBJDIR)helper.html $(OBJDIR)htmlapp.1 $(OBJDIR)htmlapp.html $(OBJDIR)surfer.1 $(OBJDIR)surfer.html
++TARGETS	= $(OBJDIR)download.1 $(OBJDIR)helper.1 $(OBJDIR)htmlapp.1 $(OBJDIR)surfer.1
+ OBJDIR	=
+ PREFIX	= /usr/local
+ DESTDIR	=
+@@ -50,13 +50,9 @@ distclean: clean
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)download.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)download.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)helper.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)helper.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)htmlapp.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)htmlapp.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)surfer.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)surfer.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "download.1"
diff --git a/www/deforaos-surfer/files/patch-ghtml-webkit.c b/www/deforaos-surfer/files/patch-ghtml-webkit.c
deleted file mode 100644
index 7df64ce4e39f..000000000000
--- a/www/deforaos-surfer/files/patch-ghtml-webkit.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ghtml-webkit.c.orig	2015-02-03 21:41:14.728793636 +0100
-+++ src/ghtml-webkit.c	2015-02-03 21:41:39.669804743 +0100
-@@ -207,7 +207,8 @@
- 		"/etc/ssl/certs/ca-certificates.crt",
- 		"/etc/openssl/certs/ca-certificates.crt",
- 		PREFIX "/etc/ssl/certs/ca-certificates.crt",
--		PREFIX "/etc/openssl/certs/ca-certificates.crt"
-+		PREFIX "/etc/openssl/certs/ca-certificates.crt",
-+		PREFIX "/share/certs/ca-root-nss.crt"
- 	};
- 	size_t i;
- #endif
diff --git a/www/deforaos-surfer/files/patch-src-download.c b/www/deforaos-surfer/files/patch-src-download.c
deleted file mode 100644
index 86c6a6759dc6..000000000000
--- a/www/deforaos-surfer/files/patch-src-download.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/download.c.orig	2015-02-04 15:42:08.947324133 +0100
-+++ src/download.c	2015-02-04 15:46:14.898892516 +0100
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <locale.h>
- #include <libintl.h>
-+#include <netdb.h>
- #include <gtk/gtk.h>
- #if GTK_CHECK_VERSION(3, 0, 0)
- # include <gtk/gtkx.h>
diff --git a/www/deforaos-surfer/files/patch-src_download.c b/www/deforaos-surfer/files/patch-src_download.c
new file mode 100644
index 000000000000..018f1a557b1f
--- /dev/null
+++ b/www/deforaos-surfer/files/patch-src_download.c
@@ -0,0 +1,12 @@
+--- src/download.c.orig	2015-11-28 14:58:25 UTC
++++ src/download.c
+@@ -36,6 +36,9 @@
+ #include <System.h>
+ #ifdef WITH_WEBKIT
+ # include <netdb.h>
++# include <sys/types.h>
++# include <sys/socket.h>
++# include <netinet/in.h>
+ # include <arpa/inet.h>
+ # include <webkit/webkit.h>
+ #else
diff --git a/www/deforaos-surfer/files/patch-src_ghtml-webkit.c b/www/deforaos-surfer/files/patch-src_ghtml-webkit.c
new file mode 100644
index 000000000000..487b19034bd8
--- /dev/null
+++ b/www/deforaos-surfer/files/patch-src_ghtml-webkit.c
@@ -0,0 +1,21 @@
+--- src/ghtml-webkit.c.orig	2016-02-07 03:44:23 UTC
++++ src/ghtml-webkit.c
+@@ -20,6 +20,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <libintl.h>
+ #include <webkit/webkit.h>
+@@ -205,7 +208,7 @@ static void _new_init(GHtml * ghtml)
+ 	{
+ 		"/etc/pki/tls/certs/ca-bundle.crt",
+ 		"/etc/ssl/certs/ca-certificates.crt",
+-		"/etc/openssl/certs/ca-certificates.crt",
++		"/etc/ssl/cert.pem",
+ 		PREFIX "/etc/ssl/certs/ca-certificates.crt",
+ 		PREFIX "/etc/openssl/certs/ca-certificates.crt"
+ 	};
diff --git a/www/deforaos-surfer/pkg-plist b/www/deforaos-surfer/pkg-plist
index d977d0b63460..bc4846dc0b4d 100644
--- a/www/deforaos-surfer/pkg-plist
+++ b/www/deforaos-surfer/pkg-plist
@@ -1,17 +1,17 @@
 bin/download
-bin/surfer
 bin/helper
-man/man1/download.1.gz
-man/man1/helper.1.gz
-man/man1/surfer.1.gz
+bin/htmlapp
+bin/surfer
+%%PORTDOCS%%man/man1/download.1.gz
+%%PORTDOCS%%man/man1/helper.1.gz
+%%PORTDOCS%%man/man1/htmlapp.1.gz
+%%PORTDOCS%%man/man1/surfer.1.gz
 share/applications/deforaos-helper.desktop
+share/applications/deforaos-htmlapp.desktop
 share/applications/deforaos-surfer.desktop
 share/icons/hicolor/16x16/apps/surfer-view-html-source.png
 share/icons/hicolor/24x24/apps/surfer-view-html-source.png
-share/locale/de/LC_MESSAGES/Surfer.mo
-share/locale/es/LC_MESSAGES/Surfer.mo
-share/locale/fr/LC_MESSAGES/Surfer.mo
-share/locale/it/LC_MESSAGES/Surfer.mo
-share/man/html1/download.html
-share/man/html1/helper.html
-share/man/html1/surfer.html
+%%NLS%%share/locale/de/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Surfer.mo