Update to 2.8

PR:		161644
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 168 insertions, 75 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 180b20cac9eb..af9719c940c0 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -6,49 +6,88 @@
 #
 
 PORTNAME=	netsurf
-PORTVERSION=	1.1
-DISTVERSIONSUFFIX=	-src
-PORTREVISION=	6
+PORTVERSION=	2.8
 CATEGORIES=	www
-MASTER_SITES=	http://www.netsurf-browser.org/download/ CENKES
+MASTER_SITES=	http://www.netsurf-browser.org/projects/releases/ \
+		http://www.netsurf-browser.org/downloads/releases/:netsurf
+DISTFILES=	${PARSERUTILS_DISTNAME}${EXTRACT_SUFX} \
+		${WAPCAPLET_DISTNAME}${EXTRACT_SUFX} \
+		${HUBBUB_DISTNAME}${EXTRACT_SUFX} \
+		${CSS_DISTNAME}${EXTRACT_SUFX} \
+		${NSBMP_DISTNAME}${EXTRACT_SUFX} \
+		${NSGIF_DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}:netsurf
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight web browser
 
-BUILD_DEPENDS=	lemon:${PORTSDIR}/devel/lemon \
-		re2c:${PORTSDIR}/devel/re2c
-LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
-		curl.6:${PORTSDIR}/ftp/curl
+LICENSE=	GPLv2 MIT
+LICENSE_COMB=	multi
 
+LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+		lcms.1:${PORTSDIR}/graphics/lcms \
+		mng.1:${PORTSDIR}/graphics/libmng
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_GNOME=	libglade2 librsvg2 libxml2
 USE_GMAKE=	yes
-USE_GNOME=	libglade2 libxml2
-MAKEFILE=	makefile
-ALL_TARGET=	gtk
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-MAKE_ARGS=	CC="${CC}" SYSTEM_CC="${CC}" WARNFLAGS=
+MAKE_ENV=	PKG_CONFIG_PATH="${WRKDIR}/fakeroot/lib/pkgconfig:${LOCALBASE}/libdata/pkgconfig"
+MAKE_ARGS=	CC="${CC}" CCOPT="" TARGET="gtk" HOST="${OPSYS}" \
+		WARNFLAGS="${CFLAGS}" Q=""
+MAKE_JOBS_SAFE=	yes
 
