Received: by mail.netbsd.org (Postfix, from userid 605) id E6FD784D40; Thu, 12 Sep 2019 18:41:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6E18484D35 for ; Thu, 12 Sep 2019 18:41:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ZxA-UsQj2l5f for ; Thu, 12 Sep 2019 18:41:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BAE2984D02 for ; Thu, 12 Sep 2019 18:41:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B48B6FBF4; Thu, 12 Sep 2019 18:41:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1568313701137710" MIME-Version: 1.0 Date: Thu, 12 Sep 2019 18:41:41 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/netsurf To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190912184141.B48B6FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1568313701137710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Sep 12 18:41:41 UTC 2019 Modified Files: pkgsrc/www/netsurf: Makefile PLIST Log Message: netsurf: Switch to gtk3. Install desktop file and icon. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/netsurf/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/netsurf/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1568313701137710 Content-Disposition: inline Content-Length: 5714 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/netsurf/Makefile diff -u pkgsrc/www/netsurf/Makefile:1.81 pkgsrc/www/netsurf/Makefile:1.82 --- pkgsrc/www/netsurf/Makefile:1.81 Thu Sep 12 17:27:16 2019 +++ pkgsrc/www/netsurf/Makefile Thu Sep 12 18:41:41 2019 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.81 2019/09/12 17:27:16 nros Exp $ +# $NetBSD: Makefile,v 1.82 2019/09/12 18:41:41 nia Exp $ DISTNAME= netsurf-all-3.9 PKGNAME= ${DISTNAME:S/-all//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www -MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source-full/ +MASTER_SITES= https://download.netsurf-browser.org/netsurf/releases/source-full/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.netsurf-browser.org/ +HOMEPAGE= https://www.netsurf-browser.org/ COMMENT= Web browser for RISC OS and UNIX-like platforms LICENSE= gnu-gpl-v2 AND mit @@ -18,6 +18,8 @@ BUILD_DEPENDS+= p5-HTML-Parser-[0-9]*:.. BUILD_TARGET= build USE_TOOLS+= bison flex gmake perl:build pax pkg-config +MAKE_FLAGS+= NETSURF_GTK_MAJOR=3 + SUBST_CLASSES+= ssl-certs SUBST_STAGE.ssl-certs= pre-configure SUBST_MESSAGE.ssl-certs= Fixing hardcoded paths for SSL certs @@ -32,7 +34,10 @@ SUBST_SED.ssl-certs= -e 's,/etc/ssl/cer MAKE_ENV+= BUILD="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" MAKE_ENV+= HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" -INSTALLATION_DIRS+= share/netsurf bin +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= share/applications +INSTALLATION_DIRS+= share/netsurf +INSTALLATION_DIRS+= share/pixmaps BUILDLINK_TRANSFORM+= rm:-Werror CFLAGS.NetBSD+= -D_NETBSD_SOURCE # needed for strcasestr(3) and strndup(3) @@ -40,15 +45,25 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE # need # Needed for the xxd utility TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share -.include "../../x11/gtk2/buildlink3.mk" +SUBST_CLASSES+= bin +SUBST_STAGE.bin= pre-install +SUBST_MESSAGE.bin= Changing executable name in .desktop file +SUBST_FILES.bin= netsurf/frontends/gtk/res/netsurf-gtk.desktop +SUBST_SED.bin= -e 's,netsurf-gtk,netsurf-gtk3,g' + +post-install: + ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf.xpm \ + ${DESTDIR}${PREFIX}/share/pixmaps/netsurf.xpm + ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf-gtk.desktop \ + ${DESTDIR}${PREFIX}/share/applications/netsurf-gtk.desktop + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/librsvg/buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../graphics/mng/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/netsurf/PLIST diff -u pkgsrc/www/netsurf/PLIST:1.7 pkgsrc/www/netsurf/PLIST:1.8 --- pkgsrc/www/netsurf/PLIST:1.7 Mon Oct 23 10:45:41 2017 +++ pkgsrc/www/netsurf/PLIST Thu Sep 12 18:41:41 2019 @@ -1,17 +1,18 @@ -@comment $NetBSD: PLIST,v 1.7 2017/10/23 10:45:41 leot Exp $ -bin/netsurf-gtk +@comment $NetBSD: PLIST,v 1.8 2019/09/12 18:41:41 nia Exp $ +bin/netsurf-gtk3 +share/applications/netsurf-gtk.desktop share/netsurf/Messages 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/credits.html 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 @@ -19,8 +20,8 @@ share/netsurf/en/maps.html share/netsurf/en/welcome.html share/netsurf/favicon.png share/netsurf/fr/Messages -share/netsurf/globalhistory.gtk2.ui -share/netsurf/hotlist.gtk2.ui +share/netsurf/globalhistory.gtk3.ui +share/netsurf/hotlist.gtk3.ui share/netsurf/icons/arrow-l.png share/netsurf/icons/content.png share/netsurf/icons/directory.png @@ -36,22 +37,22 @@ share/netsurf/it/welcome.html share/netsurf/ja/welcome.html share/netsurf/languages share/netsurf/licence.html -share/netsurf/localhistory.gtk2.ui -share/netsurf/login.gtk2.ui +share/netsurf/localhistory.gtk3.ui +share/netsurf/login.gtk3.ui share/netsurf/maps.html 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/nl/credits.html share/netsurf/nl/licence.html share/netsurf/nl/welcome.html -share/netsurf/options.gtk2.ui -share/netsurf/password.gtk2.ui +share/netsurf/options.gtk3.ui +share/netsurf/password.gtk3.ui share/netsurf/quirks.css -share/netsurf/ssl.gtk2.ui -share/netsurf/tabcontents.gtk2.ui +share/netsurf/ssl.gtk3.ui +share/netsurf/tabcontents.gtk3.ui share/netsurf/throbber/throbber0.png share/netsurf/throbber/throbber1.png share/netsurf/throbber/throbber2.png @@ -61,7 +62,8 @@ 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/viewdata.gtk2.ui -share/netsurf/warning.gtk2.ui +share/netsurf/toolbar.gtk3.ui +share/netsurf/viewdata.gtk3.ui +share/netsurf/warning.gtk3.ui share/netsurf/welcome.html +share/pixmaps/netsurf.xpm --_----------=_1568313701137710--