Date: Sun, 20 Mar 2016 16:55:03 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411468 - in head/www/netsurf: . files Message-ID: <201603201655.u2KGt3c3092032@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Sun Mar 20 16:55:03 2016 New Revision: 411468 URL: https://svnweb.freebsd.org/changeset/ports/411468 Log: - Update to 3.4 - Remove unneeded patches - Remove obsolete WEBP option - Take maintainership Added: head/www/netsurf/files/patch-gtk_Makefile.target (contents, props changed) Deleted: head/www/netsurf/files/patch-pixel-format head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__nsgenbind-lexer.l head/www/netsurf/files/patch-src__nsgenbind-0.0.1__src__webidl-lexer.l Modified: head/www/netsurf/Makefile head/www/netsurf/distinfo head/www/netsurf/files/Makefile.config head/www/netsurf/pkg-plist Modified: head/www/netsurf/Makefile ============================================================================== --- head/www/netsurf/Makefile Sun Mar 20 16:47:39 2016 (r411467) +++ head/www/netsurf/Makefile Sun Mar 20 16:55:03 2016 (r411468) @@ -2,75 +2,68 @@ # $FreeBSD$ PORTNAME= netsurf -PORTVERSION= 3.0 -PORTREVISION= 6 +PORTVERSION= 3.4 CATEGORIES= www -MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source-full/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-full-src +MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= olivierd@FreeBSD.org COMMENT= Lightweight web browser LICENSE= GPLv2 MIT LICENSE_COMB= multi -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +BUILD_DEPENDS= duk:${PORTSDIR}/lang/duktape \ + nsgenbind:${PORTSDIR}/devel/nsgenbind \ + p5-HTML-Parser>=3.72:${PORTSDIR}/www/p5-HTML-Parser LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ - libpng.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png \ + libnsutils.so:${PORTSDIR}/devel/libnsutils \ + libutf8proc.so:${PORTSDIR}/textproc/libutf8proc \ + libnsgif.so:${PORTSDIR}/graphics/libnsgif \ + libnsbmp.so:${PORTSDIR}/graphics/libnsbmp \ + libdom.so:${PORTSDIR}/www/libdom \ + libcss.so:${PORTSDIR}/textproc/libcss ALL_TARGET= #empty -CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lssl -lcrypto -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \ WARNFLAGS="" Q="" OPTCFLAGS="${CFLAGS}" -USES= bison gmake gperf iconv jpeg pkgconfig -USE_GNOME= gtk20 librsvg2 +MAKE_ENV+= COMPONENT_TYPE="lib-shared" \ + FLEX="${LOCALBASE}/bin/flex" +USES= bison desktop-file-utils gmake iconv jpeg \ + localbase perl5 pkgconfig shebangfix +USE_GNOME= glib20 gtk20 librsvg2 -NSFB_VERSION= 0.1.0 -WRKSRC= ${WRKDIR}/${PORTNAME}-full-${PORTVERSION} +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -DESKTOP_ENTRIES="NetSurf" "${COMMENT}" "${DATADIR}/${PORTNAME}.xpm" \ - "${PORTNAME}" "" true +SHEBANG_FILES= utils/split-messages.pl +perl_CMD= ${SETENV} perl -OPTIONS_DEFINE= GSTREAMER WEBP +OPTIONS_DEFINE= GSTREAMER GSTREAMER_USE= GSTREAMER=yes -WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp .include <bsd.port.pre.mk> post-patch: - @${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} '/CFLAGS/d' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.defaults + ${WRKSRC}//Makefile.defaults @${REINPLACE_CMD} 's| -O2||' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.defaults + ${WRKSRC}/gtk/Makefile.defaults @${REINPLACE_CMD} \ - -e '/OpenSSL/d' -e '/lcms/d' -e 's| -g||' \ + -e '/OpenSSL/d' -e 's| -g||' \ -e 's/-DG_DISABLE_DEPRECATED//' \ - -e 's/-DGDK_PIXBUF_DISABLE_DEPRECATED//' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.target - @${REINPLACE_CMD} -e 's| -g|| ; s|flex|${LOCALBASE}/bin/&|' \ - ${WRKSRC}/src/nsgenbind-0.0.1/src/Makefile + ${WRKSRC}/gtk/Makefile.target do-configure: - @${CP} ${FILESDIR}/Makefile.config ${WRKSRC}/src/netsurf-${PORTVERSION} + @${CP} ${FILESDIR}/Makefile.config ${WRKSRC} .if empty(ICONV_LIB) @${REINPLACE_CMD} '/NETSURF_USE_LIBICONV_PLUG/ s|NO|YES|' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config + ${WRKSRC}/Makefile.config .endif .if ${PORT_OPTIONS:MGSTREAMER} @${REINPLACE_CMD} '/NETSURF_USE_VIDEO/ s|NO|YES|' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config + ${WRKSRC}/Makefile.config .endif -.if ${PORT_OPTIONS:MWEBP} - @${REINPLACE_CMD} '/NETSURF_USE_WEBP/ s|NO|YES|' \ - ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config -.endif - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/netsurf .include <bsd.port.post.mk> Modified: head/www/netsurf/distinfo ============================================================================== --- head/www/netsurf/distinfo Sun Mar 20 16:47:39 2016 (r411467) +++ head/www/netsurf/distinfo Sun Mar 20 16:55:03 2016 (r411468) @@ -1,2 +1,2 @@ -SHA256 (netsurf-3.0-full-src.tar.gz) = 5c4467b921d24a8702bfb20875b0eee3ff38707c7e623f24f92eff0b3ba6d6a0 -SIZE (netsurf-3.0-full-src.tar.gz) = 6143522 +SHA256 (netsurf-3.4-src.tar.gz) = 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 +SIZE (netsurf-3.4-src.tar.gz) = 4133201 Modified: head/www/netsurf/files/Makefile.config ============================================================================== --- head/www/netsurf/files/Makefile.config Sun Mar 20 16:47:39 2016 (r411467) +++ head/www/netsurf/files/Makefile.config Sun Mar 20 16:55:03 2016 (r411468) @@ -1,7 +1,5 @@ -NETSURF_USE_HARU_PDF=NO NETSURF_USE_LIBICONV_PLUG=NO -NETSURF_USE_MNG=NO NETSURF_USE_NSSVG=NO -NETSURF_USE_ROSPRITE=NO +NETSURF_USE_RSVG=YES NETSURF_USE_VIDEO=NO -NETSURF_USE_WEBP=NO +NETSURF_STRIP_BINARY=YES Added: head/www/netsurf/files/patch-gtk_Makefile.target ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/netsurf/files/patch-gtk_Makefile.target Sun Mar 20 16:55:03 2016 (r411468) @@ -0,0 +1,15 @@ +--- gtk/Makefile.target.orig 2016-02-16 13:30:38 UTC ++++ gtk/Makefile.target +@@ -210,7 +210,11 @@ GTK_TRANSLATIONS_HTML := de en fr it ja + + install-gtk: + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) +- $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf ++ $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk ++ $(Q)mkdir -p $(DESTDIR)$(PREFIX)/share/applications ++ $(Q)install -m 0644 gtk/res/*.desktop $(DESTDIR)$(PREFIX)/share/applications/netsurf.desktop ++ $(Q)mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps ++ $(Q)install -m 0644 gtk/res/netsurf.xpm $(DESTDIR)$(PREFIX)/share/pixmaps + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons + $(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber Modified: head/www/netsurf/pkg-plist ============================================================================== --- head/www/netsurf/pkg-plist Sun Mar 20 16:47:39 2016 (r411467) +++ head/www/netsurf/pkg-plist Sun Mar 20 16:55:03 2016 (r411468) @@ -1,99 +1,99 @@ -bin/netsurf -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 +bin/netsurf-gtk +share/applications/netsurf.desktop +%%DATADIR%%/Messages +%%DATADIR%%/SearchEngines +%%DATADIR%%/adblock.css +%%DATADIR%%/arrow_down_8x32.png +%%DATADIR%%/ca-bundle.txt +%%DATADIR%%/cookies.gtk2.ui +%%DATADIR%%/credits.html +%%DATADIR%%/de/Messages +%%DATADIR%%/de/welcome.html +%%DATADIR%%/default.css +%%DATADIR%%/default.ico +%%DATADIR%%/downloads.gtk2.ui +%%DATADIR%%/en/Messages +%%DATADIR%%/en/credits.html +%%DATADIR%%/en/licence.html +%%DATADIR%%/en/maps.html +%%DATADIR%%/en/welcome.html +%%DATADIR%%/favicon.png +%%DATADIR%%/fr/Messages +%%DATADIR%%/history.gtk2.ui +%%DATADIR%%/hotlist.gtk2.ui +%%DATADIR%%/icons/arrow-l.png +%%DATADIR%%/icons/content.png +%%DATADIR%%/icons/directory.png +%%DATADIR%%/icons/directory2.png +%%DATADIR%%/icons/hotlist-add.png +%%DATADIR%%/icons/hotlist-rmv.png +%%DATADIR%%/icons/search.png +%%DATADIR%%/internal.css +%%DATADIR%%/it/Messages +%%DATADIR%%/it/credits.html +%%DATADIR%%/it/licence.html +%%DATADIR%%/it/welcome.html +%%DATADIR%%/ja/welcome.html +%%DATADIR%%/languages +%%DATADIR%%/licence.html +%%DATADIR%%/login.gtk2.ui +%%DATADIR%%/maps.html +%%DATADIR%%/netsurf-16x16.xpm +%%DATADIR%%/netsurf.gtk2.ui +%%DATADIR%%/netsurf.png +%%DATADIR%%/netsurf.xpm +%%DATADIR%%/nl/Messages +%%DATADIR%%/nl/credits.html +%%DATADIR%%/nl/licence.html +%%DATADIR%%/nl/welcome.html +%%DATADIR%%/options.gtk2.ui +%%DATADIR%%/password.gtk2.ui +%%DATADIR%%/quirks.css +%%DATADIR%%/ssl.gtk2.ui +%%DATADIR%%/tabcontents.gtk2.ui +%%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.gtk2.ui +%%DATADIR%%/toolbarIndices +%%DATADIR%%/viewdata.gtk2.ui +%%DATADIR%%/warning.gtk2.ui +%%DATADIR%%/welcome.html +share/pixmaps/netsurf.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603201655.u2KGt3c3092032>