Packaged DeforaOS Surfer 0.2.7, with:

- fully functional help browser, helper(1)
- minor UI improvements (favicons, popup menus, find dialog...)
- improvements to the build system

4 files changed, 19 insertions, 33 deletions

diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index cd148d97d32..c8fedd4f087 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.20 2015/01/27 00:36:44 khorben Exp $
 
-DISTNAME=	Surfer-0.2.6
-PKGNAME=	deforaos-surfer-0.2.6
-PKGREVISION=	16
+DISTNAME=	Surfer-0.2.7
+PKGNAME=	deforaos-surfer-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/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -25,16 +24,20 @@ OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	LDFLAGSF="-lnsl -lresolv"
 
 post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/download.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/download.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/helper.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/helper.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/surfer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/surfer.html
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/download.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/download.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/helper.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/helper.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/surfer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surfer.1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man
 
 .include "options.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/deforaos-surfer/PLIST b/www/deforaos-surfer/PLIST
index d872c285cec..cfd0666a4c8 100644
--- a/www/deforaos-surfer/PLIST
+++ b/www/deforaos-surfer/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 01:36:28 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/01/27 00:36:44 khorben Exp $
 bin/download
 bin/helper
 bin/surfer
+man/html1/download.html
+man/html1/helper.html
+man/html1/surfer.html
 man/man1/download.1
 man/man1/helper.1
 man/man1/surfer.1
-share/applications/helper.desktop
-share/applications/surfer.desktop
-share/doc/html/Surfer/download.html
-share/doc/html/Surfer/helper.html
-share/doc/html/Surfer/surfer.html
+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
diff --git a/www/deforaos-surfer/distinfo b/www/deforaos-surfer/distinfo
index 31a58a790c0..21988031f2b 100644
--- a/www/deforaos-surfer/distinfo
+++ b/www/deforaos-surfer/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/02/14 13:29:23 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/01/27 00:36:44 khorben Exp $
 
-SHA1 (Surfer-0.2.6.tar.gz) = 703845bb3ed893fbdabe379a818b8bc13406e55a
-RMD160 (Surfer-0.2.6.tar.gz) = 2fe1b484e6dd6dfc2207155c871b2ec9962281a0
-Size (Surfer-0.2.6.tar.gz) = 75870 bytes
-SHA1 (patch-src_download.c) = 5a9a7e1c5d91ab91b31cf018f3b0931241601434
+SHA1 (Surfer-0.2.7.tar.gz) = 82438f757f7807aa15eab962832d49d355684a76
+RMD160 (Surfer-0.2.7.tar.gz) = dfa041f26752ab570162e99ff1f3d69438324432
+Size (Surfer-0.2.7.tar.gz) = 88108 bytes
diff --git a/www/deforaos-surfer/patches/patch-src_download.c b/www/deforaos-surfer/patches/patch-src_download.c
deleted file mode 100644
index e3b694a223e..00000000000
--- a/www/deforaos-surfer/patches/patch-src_download.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_download.c,v 1.2 2014/02/14 13:29:23 joerg Exp $
-
-Added missing include for download(1) with WebKit (as by default)
-
---- src/download.c.orig	2012-10-06 01:34:55.000000000 +0000
-+++ src/download.c
-@@ -31,7 +31,9 @@
- #include <libintl.h>
- #include <gtk/gtk.h>
- #include <System.h>
-+#include <netdb.h>
- #ifdef WITH_WEBKIT
-+# include <arpa/inet.h>
- # include <webkit/webkit.h>
- #else
- # define GNET_EXPERIMENTAL