From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 14 18:50:30 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 961631065672 for ; Fri, 14 Oct 2011 18:50:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 70D208FC21 for ; Fri, 14 Oct 2011 18:50:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9EIoU7w052445 for ; Fri, 14 Oct 2011 18:50:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9EIoUU1052441; Fri, 14 Oct 2011 18:50:30 GMT (envelope-from gnats) Resent-Date: Fri, 14 Oct 2011 18:50:30 GMT Resent-Message-Id: <201110141850.p9EIoUU1052441@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39D4E10656A3 for ; Fri, 14 Oct 2011 18:44:19 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 9EF498FC1A for ; Fri, 14 Oct 2011 18:44:18 +0000 (UTC) Received: from msa105lp.auone-net.jp (MSA105lp [172.27.12.183]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id B7EC6570261 for ; Sat, 15 Oct 2011 03:36:18 +0900 (JST) Received: from localhost.localdomain (ZT046175.ppp.dion.ne.jp [59.128.46.175]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 4241850037 for ; Sat, 15 Oct 2011 03:36:12 +0900 (JST) Message-Id: <20111015025957.c82e72ed.tkato432@yahoo.com> Date: Sat, 15 Oct 2011 02:59:57 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/161644: Update port: www/netsurf to 2.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 18:50:30 -0000 >Number: 161644 >Category: ports >Synopsis: Update port: www/netsurf to 2.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 14 18:50:30 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 2.8 Remove file: files/patch-css-parser.y files/patch-utils__config.h >How-To-Repeat: >Fix: diff -urN /usr/ports/www/netsurf/Makefile www/netsurf/Makefile --- /usr/ports/www/netsurf/Makefile 2010-05-11 15:27:46.000000000 +0900 +++ www/netsurf/Makefile 2011-10-01 03:50:37.000000000 +0900 @@ -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= - -post-extract: - @cd ${WRKSRC}/gtk/&&${CP} -RL res resderef - @cd ${WRKSRC}/&&${MV} ChangeLog ReadMe Docs/ +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 + +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} ${WKRSRC}/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 diff -urN /usr/ports/www/netsurf/distinfo www/netsurf/distinfo --- /usr/ports/www/netsurf/distinfo 2011-03-20 03:00:29.000000000 +0900 +++ www/netsurf/distinfo 2011-10-01 03:22:14.000000000 +0900 @@ -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 -urN /usr/ports/www/netsurf/files/patch-css-parser.y www/netsurf/files/patch-css-parser.y --- /usr/ports/www/netsurf/files/patch-css-parser.y 2009-11-22 00:29:43.000000000 +0900 +++ www/netsurf/files/patch-css-parser.y 1970-01-01 09:00:00.000000000 +0900 @@ -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 - #include - #define CSS_INTERNALS - #include "css/css.h" diff -urN /usr/ports/www/netsurf/files/patch-utils__config.h www/netsurf/files/patch-utils__config.h --- /usr/ports/www/netsurf/files/patch-utils__config.h 2007-08-18 09:45:59.000000000 +0900 +++ www/netsurf/files/patch-utils__config.h 1970-01-01 09:00:00.000000000 +0900 @@ -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 - - /* Try to detect which features the target OS supports */ - diff -urN /usr/ports/www/netsurf/pkg-plist www/netsurf/pkg-plist --- /usr/ports/www/netsurf/pkg-plist 2007-08-18 09:45:59.000000000 +0900 +++ www/netsurf/pkg-plist 2011-10-01 03:40:05.000000000 +0900 @@ -1,32 +1,95 @@ 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 +@comment libexec/netsurf %%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%% >Release-Note: >Audit-Trail: >Unformatted: