www/deforaos-surfer: Upgrade version 0.2.6 => 0.2.7 (UNBREAK)

PR:		152601
Submitted by:	maintainer (Olivier Cochard)

6 files changed, 30 insertions, 41 deletions

diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index 1c58f564530f..fe435c9e3ce3 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	surfer
-PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTVERSION=	0.2.7
 CATEGORIES=	www
-MASTER_SITES=	http://www.defora.org/os/download/download/3709/
+MASTER_SITES=	http://www.defora.org/os/download/download/4345/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Surfer-${PORTVERSION}
 
@@ -14,10 +13,8 @@ COMMENT=	DeforaOS desktop web browser
 
 LICENSE=	GPLv3
 
-BROKEN=		Fails to build
-
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	xsltproc>=0:${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 \
@@ -25,10 +22,15 @@ 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=		pkgconfig gettext
+USES=		desktop-file-utils pkgconfig gettext
 INSTALLS_ICONS=	yes
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
+MANDIRS=	${PREFIX}/share/man/man1
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+
 .include <bsd.port.mk>
diff --git a/www/deforaos-surfer/distinfo b/www/deforaos-surfer/distinfo
index 01587921a758..d13a26f9c9dd 100644
--- a/www/deforaos-surfer/distinfo
+++ b/www/deforaos-surfer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Surfer-0.2.6.tar.gz) = 5f7c6ebd98d2edccef4be9beff82d697727582c45a638c22b21c8bf985505d30
-SIZE (Surfer-0.2.6.tar.gz) = 75870
+SHA256 (Surfer-0.2.7.tar.gz) = ddabc709866a067b086cfd25ab488ce153685c4298f31bb343e330a3ba3d145c
+SIZE (Surfer-0.2.7.tar.gz) = 88108
diff --git a/www/deforaos-surfer/files/patch-doc__Makefile b/www/deforaos-surfer/files/patch-doc__Makefile
deleted file mode 100644
index 3bceaab63c46..000000000000
--- a/www/deforaos-surfer/files/patch-doc__Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./doc/Makefile.orig	2012-10-14 19:21:29.000000000 +0200
-+++ ./doc/Makefile	2012-12-19 13:31:00.833357884 +0100
-@@ -1,4 +1,4 @@
--TARGETS	= download.1 download.html helper.1 helper.html surfer.1 surfer.html
-+TARGETS	= download.1 helper.1 surfer.1
- PREFIX	= /usr/local
- DESTDIR	=
- RM	?= rm -f
-@@ -35,11 +35,8 @@
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "download.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "download.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "helper.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "helper.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "surfer.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "surfer.html"
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "download.1"
diff --git a/www/deforaos-surfer/files/patch-ghtml-webkit.diff b/www/deforaos-surfer/files/patch-ghtml-webkit.c
index bd17773231b0..7df64ce4e39f 100644
--- a/www/deforaos-surfer/files/patch-ghtml-webkit.diff
+++ b/www/deforaos-surfer/files/patch-ghtml-webkit.c
@@ -1,6 +1,6 @@
---- src/ghtml-webkit.c.orig	2012-10-21 14:12:06.000000000 +0200
-+++ src/ghtml-webkit.c	2012-10-21 14:13:02.000000000 +0200
-@@ -160,7 +160,8 @@
+--- 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",
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..86c6a6759dc6
--- /dev/null
+++ b/www/deforaos-surfer/files/patch-src-download.c
@@ -0,0 +1,10 @@
+--- 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/pkg-plist b/www/deforaos-surfer/pkg-plist
index 41d633c60995..d977d0b63460 100644
--- a/www/deforaos-surfer/pkg-plist
+++ b/www/deforaos-surfer/pkg-plist
@@ -4,17 +4,14 @@ bin/helper
 man/man1/download.1.gz
 man/man1/helper.1.gz
 man/man1/surfer.1.gz
-share/applications/surfer.desktop
-share/applications/helper.desktop
+share/applications/deforaos-helper.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
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+share/man/html1/download.html
+share/man/html1/helper.html
+share/man/html1/surfer.html