Fri Aug 30 22:08:36 2019 UTC ()
chocolate-doom: install icons to the right directory


(nia)
diff -r1.1 -r1.2 pkgsrc/games/chocolate-doom/Makefile
diff -r1.1 -r1.2 pkgsrc/games/chocolate-doom/PLIST
cvs diff -r1.1 -r1.2 pkgsrc/games/chocolate-doom/Makefile (expand / switch to unified diff)

--- pkgsrc/games/chocolate-doom/Makefile 2019/08/30 17:33:25 1.1
+++ pkgsrc/games/chocolate-doom/Makefile 2019/08/30 22:08:36 1.2
@@ -1,37 +1,49 @@ @@ -1,37 +1,49 @@
1# $NetBSD: Makefile,v 1.1 2019/08/30 17:33:25 micha Exp $ 1# $NetBSD: Makefile,v 1.2 2019/08/30 22:08:36 nia Exp $
2 2
3DISTNAME= chocolate-doom-3.0.0 3DISTNAME= chocolate-doom-3.0.0
 4PKGREVISION= 1
4CATEGORIES= games 5CATEGORIES= games
5MASTER_SITES= http://www.chocolate-doom.org/downloads/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://www.chocolate-doom.org/downloads/${PKGVERSION_NOREV}/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.chocolate-doom.org/ 9HOMEPAGE= http://www.chocolate-doom.org/
9COMMENT= Doom/Heretic/Hexen/Strife source port 10COMMENT= Doom/Heretic/Hexen/Strife source port
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
14 15
15.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
16 17
17# no inb/outb 18# no inb/outb
18.if ${OPSYS} == NetBSD 19.if ${OPSYS} == NetBSD
19CONFIGURE_ENV+= ac_cv_lib_i386_i386_iopl=no 20CONFIGURE_ENV+= ac_cv_lib_i386_i386_iopl=no
20CONFIGURE_ENV+= ac_cv_lib_amd64_amd64_iopl=no 21CONFIGURE_ENV+= ac_cv_lib_amd64_amd64_iopl=no
21.endif 22.endif
22 23
23PYTHON_FOR_BUILD_ONLY= yes 24PYTHON_FOR_BUILD_ONLY= yes
24CONFIGURE_ENV+= ac_cv_prog_HAVE_PYTHON=python${PYVERSSUFFIX} 25CONFIGURE_ENV+= ac_cv_prog_HAVE_PYTHON=python${PYVERSSUFFIX}
25REPLACE_PYTHON+= data/convert-icon 26REPLACE_PYTHON+= data/convert-icon
26REPLACE_PYTHON+= man/docgen 27REPLACE_PYTHON+= man/docgen
27REPLACE_PYTHON+= man/simplecpp 28REPLACE_PYTHON+= man/simplecpp
28 29
29.include "../../lang/python/application.mk" 30INSTALLATION_DIRS+= share/icons/hicolor/48x48/apps
 31INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
 32
 33post-install:
 34 ${INSTALL_DATA} ${WRKSRC}/pkg/osx/Resources/app.png \
 35 ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/chocolate-doom.png
 36 ${MV} ${DESTDIR}${PREFIX}/share/icons/chocolate-doom.png \
 37 ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps
 38 ${MV} ${DESTDIR}${PREFIX}/share/icons/chocolate-setup.png \
 39 ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps
30 40
 41.include "../../lang/python/application.mk"
31.include "../../audio/SDL2_mixer/buildlink3.mk" 42.include "../../audio/SDL2_mixer/buildlink3.mk"
32.include "../../audio/libsamplerate/buildlink3.mk" 43.include "../../audio/libsamplerate/buildlink3.mk"
33.include "../../devel/SDL2/buildlink3.mk" 44.include "../../devel/SDL2/buildlink3.mk"
 45.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
34.include "../../graphics/png/buildlink3.mk" 46.include "../../graphics/png/buildlink3.mk"
35.include "../../net/SDL2_net/buildlink3.mk" 47.include "../../net/SDL2_net/buildlink3.mk"
36.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
37.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/games/chocolate-doom/PLIST (expand / switch to unified diff)

--- pkgsrc/games/chocolate-doom/PLIST 2019/08/30 17:33:25 1.1
+++ pkgsrc/games/chocolate-doom/PLIST 2019/08/30 22:08:36 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2019/08/30 17:33:25 micha Exp $ 1@comment $NetBSD: PLIST,v 1.2 2019/08/30 22:08:36 nia Exp $
2bin/chocolate-doom 2bin/chocolate-doom
3bin/chocolate-doom-setup 3bin/chocolate-doom-setup
4bin/chocolate-heretic 4bin/chocolate-heretic
5bin/chocolate-heretic-setup 5bin/chocolate-heretic-setup
6bin/chocolate-hexen 6bin/chocolate-hexen
7bin/chocolate-hexen-setup 7bin/chocolate-hexen-setup
8bin/chocolate-server 8bin/chocolate-server
9bin/chocolate-strife 9bin/chocolate-strife
10bin/chocolate-strife-setup 10bin/chocolate-strife-setup
11man/man5/chocolate-doom.cfg.5 11man/man5/chocolate-doom.cfg.5
12man/man5/chocolate-heretic.cfg.5 12man/man5/chocolate-heretic.cfg.5
13man/man5/chocolate-hexen.cfg.5 13man/man5/chocolate-hexen.cfg.5
14man/man5/chocolate-strife.cfg.5 14man/man5/chocolate-strife.cfg.5
@@ -60,15 +60,16 @@ share/doc/chocolate-hexen/ChangeLog @@ -60,15 +60,16 @@ share/doc/chocolate-hexen/ChangeLog
60share/doc/chocolate-hexen/INSTALL.hexen 60share/doc/chocolate-hexen/INSTALL.hexen
61share/doc/chocolate-hexen/NEWS.md 61share/doc/chocolate-hexen/NEWS.md
62share/doc/chocolate-hexen/PHILOSOPHY.md 62share/doc/chocolate-hexen/PHILOSOPHY.md
63share/doc/chocolate-hexen/README.Music.md 63share/doc/chocolate-hexen/README.Music.md
64share/doc/chocolate-hexen/README.md 64share/doc/chocolate-hexen/README.md
65share/doc/chocolate-strife/CMDLINE.strife 65share/doc/chocolate-strife/CMDLINE.strife
66share/doc/chocolate-strife/ChangeLog 66share/doc/chocolate-strife/ChangeLog
67share/doc/chocolate-strife/INSTALL.strife 67share/doc/chocolate-strife/INSTALL.strife
68share/doc/chocolate-strife/NEWS.md 68share/doc/chocolate-strife/NEWS.md
69share/doc/chocolate-strife/PHILOSOPHY.md 69share/doc/chocolate-strife/PHILOSOPHY.md
70share/doc/chocolate-strife/README.Music.md 70share/doc/chocolate-strife/README.Music.md
71share/doc/chocolate-strife/README.Strife.md 71share/doc/chocolate-strife/README.Strife.md
72share/doc/chocolate-strife/README.md 72share/doc/chocolate-strife/README.md
73share/icons/chocolate-doom.png 73share/icons/hicolor/128x128/apps/chocolate-doom.png
74share/icons/chocolate-setup.png 74share/icons/hicolor/128x128/apps/chocolate-setup.png
 75share/icons/hicolor/48x48/apps/chocolate-doom.png