Tue Sep 17 11:00:23 2019 UTC ()
fix icons in www/netsurf

Now that netsurf uses gtk3, install
adwaita icon theme so that it finds
icons to use with its gui.


(nros)
diff -r1.83 -r1.84 pkgsrc/www/netsurf/Makefile
cvs diff -r1.83 -r1.84 pkgsrc/www/netsurf/Makefile (switch to unified diff)

--- pkgsrc/www/netsurf/Makefile 2019/09/12 18:57:09 1.83
+++ pkgsrc/www/netsurf/Makefile 2019/09/17 11:00:23 1.84
@@ -1,70 +1,70 @@ @@ -1,70 +1,70 @@
1# $NetBSD: Makefile,v 1.83 2019/09/12 18:57:09 nia Exp $ 1# $NetBSD: Makefile,v 1.84 2019/09/17 11:00:23 nros Exp $
2 2
3DISTNAME= netsurf-all-3.9 3DISTNAME= netsurf-all-3.9
4PKGNAME= ${DISTNAME:S/-all//} 4PKGNAME= ${DISTNAME:S/-all//}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://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= https://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 21MAKE_FLAGS+= NETSURF_GTK_MAJOR=3
22 22
23SUBST_CLASSES+= ssl-certs 23SUBST_CLASSES+= ssl-certs
24SUBST_STAGE.ssl-certs= pre-configure 24SUBST_STAGE.ssl-certs= pre-configure
25SUBST_MESSAGE.ssl-certs= Fixing hardcoded paths for SSL certs 25SUBST_MESSAGE.ssl-certs= Fixing hardcoded paths for SSL certs
26SUBST_FILES.ssl-certs= netsurf/frontends/beos/gui.cpp 26SUBST_FILES.ssl-certs= netsurf/frontends/beos/gui.cpp
27SUBST_FILES.ssl-certs+= netsurf/frontends/gtk/gui.c 27SUBST_FILES.ssl-certs+= netsurf/frontends/gtk/gui.c
28SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-all 28SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-all
29SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-full 29SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-full
30SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-short 30SUBST_FILES.ssl-certs+= netsurf/test/data/Choices-short
31SUBST_SED.ssl-certs= -e 's,/etc/ssl/certs,${SSLCERTS},' 31SUBST_SED.ssl-certs= -e 's,/etc/ssl/certs,${SSLCERTS},'
32 32
33# Avoid possible problems with already often defined HOST 33# Avoid possible problems with already often defined HOST
34MAKE_ENV+= BUILD="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" 34MAKE_ENV+= BUILD="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}"
35MAKE_ENV+= HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}" 35MAKE_ENV+= HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}"
36 36
37INSTALLATION_DIRS+= bin 37INSTALLATION_DIRS+= bin
38INSTALLATION_DIRS+= share/applications 38INSTALLATION_DIRS+= share/applications
39INSTALLATION_DIRS+= share/netsurf 39INSTALLATION_DIRS+= share/netsurf
40INSTALLATION_DIRS+= share/pixmaps 40INSTALLATION_DIRS+= share/pixmaps
41 41
42BUILDLINK_TRANSFORM+= rm:-Werror 42BUILDLINK_TRANSFORM+= rm:-Werror
43CFLAGS.NetBSD+= -D_NETBSD_SOURCE # needed for strcasestr(3) and strndup(3) 43CFLAGS.NetBSD+= -D_NETBSD_SOURCE # needed for strcasestr(3) and strndup(3)
44 44
45# Needed for the xxd utility 45# Needed for the xxd utility
46TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share 46TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share
47 47
48SUBST_CLASSES+= bin 48SUBST_CLASSES+= bin
49SUBST_STAGE.bin= pre-install 49SUBST_STAGE.bin= pre-install
50SUBST_MESSAGE.bin= Changing executable name in .desktop file 50SUBST_MESSAGE.bin= Changing executable name in .desktop file
51SUBST_FILES.bin= netsurf/frontends/gtk/res/netsurf-gtk.desktop 51SUBST_FILES.bin= netsurf/frontends/gtk/res/netsurf-gtk.desktop
52SUBST_SED.bin= -e 's,netsurf-gtk,netsurf-gtk3,g' 52SUBST_SED.bin= -e 's,netsurf-gtk,netsurf-gtk3,g'
53 53
54post-install: 54post-install:
55 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf.xpm \ 55 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf.xpm \
56 ${DESTDIR}${PREFIX}/share/pixmaps/netsurf.xpm 56 ${DESTDIR}${PREFIX}/share/pixmaps/netsurf.xpm
57 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf-gtk.desktop \ 57 ${INSTALL_DATA} ${WRKSRC}/netsurf/frontends/gtk/res/netsurf-gtk.desktop \
58 ${DESTDIR}${PREFIX}/share/applications/netsurf-gtk.desktop 58 ${DESTDIR}${PREFIX}/share/applications/netsurf-gtk.desktop
59 59
60.include "../../converters/libiconv/buildlink3.mk" 60.include "../../converters/libiconv/buildlink3.mk"
61.include "../../devel/gperf/buildlink3.mk" 61.include "../../devel/gperf/buildlink3.mk"
62.include "../../devel/pango/buildlink3.mk" 62.include "../../devel/pango/buildlink3.mk"
63.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 63.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
64.include "../../graphics/png/buildlink3.mk" 64.include "../../graphics/png/buildlink3.mk"
65.include "../../security/openssl/buildlink3.mk" 65.include "../../security/openssl/buildlink3.mk"
66.include "../../textproc/expat/buildlink3.mk" 66.include "../../textproc/expat/buildlink3.mk"
67.include "../../www/curl/buildlink3.mk" 67.include "../../www/curl/buildlink3.mk"
68.include "../../x11/gtk3/buildlink3.mk" 68.include "../../x11/gtk3/buildlink3.mk"
69.include "../../mk/jpeg.buildlink3.mk" 69.include "../../mk/jpeg.buildlink3.mk"
70.include "../../mk/bsd.pkg.mk" 70.include "../../mk/bsd.pkg.mk"