svn commit: r426721 - in head/www/netsurf: . files
Olivier Duchateau
olivierd at FreeBSD.org
Mon Nov 21 14:11:22 UTC 2016
Author: olivierd
Date: Mon Nov 21 14:11:19 2016
New Revision: 426721
URL: https://svnweb.freebsd.org/changeset/ports/426721
Log:
- Update to 3.6
- Adjust dependencies
- Switch to USES= ssl
Added:
head/www/netsurf/files/patch-Makefile (contents, props changed)
head/www/netsurf/files/patch-frontends_gtk_Makefile.defaults (contents, props changed)
head/www/netsurf/files/patch-frontends_gtk_gui.c (contents, props changed)
Deleted:
head/www/netsurf/files/patch-gtk_Makefile.defaults
head/www/netsurf/files/patch-gtk_Makefile.target
head/www/netsurf/files/patch-gtk_gui.c
Modified:
head/www/netsurf/Makefile
head/www/netsurf/distinfo
head/www/netsurf/pkg-plist
Modified: head/www/netsurf/Makefile
==============================================================================
--- head/www/netsurf/Makefile Mon Nov 21 14:04:24 2016 (r426720)
+++ head/www/netsurf/Makefile Mon Nov 21 14:11:19 2016 (r426721)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netsurf
-PORTVERSION= 3.5
+PORTVERSION= 3.6
CATEGORIES= www
MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -23,17 +23,26 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libnsgif.so:graphics/libnsgif \
libnsbmp.so:graphics/libnsbmp \
libdom.so:www/libdom \
- libcss.so:textproc/libcss
+ libcss.so:textproc/libcss \
+ libparserutils.so:devel/libparserutils \
+ libwapcaplet.so:textproc/libwapcaplet \
+ libhubbub.so:www/libhubbub \
+ libexpat.so:textproc/expat2 \
+ libnspsl.so:dns/libnspsl
+RUN_DEPENDS= duk:lang/duktape \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
ALL_TARGET= #empty
-LDFLAGS+= -lssl -lcrypto -L${LOCALBASE}/lib ${ICONV_LIB}
+LDFLAGS+= -L${OPENSSLLIB} -lssl -lcrypto ${ICONV_LIB}
+CFLAGS+= -I${OPENSSLINC}
MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \
+ TARGET="gtk3" \
WARNFLAGS="" Q="" OPTCFLAGS="${CFLAGS}"
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
+USES= bison desktop-file-utils gettext-runtime gmake iconv jpeg \
+ localbase pkgconfig shebangfix ssl
+USE_GNOME= glib20 gtk30 cairo librsvg2
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
@@ -49,13 +58,9 @@ post-patch:
@${REINPLACE_CMD} '/CFLAGS/d' \
${WRKSRC}//Makefile.defaults
@${REINPLACE_CMD} 's| -O2||' \
- ${WRKSRC}/gtk/Makefile.defaults
- @${REINPLACE_CMD} \
- -e '/OpenSSL/d' -e 's| -g||' \
- -e 's/-DG_DISABLE_DEPRECATED//' \
- ${WRKSRC}/gtk/Makefile.target
+ ${WRKSRC}/frontends/gtk/Makefile.defaults
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
- ${WRKSRC}/gtk/gui.c
+ ${WRKSRC}/frontends/gtk/gui.c
do-configure:
@${CP} ${FILESDIR}/Makefile.config ${WRKSRC}
@@ -68,4 +73,15 @@ do-configure:
${WRKSRC}/Makefile.config
.endif
+post-install:
+ cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf netsurf-gtk3 \
+ netsurf-gtk
+.for d in applications pixmaps
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/${d}
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
+ ${STAGEDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf.xpm \
+ ${STAGEDIR}${PREFIX}/share/pixmaps
+
.include <bsd.port.post.mk>
Modified: head/www/netsurf/distinfo
==============================================================================
--- head/www/netsurf/distinfo Mon Nov 21 14:04:24 2016 (r426720)
+++ head/www/netsurf/distinfo Mon Nov 21 14:11:19 2016 (r426721)
@@ -1,2 +1,3 @@
-SHA256 (netsurf-3.5-src.tar.gz) = 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc
-SIZE (netsurf-3.5-src.tar.gz) = 4094532
+TIMESTAMP = 1479722228
+SHA256 (netsurf-3.6-src.tar.gz) = 59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c
+SIZE (netsurf-3.6-src.tar.gz) = 4129091
Added: head/www/netsurf/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/netsurf/files/patch-Makefile Mon Nov 21 14:11:19 2016 (r426721)
@@ -0,0 +1,10 @@
+--- Makefile.orig 2016-11-19 13:37:41 UTC
++++ Makefile
+@@ -555,7 +555,6 @@ ifeq ($(HOST),mint)
+ else
+ $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl))
+ endif
+-$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL))
+
+ $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
+ $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
Added: head/www/netsurf/files/patch-frontends_gtk_Makefile.defaults
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/netsurf/files/patch-frontends_gtk_Makefile.defaults Mon Nov 21 14:11:19 2016 (r426721)
@@ -0,0 +1,11 @@
+--- frontends/gtk/Makefile.defaults.orig 2016-11-19 13:37:41 UTC
++++ frontends/gtk/Makefile.defaults
+@@ -4,7 +4,7 @@
+
+ # Where to search for NetSurf's resources after looking in ~/.netsurf and
+ # $NETSURFRES. It must have a trailing /
+-NETSURF_GTK_RES_PATH := $(PREFIX)/share/netsurf/:./frontends/gtk/res/
++NETSURF_GTK_RES_PATH := $(PREFIX)/share/netsurf/
+
+ # Where to install the netsurf binary
+ NETSURF_GTK_BIN := $(PREFIX)/bin/
Added: head/www/netsurf/files/patch-frontends_gtk_gui.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/netsurf/files/patch-frontends_gtk_gui.c Mon Nov 21 14:11:19 2016 (r426721)
@@ -0,0 +1,11 @@
+--- frontends/gtk/gui.c.orig 2016-11-19 13:37:41 UTC
++++ frontends/gtk/gui.c
+@@ -198,7 +198,7 @@ static nserror set_defaults(struct nsopt
+ }
+
+ /* default path to certificates */
+- nsoption_setnull_charp(ca_path, strdup("/etc/ssl/certs"));
++ nsoption_setnull_charp(ca_path, strdup("%%PREFIX%%/share/certs"));
+
+ if ((nsoption_charp(cookie_file) == NULL) ||
+ (nsoption_charp(cookie_jar) == NULL) ||
Modified: head/www/netsurf/pkg-plist
==============================================================================
--- head/www/netsurf/pkg-plist Mon Nov 21 14:04:24 2016 (r426720)
+++ head/www/netsurf/pkg-plist Mon Nov 21 14:11:19 2016 (r426721)
@@ -1,17 +1,18 @@
bin/netsurf-gtk
-share/applications/netsurf.desktop
+bin/netsurf-gtk3
+share/applications/netsurf-gtk.desktop
%%DATADIR%%/Messages
%%DATADIR%%/SearchEngines
%%DATADIR%%/adblock.css
%%DATADIR%%/arrow_down_8x32.png
%%DATADIR%%/ca-bundle.txt
-%%DATADIR%%/cookies.gtk2.ui
+%%DATADIR%%/cookies.gtk3.ui
%%DATADIR%%/credits.html
%%DATADIR%%/de/Messages
%%DATADIR%%/de/welcome.html
%%DATADIR%%/default.css
%%DATADIR%%/default.ico
-%%DATADIR%%/downloads.gtk2.ui
+%%DATADIR%%/downloads.gtk3.ui
%%DATADIR%%/en/Messages
%%DATADIR%%/en/credits.html
%%DATADIR%%/en/licence.html
@@ -19,8 +20,8 @@ share/applications/netsurf.desktop
%%DATADIR%%/en/welcome.html
%%DATADIR%%/favicon.png
%%DATADIR%%/fr/Messages
-%%DATADIR%%/history.gtk2.ui
-%%DATADIR%%/hotlist.gtk2.ui
+%%DATADIR%%/history.gtk3.ui
+%%DATADIR%%/hotlist.gtk3.ui
%%DATADIR%%/icons/arrow-l.png
%%DATADIR%%/icons/content.png
%%DATADIR%%/icons/directory.png
@@ -36,21 +37,21 @@ share/applications/netsurf.desktop
%%DATADIR%%/ja/welcome.html
%%DATADIR%%/languages
%%DATADIR%%/licence.html
-%%DATADIR%%/login.gtk2.ui
+%%DATADIR%%/login.gtk3.ui
%%DATADIR%%/maps.html
%%DATADIR%%/netsurf-16x16.xpm
-%%DATADIR%%/netsurf.gtk2.ui
+%%DATADIR%%/netsurf.gtk3.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%%/options.gtk3.ui
+%%DATADIR%%/password.gtk3.ui
%%DATADIR%%/quirks.css
-%%DATADIR%%/ssl.gtk2.ui
-%%DATADIR%%/tabcontents.gtk2.ui
+%%DATADIR%%/ssl.gtk3.ui
+%%DATADIR%%/tabcontents.gtk3.ui
%%DATADIR%%/throbber/throbber0.png
%%DATADIR%%/throbber/throbber1.png
%%DATADIR%%/throbber/throbber2.png
@@ -60,9 +61,8 @@ share/applications/netsurf.desktop
%%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%%/toolbar.gtk3.ui
+%%DATADIR%%/viewdata.gtk3.ui
+%%DATADIR%%/warning.gtk3.ui
%%DATADIR%%/welcome.html
share/pixmaps/netsurf.xpm
More information about the svn-ports-all
mailing list