Date: Fri, 14 Jun 2013 20:21:19 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320960 - in head/www/netsurf: . files Message-ID: <201306142021.r5EKLJmY061761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Jun 14 20:21:18 2013 New Revision: 320960 URL: http://svnweb.freebsd.org/changeset/ports/320960 Log: - Update to version 3.0 - Switch to building from one distfile containing all libs and main application sources - Remove leading article from COMMENT - Add options for gstreamer and webp support Added: head/www/netsurf/files/ head/www/netsurf/files/Makefile.config (contents, props changed) head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__nsgenbind-lexer.l (contents, props changed) head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__webidl-lexer.l (contents, props changed) Modified: head/www/netsurf/Makefile head/www/netsurf/distinfo (contents, props changed) head/www/netsurf/pkg-plist (contents, props changed) Modified: head/www/netsurf/Makefile ============================================================================== --- head/www/netsurf/Makefile Fri Jun 14 19:10:11 2013 (r320959) +++ head/www/netsurf/Makefile Fri Jun 14 20:21:18 2013 (r320960) @@ -1,96 +1,71 @@ -# New ports collection makefile for: netsurf -# Date created: 17 August 2007 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= netsurf -PORTVERSION= 2.9 -PORTREVISION= 2 +PORTVERSION= 3.0 CATEGORIES= www -MASTER_SITES= http://www.netsurf-browser.org/projects/releases/ \ - http://www.netsurf-browser.org/downloads/releases/:netsurf -DISTFILES= ${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} +MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source-full/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-full-src MAINTAINER= pawel@FreeBSD.org -COMMENT= A lightweight web browser +COMMENT= Lightweight web browser LICENSE= GPLv2 MIT LICENSE_COMB= multi -BUILD_DEPENDS= ${LOCALBASE}/lib/libparserutils.a:${PORTSDIR}/devel/libparserutils -LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ - lcms.1:${PORTSDIR}/graphics/lcms \ - mng.1:${PORTSDIR}/graphics/libmng +BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ + mng:${PORTSDIR}/graphics/libmng -WRKSRC= ${WRKDIR}/${PORTNAME} - -USE_GNOME= libglade2 librsvg2 libxml2 USE_GMAKE= yes +ALL_TARGET= #empty CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV= PKG_CONFIG_PATH="${WRKDIR}/fakeroot/lib/pkgconfig:${LOCALBASE}/libdata/pkgconfig" MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \ - WARNFLAGS="${CFLAGS}" Q="" + WARNFLAGS="" Q="" OPTCFLAGS="${CFLAGS}" +USES= bison +USE_GNOME= librsvg2 MAKE_JOBS_SAFE= yes +NSFB_VERSION= 0.1.0 +WRKSRC= ${WRKDIR}/${PORTNAME}-full-${PORTVERSION} + DESKTOP_ENTRIES="NetSurf" "${COMMENT}" "" "${PORTNAME}" "" "true" -WAPCAPLET_DISTNAME= libwapcaplet-0.1.1-src -HUBBUB_DISTNAME= hubbub-0.1.2-src -CSS_DISTNAME= libcss-0.1.2-src -NSBMP_DISTNAME= libnsbmp-0.0.3-src -NSGIF_DISTNAME= libnsgif-0.0.3-src +OPTIONS_DEFINE= GSTREAMER WEBP .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MGSTREAMER} +USE_GSTREAMER= yes +.endif + +.if ${PORT_OPTIONS:MWEBP} +LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp +.endif + post-patch: - @${REINPLACE_CMD} -e \ - 's| -O2 | |' ${WRKSRC}/Makefile.defaults - @${REINPLACE_CMD} -e \ - 's| -g | |' ${WRKSRC}/gtk/Makefile.target + @${REINPLACE_CMD} '/^NSFB_LINUX_AVAILABLE/ s|yes|no| ; s| -g||' \ + ${WRKSRC}/src/libnsfb-${NSFB_VERSION}/Makefile + @${REINPLACE_CMD} 's|endian|sys/endian|' \ + ${WRKSRC}/src/libnsfb-${NSFB_VERSION}/src/plot/*bpp*.c + @${REINPLACE_CMD} 's| -O2||' \ + ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.defaults + @${REINPLACE_CMD} '/OpenSSL/d ; s| -g||' \ + ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.target @${REINPLACE_CMD} -e '/ifeq.*clang/s/word 1/filter clang/' \ - ${WRKDIR}/*/build/makefiles/Makefile.tools + ${WRKSRC}/src/buildsystem-1.0/makefiles/Makefile.tools + @${REINPLACE_CMD} 's| -g||' \ + ${WRKSRC}/src/nsgenbind-0.0.1/src/Makefile do-configure: - @${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: - @${MKDIR} ${WRKDIR}/fakeroot -.for dir in ${WAPCAPLET_DISTNAME:S/-src//} ${HUBBUB_DISTNAME:S/-src//} \ - ${CSS_DISTNAME:S/-src//} ${NSBMP_DISTNAME} ${NSGIF_DISTNAME} - @${MAKE_ENV} ${GMAKE} -C${WRKDIR}/${dir} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} ${INSTALL_TARGET} PREFIX="${WRKDIR}/fakeroot" -.endfor - -do-install: - ${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 ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${CP} ${FILESDIR}/Makefile.config ${WRKSRC}/src/netsurf-${PORTVERSION} +.if ${PORT_OPTIONS:MGSTREAMER} + @${REINPLACE_CMD} '/NETSURF_USE_VIDEO/ s|NO|YES|' \ + ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config +.endif +.if ${PORT_OPTIONS:MWEBP} + @${REINPLACE_CMD} '/NETSURF_USE_WEBP/ s|NO|YES|' \ + ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config .endif .include <bsd.port.mk> Modified: head/www/netsurf/distinfo ============================================================================== --- head/www/netsurf/distinfo Fri Jun 14 19:10:11 2013 (r320959) +++ head/www/netsurf/distinfo Fri Jun 14 20:21:18 2013 (r320960) @@ -1,12 +1,2 @@ -SHA256 (netsurf/libwapcaplet-0.1.1-src.tar.gz) = cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258 -SIZE (netsurf/libwapcaplet-0.1.1-src.tar.gz) = 18799 -SHA256 (netsurf/hubbub-0.1.2-src.tar.gz) = 95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52 -SIZE (netsurf/hubbub-0.1.2-src.tar.gz) = 812684 -SHA256 (netsurf/libcss-0.1.2-src.tar.gz) = 92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e -SIZE (netsurf/libcss-0.1.2-src.tar.gz) = 474621 -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.9-src.tar.gz) = f74767161fd7f3186e483b438a183f2ea3cae160020ad5dd63c75a4d78f5c797 -SIZE (netsurf/netsurf-2.9-src.tar.gz) = 2575417 +SHA256 (netsurf-3.0-full-src.tar.gz) = 5c4467b921d24a8702bfb20875b0eee3ff38707c7e623f24f92eff0b3ba6d6a0 +SIZE (netsurf-3.0-full-src.tar.gz) = 6143522 Added: head/www/netsurf/files/Makefile.config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/netsurf/files/Makefile.config Fri Jun 14 20:21:18 2013 (r320960) @@ -0,0 +1,6 @@ +NETSURF_USE_HARU_PDF=NO +NETSURF_USE_LIBICONV_PLUG=NO +NETSURF_USE_NSSVG=NO +NETSURF_USE_ROSPRITE=NO +NETSURF_USE_WEBP=NO +NETSURF_USE_VIDEO=NO Added: head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__nsgenbind-lexer.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__nsgenbind-lexer.l Fri Jun 14 20:21:18 2013 (r320960) @@ -0,0 +1,19 @@ +--- ./src/nsgenbind-0.0.1/src/nsgenbind-lexer.l.orig 2013-04-18 23:59:18.000000000 +0200 ++++ ./src/nsgenbind-0.0.1/src/nsgenbind-lexer.l 2013-06-13 18:54:25.000000000 +0200 +@@ -19,6 +19,16 @@ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column += yyleng; + ++ ++/* Ensure compatability with bison 2.6 and later */ ++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED ++#define YYSTYPE NSGENBIND_STYPE ++#endif ++ ++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED ++#define YYLTYPE NSGENBIND_LTYPE ++#endif ++ + %} + + /* lexer options */ Added: head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__webidl-lexer.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__webidl-lexer.l Fri Jun 14 20:21:18 2013 (r320960) @@ -0,0 +1,18 @@ +--- ./src/nsgenbind-0.0.1/src/webidl-lexer.l.orig 2013-04-18 23:59:18.000000000 +0200 ++++ ./src/nsgenbind-0.0.1/src/webidl-lexer.l 2013-06-13 18:54:25.000000000 +0200 +@@ -27,6 +27,15 @@ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column += yyleng; + ++/* Ensure compatability with bison 2.6 and later */ ++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED ++#define YYSTYPE WEBIDL_STYPE ++#endif ++ ++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED ++#define YYLTYPE WEBIDL_LTYPE ++#endif ++ + %} + + Modified: head/www/netsurf/pkg-plist ============================================================================== --- head/www/netsurf/pkg-plist Fri Jun 14 19:10:11 2013 (r320959) +++ head/www/netsurf/pkg-plist Fri Jun 14 20:21:18 2013 (r320960) @@ -1,94 +1,110 @@ bin/netsurf -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%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%%/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%%/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%% +share/netsurf/SearchEngines +share/netsurf/adblock.css +share/netsurf/arrow_down_8x32.png +share/netsurf/ca-bundle.txt +share/netsurf/cookies.gtk2.ui +share/netsurf/cookies.gtk3.ui +share/netsurf/de/Messages +share/netsurf/de/welcome.html +share/netsurf/default.css +share/netsurf/default.ico +share/netsurf/downloads.gtk2.ui +share/netsurf/downloads.gtk3.ui +share/netsurf/en/Messages +share/netsurf/en/credits.html +share/netsurf/en/licence.html +share/netsurf/en/welcome.html +share/netsurf/favicon.png +share/netsurf/fr/Messages +share/netsurf/gtkdefault.css +share/netsurf/history.gtk2.ui +share/netsurf/history.gtk3.ui +share/netsurf/hotlist.gtk2.ui +share/netsurf/hotlist.gtk3.ui +share/netsurf/icons/content.png +share/netsurf/icons/directory.png +share/netsurf/icons/search.png +share/netsurf/internal.css +share/netsurf/it/Messages +share/netsurf/it/credits.html +share/netsurf/it/licence.html +share/netsurf/it/welcome.html +share/netsurf/ja/welcome.html +share/netsurf/languages +share/netsurf/license +share/netsurf/login.gtk2.ui +share/netsurf/login.gtk3.ui +share/netsurf/netsurf-16x16.xpm +share/netsurf/netsurf.gtk2.ui +share/netsurf/netsurf.gtk3.ui +share/netsurf/netsurf.png +share/netsurf/netsurf.xpm +share/netsurf/nl/Messages +share/netsurf/options.gtk2.ui +share/netsurf/options.gtk3.ui +share/netsurf/password.gtk2.ui +share/netsurf/password.gtk3.ui +share/netsurf/quirks.css +share/netsurf/source.gtk2.ui +share/netsurf/source.gtk3.ui +share/netsurf/ssl.gtk2.ui +share/netsurf/ssl.gtk3.ui +share/netsurf/tabcontents.gtk2.ui +share/netsurf/tabcontents.gtk3.ui +share/netsurf/themelist +share/netsurf/themes/Alpha.png +share/netsurf/themes/gtk+/back.png +share/netsurf/themes/gtk+/closetab.png +share/netsurf/themes/gtk+/closewindow.png +share/netsurf/themes/gtk+/copy.png +share/netsurf/themes/gtk+/cut.png +share/netsurf/themes/gtk+/delete.png +share/netsurf/themes/gtk+/forward.png +share/netsurf/themes/gtk+/fullscreen.png +share/netsurf/themes/gtk+/helpabout.png +share/netsurf/themes/gtk+/helpcontents.png +share/netsurf/themes/gtk+/history.png +share/netsurf/themes/gtk+/home.png +share/netsurf/themes/gtk+/info +share/netsurf/themes/gtk+/newtab.png +share/netsurf/themes/gtk+/newwindow.png +share/netsurf/themes/gtk+/openfile.png +share/netsurf/themes/gtk+/paste.png +share/netsurf/themes/gtk+/preferences.png +share/netsurf/themes/gtk+/print.png +share/netsurf/themes/gtk+/printpreview.png +share/netsurf/themes/gtk+/quit.png +share/netsurf/themes/gtk+/reload.png +share/netsurf/themes/gtk+/savepage.png +share/netsurf/themes/gtk+/selectall.png +share/netsurf/themes/gtk+/stop.png +share/netsurf/themes/gtk+/viewsource.png +share/netsurf/themes/gtk+/zoomminus.png +share/netsurf/themes/gtk+/zoomnormal.png +share/netsurf/themes/gtk+/zoomplus.png +share/netsurf/throbber/throbber0.png +share/netsurf/throbber/throbber1.png +share/netsurf/throbber/throbber2.png +share/netsurf/throbber/throbber3.png +share/netsurf/throbber/throbber4.png +share/netsurf/throbber/throbber5.png +share/netsurf/throbber/throbber6.png +share/netsurf/throbber/throbber7.png +share/netsurf/throbber/throbber8.png +share/netsurf/toolbar.gtk2.ui +share/netsurf/toolbar.gtk3.ui +share/netsurf/toolbarIndices +share/netsurf/warning.gtk2.ui +share/netsurf/warning.gtk3.ui +@dirrm share/netsurf/throbber +@dirrm share/netsurf/themes/gtk+ +@dirrm share/netsurf/themes +@dirrm share/netsurf/nl +@dirrm share/netsurf/ja +@dirrm share/netsurf/it +@dirrm share/netsurf/icons +@dirrm share/netsurf/fr +@dirrm share/netsurf/en +@dirrm share/netsurf/de +@dirrm share/netsurf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306142021.r5EKLJmY061761>