-post-extract:
-	@cd ${WRKSRC}/gtk/&&${CP} -RL res resderef
-	@cd ${WRKSRC}/&&${MV} ChangeLog ReadMe Docs/
+PARSERUTILS_DISTNAME=	libparserutils-0.1.1-src
+WAPCAPLET_DISTNAME=	libwapcaplet-0.1.0-src
+HUBBUB_DISTNAME=	hubbub-0.1.1-src
+CSS_DISTNAME=		libcss-0.1.1-src
+NSBMP_DISTNAME=		libnsbmp-0.0.3-src
+NSGIF_DISTNAME=		libnsgif-0.0.3-src
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|	@|	|;s|-O |$${CFLAGS}|'\
-		-e 's|-DGTK_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e \
+		's| -O2 | |' ${WRKSRC}/Makefile.defaults
+	@${REINPLACE_CMD} -e \
+		's| -g | |' ${WRKSRC}/gtk/Makefile.target
+
+do-configure:
+	@${TOUCH} ${WRKDIR}/${PARSERUTILS_DISTNAME:S/-src//}/Makefile.config.override
+	@${ECHO_CMD} 'CFLAGS+=-DWITH_ICONV_FILTER' >> ${WRKDIR}/${PARSERUTILS_DISTNAME:S/-src//}/Makefile.config.override
+	@${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKDIR}/${PARSERUTILS_DISTNAME:S/-src//}/Makefile.config.override
+	@${TOUCH} ${WRKSRC}/Makefile.config
+	@${ECHO_CMD} 'NETSURF_USE_HARU_PDF=NO' >> ${WRKSRC}/Makefile.config
+	@${ECHO_CMD} 'NETSURF_USE_LIBICONV_PLUG=NO' >> ${WRKSRC}/Makefile.config
+	@${ECHO_CMD} 'NETSURF_USE_NSSVG=NO' >> ${WRKSRC}/Makefile.config
+	@${ECHO_CMD} 'NETSURF_USE_ROSPRITE=NO' >> ${WRKSRC}/Makefile.config
+	@${ECHO_CMD} 'NETSURF_USE_WEBP=NO' >> ${WRKSRC}/Makefile.config
 
 pre-build:
-	@${LN} -sf ${LOCALBASE}/share/lemon/lempar.c ${WRKSRC}/css/
-	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/${PORTNAME}
-	@${ECHO_CMD} 'export NETSURFRES=${DATADIR}/;exec ${PREFIX}/libexec/${PORTNAME}'\
-		>> ${WRKSRC}/${PORTNAME}
+	@${MKDIR} ${WRKDIR}/fakeroot
+.for dir in ${PARSERUTILS_DISTNAME:S/-src//} ${WAPCAPLET_DISTNAME} \
+	${HUBBUB_DISTNAME:S/-src//} ${CSS_DISTNAME:S/-src//} \
+	${NSBMP_DISTNAME} ${NSGIF_DISTNAME}
+	@(cd ${WRKDIR}/${dir} && ${SETENV} PREFIX="${WRKDIR}/fakeroot" \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/nsgtk ${PREFIX}/libexec/${PORTNAME}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	@cd ${WRKSRC}/gtk/resderef/&&${COPYTREE_SHARE} . ${DATADIR}/
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/Docs/&&${INSTALL_DATA} * ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/nsgtk ${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${DATADIR}
+	@(${TAR} --exclude "C" --exclude "*.glade" -C ${WRKSRC}/gtk/res \
+		-L -cf - . | ${TAR} -C ${DATADIR} --unlink -xf -)
+	@${LN} -sf en ${DATADIR}/C
+	@(cd ${WRKSRC}/gtk/res ; \
+		for i in `${LS} -d *.glade` ; do \
+			 ${CAT} $$i | ${GZIP_CMD} > ${DATADIR}/$$i ; \
+		done)
+	@${FIND} ${DATADIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
+	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 23786ce8f3ba..cde4c9f3dcd3 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,2 +1,14 @@
-SHA256 (netsurf-1.1-src.tar.gz) = 9646498ab2a6e68ed8c22e8a6a8e9c6a88f5ce54b075df03d99fc9bed7a43414
-SIZE (netsurf-1.1-src.tar.gz) = 987786
+SHA256 (netsurf/libparserutils-0.1.1-src.tar.gz) = 8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d
+SIZE (netsurf/libparserutils-0.1.1-src.tar.gz) = 87868
+SHA256 (netsurf/libwapcaplet-0.1.0-src.tar.gz) = e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7
+SIZE (netsurf/libwapcaplet-0.1.0-src.tar.gz) = 18926
+SHA256 (netsurf/hubbub-0.1.1-src.tar.gz) = 363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b
+SIZE (netsurf/hubbub-0.1.1-src.tar.gz) = 812211
+SHA256 (netsurf/libcss-0.1.1-src.tar.gz) = 383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0
+SIZE (netsurf/libcss-0.1.1-src.tar.gz) = 457668
+SHA256 (netsurf/libnsbmp-0.0.3-src.tar.gz) = e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2
+SIZE (netsurf/libnsbmp-0.0.3-src.tar.gz) = 219808
+SHA256 (netsurf/libnsgif-0.0.3-src.tar.gz) = 1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5
+SIZE (netsurf/libnsgif-0.0.3-src.tar.gz) = 212109
+SHA256 (netsurf/netsurf-2.8-src.tar.gz) = 09f3aa38f26248a410481aaf125811d6af4c8535725bec950e75af37ccd0aad2
+SIZE (netsurf/netsurf-2.8-src.tar.gz) = 2532212
diff --git a/www/netsurf/files/patch-css-parser.y b/www/netsurf/files/patch-css-parser.y
deleted file mode 100644
index 5e68f6cf4e1d..000000000000
--- a/www/netsurf/files/patch-css-parser.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- css/parser.y.orig	2009-11-21 09:40:45.000000000 +0100
-+++ css/parser.y	2009-11-21 09:39:49.000000000 +0100
-@@ -398,6 +398,7 @@
- 
- %extra_argument { struct css_parser_params *param }
- %include {
-+#include <assert.h>
- #include <strings.h>
- #define CSS_INTERNALS
- #include "css/css.h"
diff --git a/www/netsurf/files/patch-utils__config.h b/www/netsurf/files/patch-utils__config.h
deleted file mode 100644
index 37ab5d10d01e..000000000000
--- a/www/netsurf/files/patch-utils__config.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./utils/config.h.orig	2007-08-17 16:06:48.000000000 +0400
-+++ ./utils/config.h	2007-08-17 16:06:57.000000000 +0400
-@@ -18,6 +18,7 @@
- 
- #ifndef _NETSURF_UTILS_CONFIG_H_
- #define _NETSURF_UTILS_CONFIG_H_
-+#include <sys/types.h>
- 
- /* Try to detect which features the target OS supports */
- 
diff --git a/www/netsurf/pkg-plist b/www/netsurf/pkg-plist
index 6260c10c3dc9..68f567a8d70c 100644
--- a/www/netsurf/pkg-plist
+++ b/www/netsurf/pkg-plist
@@ -1,32 +1,94 @@
 bin/netsurf
-libexec/netsurf
-%%PORTDOCS%%%%DOCSDIR%%/00-overview
-%%PORTDOCS%%%%DOCSDIR%%/01-content
-%%PORTDOCS%%%%DOCSDIR%%/02-layout
-%%PORTDOCS%%%%DOCSDIR%%/03-css
-%%PORTDOCS%%%%DOCSDIR%%/04-errors
-%%PORTDOCS%%%%DOCSDIR%%/05-memory
-%%PORTDOCS%%%%DOCSDIR%%/06-frames
-%%PORTDOCS%%%%DOCSDIR%%/BUILDING-GTK
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfile
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe
-%%PORTDOCS%%%%DOCSDIR%%/TODO-CSS
-%%PORTDOCS%%%%DOCSDIR%%/TODO-HTML
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/C
+%%DATADIR%%/SearchEngines
 %%DATADIR%%/adblock.css
+%%DATADIR%%/arrow_down_8x32.png
+%%DATADIR%%/blankpage
 %%DATADIR%%/ca-bundle.txt
+%%DATADIR%%/cookies.glade
+%%DATADIR%%/de/Messages
 %%DATADIR%%/default.css
-%%DATADIR%%/docs/about.html
-%%DATADIR%%/docs/intro_en.html
-%%DATADIR%%/docs/libcurl
-%%DATADIR%%/docs/libmng
-%%DATADIR%%/docs/libxml2
-%%DATADIR%%/docs/openssl
-%%DATADIR%%/messages
-%%DATADIR%%/netsurf-logo.png
+%%DATADIR%%/default.ico
+%%DATADIR%%/downloads.glade
+%%DATADIR%%/en/Messages
+%%DATADIR%%/en/credits.html
+%%DATADIR%%/en/licence.html
+%%DATADIR%%/favicon.png
+%%DATADIR%%/fr/Messages
+%%DATADIR%%/gtkdefault.css
+%%DATADIR%%/history.glade
+%%DATADIR%%/hotlist.glade
+%%DATADIR%%/icons/content.png
+%%DATADIR%%/icons/directory.png
+%%DATADIR%%/icons/search.png
+%%DATADIR%%/internal.css
+%%DATADIR%%/it/Messages
+%%DATADIR%%/languages
+%%DATADIR%%/license
+%%DATADIR%%/login.glade
+%%DATADIR%%/netsurf-16x16.xpm
 %%DATADIR%%/netsurf.glade
+%%DATADIR%%/netsurf.png
 %%DATADIR%%/netsurf.xpm
-%%DATADIR%%/throbber.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/docs
+%%DATADIR%%/nl/Messages
+%%DATADIR%%/options.glade
+%%DATADIR%%/password.glade
+%%DATADIR%%/quirks.css
+%%DATADIR%%/source.glade
+%%DATADIR%%/ssl.glade
+%%DATADIR%%/themelist
+%%DATADIR%%/themes/Alpha.png
+%%DATADIR%%/themes/gtk+/back.png
+%%DATADIR%%/themes/gtk+/closetab.png
+%%DATADIR%%/themes/gtk+/closewindow.png
+%%DATADIR%%/themes/gtk+/copy.png
+%%DATADIR%%/themes/gtk+/cut.png
+%%DATADIR%%/themes/gtk+/delete.png
+%%DATADIR%%/themes/gtk+/forward.png
+%%DATADIR%%/themes/gtk+/fullscreen.png
+%%DATADIR%%/themes/gtk+/helpabout.png
+%%DATADIR%%/themes/gtk+/helpcontents.png
+%%DATADIR%%/themes/gtk+/history.png
+%%DATADIR%%/themes/gtk+/home.png
+%%DATADIR%%/themes/gtk+/info
+%%DATADIR%%/themes/gtk+/newtab.png
+%%DATADIR%%/themes/gtk+/newwindow.png
+%%DATADIR%%/themes/gtk+/openfile.png
+%%DATADIR%%/themes/gtk+/paste.png
+%%DATADIR%%/themes/gtk+/preferences.png
+%%DATADIR%%/themes/gtk+/print.png
+%%DATADIR%%/themes/gtk+/printpreview.png
+%%DATADIR%%/themes/gtk+/quit.png
+%%DATADIR%%/themes/gtk+/reload.png
+%%DATADIR%%/themes/gtk+/savepage.png
+%%DATADIR%%/themes/gtk+/selectall.png
+%%DATADIR%%/themes/gtk+/stop.png
+%%DATADIR%%/themes/gtk+/viewsource.png
+%%DATADIR%%/themes/gtk+/zoomminus.png
+%%DATADIR%%/themes/gtk+/zoomnormal.png
+%%DATADIR%%/themes/gtk+/zoomplus.png
+%%DATADIR%%/throbber/throbber0.png
+%%DATADIR%%/throbber/throbber1.png
+%%DATADIR%%/throbber/throbber2.png
+%%DATADIR%%/throbber/throbber3.png
+%%DATADIR%%/throbber/throbber4.png
+%%DATADIR%%/throbber/throbber5.png
+%%DATADIR%%/throbber/throbber6.png
+%%DATADIR%%/throbber/throbber7.png
+%%DATADIR%%/throbber/throbber8.png
+%%DATADIR%%/toolbar.glade
+%%DATADIR%%/toolbarIndices
+%%DATADIR%%/warning.glade
+@dirrm %%DATADIR%%/throbber
+@dirrm %%DATADIR%%/themes/gtk+
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/nl
+@dirrm %%DATADIR%%/it
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fr
+@dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/de
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%