Thu Sep 12 18:41:41 2019 UTC ()
netsurf: Switch to gtk3. Install desktop file and icon.

Bump PKGREVISION


(nia)
diff -r1.81 -r1.82 pkgsrc/www/netsurf/Makefile
diff -r1.7 -r1.8 pkgsrc/www/netsurf/PLIST
cvs diff -r1.81 -r1.82 pkgsrc/www/netsurf/Makefile (expand / switch to unified diff)

--- pkgsrc/www/netsurf/Makefile 2019/09/12 17:27:16 1.81
+++ pkgsrc/www/netsurf/Makefile 2019/09/12 18:41:41 1.82
@@ -1,54 +1,69 @@ @@ -1,54 +1,69 @@
1# $NetBSD: Makefile,v 1.81 2019/09/12 17:27:16 nros Exp $ 1# $NetBSD: Makefile,v 1.82 2019/09/12 18:41:41 nia Exp $
2 2
3DISTNAME= netsurf-all-3.9 3DISTNAME= netsurf-all-3.9
4PKGNAME= ${DISTNAME:S/-all//} 4PKGNAME= ${DISTNAME:S/-all//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source-full/ 7MASTER_SITES= https://download.netsurf-browser.org/netsurf/releases/source-full/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.netsurf-browser.org/ 10HOMEPAGE= https://www.netsurf-browser.org/
11COMMENT= Web browser for RISC OS and UNIX-like platforms 11COMMENT= Web browser for RISC OS and UNIX-like platforms
12LICENSE= gnu-gpl-v2 AND mit 12LICENSE= gnu-gpl-v2 AND mit
13 13
14BUILD_DEPENDS+= lemon>=1.0:../../devel/lemon 14BUILD_DEPENDS+= lemon>=1.0:../../devel/lemon
15BUILD_DEPENDS+= re2c>=0.12:../../devel/re2c 15BUILD_DEPENDS+= re2c>=0.12:../../devel/re2c
16BUILD_DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 16BUILD_DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
17 17
18BUILD_TARGET= build 18BUILD_TARGET= build
19USE_TOOLS+= bison flex gmake perl:build pax pkg-config 19USE_TOOLS+= bison flex gmake perl:build pax pkg-config
20 20
 21MAKE_FLAGS+= NETSURF_GTK_MAJOR=3
 22
21SUBST_CLASSES+= ssl-certs 23SUBST_CLASSES+= ssl-certs
22SUBST_STAGE.ssl-certs= pre-configure 24SUBST_STAGE.ssl-certs= pre-configure
23SUBST_MESSAGE.ssl-certs= Fixing hardcoded paths for SSL certs 25SUBST_MESSAGE.ssl-certs= Fixing hardcoded paths for SSL certs
24SUBST_FILES.ssl-certs= netsurf/frontends/beos/gui.cpp 26SUBST_FILES.ssl-certs= netsurf/frontends/beos/gui.cpp
25SUBST_FILES.ssl-certs+= netsurf/frontends/gtk/gui.c 27SUBST_FILES.ssl-certs+= netsurf/frontends/gtk/gui.c
26SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-all 28SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-all
27SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-full 29SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-full
28SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-short 30SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-short
29SUBST_SED.ssl-certs= -e 's,/etc/ssl/certs,${SSLCERTS},' 31SUBST_SED.ssl-certs= -e 's,/etc/ssl/certs,${SSLCERTS},'
30 32
31# Avoid possible problems with already often defined HOST 33# Avoid possible problems with already often defined HOST
32MAKE_ENV+= BUILD="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" 34MAKE_ENV+= BUILD="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}"
33MAKE_ENV+= HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" 35MAKE_ENV+= HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}"
34 36
35INSTALLATION_DIRS+= share/netsurf bin 37INSTALLATION_DIRS+= bin
 38INSTALLATION_DIRS+= share/applications
 39INSTALLATION_DIRS+= share/netsurf
 40INSTALLATION_DIRS+= share/pixmaps
36 41
37BUILDLINK_TRANSFORM+= rm:-Werror 42BUILDLINK_TRANSFORM+= rm:-Werror
38CFLAGS.NetBSD+= -D_NETBSD_SOURCE # needed for strcasestr(3) and strndup(3) 43CFLAGS.NetBSD+= -D_NETBSD_SOURCE # needed for strcasestr(3) and strndup(3)
39 44
40# Needed for the xxd utility 45# Needed for the xxd utility
41TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share 46TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
42 47
43.include "../../x11/gtk2/buildlink3.mk" 48SUBST_CLASSES+= bin
 49SUBST_STAGE.bin= pre-install
 50SUBST_MESSAGE.bin= Changing executable name in .desktop file
 51SUBST_FILES.bin= netsurf/frontends/gtk/res/netsurf-gtk.desktop
 52SUBST_SED.bin= -e 's,netsurf-gtk,netsurf-gtk3,g'
 53
 54post-install:
 55 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf.xpm \
 56 ${DESTDIR}${PREFIX}/share/pixmaps/netsurf.xpm
 57 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf-gtk.desktop \
 58 ${DESTDIR}${PREFIX}/share/applications/netsurf-gtk.desktop
 59
44.include "../../converters/libiconv/buildlink3.mk" 60.include "../../converters/libiconv/buildlink3.mk"
45.include "../../devel/gperf/buildlink3.mk" 61.include "../../devel/gperf/buildlink3.mk"
46.include "../../devel/libglade/buildlink3.mk" 62.include "../../devel/pango/buildlink3.mk"
47.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 63.include "../../graphics/png/buildlink3.mk"
48.include "../../graphics/librsvg/buildlink3.mk" 
49.include "../../graphics/lcms/buildlink3.mk" 
50.include "../../security/openssl/buildlink3.mk" 64.include "../../security/openssl/buildlink3.mk"
 65.include "../../textproc/expat/buildlink3.mk"
51.include "../../www/curl/buildlink3.mk" 66.include "../../www/curl/buildlink3.mk"
52.include "../../textproc/libxml2/buildlink3.mk" 67.include "../../x11/gtk3/buildlink3.mk"
53.include "../../graphics/mng/buildlink3.mk" 68.include "../../mk/jpeg.buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/www/netsurf/PLIST (expand / switch to unified diff)

--- pkgsrc/www/netsurf/PLIST 2017/10/23 10:45:41 1.7
+++ pkgsrc/www/netsurf/PLIST 2019/09/12 18:41:41 1.8
@@ -1,67 +1,69 @@ @@ -1,67 +1,69 @@
1@comment $NetBSD: PLIST,v 1.7 2017/10/23 10:45:41 leot Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/09/12 18:41:41 nia Exp $
2bin/netsurf-gtk 2bin/netsurf-gtk3
 3share/applications/netsurf-gtk.desktop
3share/netsurf/Messages 4share/netsurf/Messages
4share/netsurf/SearchEngines 5share/netsurf/SearchEngines
5share/netsurf/adblock.css 6share/netsurf/adblock.css
6share/netsurf/arrow_down_8x32.png 7share/netsurf/arrow_down_8x32.png
7share/netsurf/ca-bundle.txt 8share/netsurf/ca-bundle.txt
8share/netsurf/cookies.gtk2.ui 9share/netsurf/cookies.gtk3.ui
9share/netsurf/credits.html 10share/netsurf/credits.html
10share/netsurf/de/Messages 11share/netsurf/de/Messages
11share/netsurf/de/welcome.html 12share/netsurf/de/welcome.html
12share/netsurf/default.css 13share/netsurf/default.css
13share/netsurf/default.ico 14share/netsurf/default.ico
14share/netsurf/downloads.gtk2.ui 15share/netsurf/downloads.gtk3.ui
15share/netsurf/en/Messages 16share/netsurf/en/Messages
16share/netsurf/en/credits.html 17share/netsurf/en/credits.html
17share/netsurf/en/licence.html 18share/netsurf/en/licence.html
18share/netsurf/en/maps.html 19share/netsurf/en/maps.html
19share/netsurf/en/welcome.html 20share/netsurf/en/welcome.html
20share/netsurf/favicon.png 21share/netsurf/favicon.png
21share/netsurf/fr/Messages 22share/netsurf/fr/Messages
22share/netsurf/globalhistory.gtk2.ui 23share/netsurf/globalhistory.gtk3.ui
23share/netsurf/hotlist.gtk2.ui 24share/netsurf/hotlist.gtk3.ui
24share/netsurf/icons/arrow-l.png 25share/netsurf/icons/arrow-l.png
25share/netsurf/icons/content.png 26share/netsurf/icons/content.png
26share/netsurf/icons/directory.png 27share/netsurf/icons/directory.png
27share/netsurf/icons/directory2.png 28share/netsurf/icons/directory2.png
28share/netsurf/icons/hotlist-add.png 29share/netsurf/icons/hotlist-add.png
29share/netsurf/icons/hotlist-rmv.png 30share/netsurf/icons/hotlist-rmv.png
30share/netsurf/icons/search.png 31share/netsurf/icons/search.png
31share/netsurf/internal.css 32share/netsurf/internal.css
32share/netsurf/it/Messages 33share/netsurf/it/Messages
33share/netsurf/it/credits.html 34share/netsurf/it/credits.html
34share/netsurf/it/licence.html 35share/netsurf/it/licence.html
35share/netsurf/it/welcome.html 36share/netsurf/it/welcome.html
36share/netsurf/ja/welcome.html 37share/netsurf/ja/welcome.html
37share/netsurf/languages 38share/netsurf/languages
38share/netsurf/licence.html 39share/netsurf/licence.html
39share/netsurf/localhistory.gtk2.ui 40share/netsurf/localhistory.gtk3.ui
40share/netsurf/login.gtk2.ui 41share/netsurf/login.gtk3.ui
41share/netsurf/maps.html 42share/netsurf/maps.html
42share/netsurf/netsurf-16x16.xpm 43share/netsurf/netsurf-16x16.xpm
43share/netsurf/netsurf.gtk2.ui 44share/netsurf/netsurf.gtk3.ui
44share/netsurf/netsurf.png 45share/netsurf/netsurf.png
45share/netsurf/netsurf.xpm 46share/netsurf/netsurf.xpm
46share/netsurf/nl/Messages 47share/netsurf/nl/Messages
47share/netsurf/nl/credits.html 48share/netsurf/nl/credits.html
48share/netsurf/nl/licence.html 49share/netsurf/nl/licence.html
49share/netsurf/nl/welcome.html 50share/netsurf/nl/welcome.html
50share/netsurf/options.gtk2.ui 51share/netsurf/options.gtk3.ui
51share/netsurf/password.gtk2.ui 52share/netsurf/password.gtk3.ui
52share/netsurf/quirks.css 53share/netsurf/quirks.css
53share/netsurf/ssl.gtk2.ui 54share/netsurf/ssl.gtk3.ui
54share/netsurf/tabcontents.gtk2.ui 55share/netsurf/tabcontents.gtk3.ui
55share/netsurf/throbber/throbber0.png 56share/netsurf/throbber/throbber0.png
56share/netsurf/throbber/throbber1.png 57share/netsurf/throbber/throbber1.png
57share/netsurf/throbber/throbber2.png 58share/netsurf/throbber/throbber2.png
58share/netsurf/throbber/throbber3.png 59share/netsurf/throbber/throbber3.png
59share/netsurf/throbber/throbber4.png 60share/netsurf/throbber/throbber4.png
60share/netsurf/throbber/throbber5.png 61share/netsurf/throbber/throbber5.png
61share/netsurf/throbber/throbber6.png 62share/netsurf/throbber/throbber6.png
62share/netsurf/throbber/throbber7.png 63share/netsurf/throbber/throbber7.png
63share/netsurf/throbber/throbber8.png 64share/netsurf/throbber/throbber8.png
64share/netsurf/toolbar.gtk2.ui 65share/netsurf/toolbar.gtk3.ui
65share/netsurf/viewdata.gtk2.ui 66share/netsurf/viewdata.gtk3.ui
66share/netsurf/warning.gtk2.ui 67share/netsurf/warning.gtk3.ui
67share/netsurf/welcome.html 68share/netsurf/welcome.html
 69share/pixmaps/netsurf.xpm