Thu Mar 26 14:48:36 2020 UTC ()
openttd: Make the PLIST consistent and remove some bogus config args


(nia)
diff -r1.85 -r1.86 pkgsrc/games/openttd/Makefile
diff -r1.25 -r1.26 pkgsrc/games/openttd/PLIST
cvs diff -r1.85 -r1.86 pkgsrc/games/openttd/Makefile (expand / switch to unified diff)

--- pkgsrc/games/openttd/Makefile 2020/03/23 10:29:30 1.85
+++ pkgsrc/games/openttd/Makefile 2020/03/26 14:48:36 1.86
@@ -1,63 +1,61 @@ @@ -1,63 +1,61 @@
1# $NetBSD: Makefile,v 1.85 2020/03/23 10:29:30 nia Exp $ 1# $NetBSD: Makefile,v 1.86 2020/03/26 14:48:36 nia Exp $
2 2
3DISTNAME= openttd-1.9.3-source 3DISTNAME= openttd-1.9.3-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/ 7MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.openttd.org/ 11HOMEPAGE= https://www.openttd.org/
12COMMENT= Open source clone of Transport Tycoon Deluxe 12COMMENT= Open source clone of Transport Tycoon Deluxe
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
19BUILD_DEFS+= VARBASE 19BUILD_DEFS+= VARBASE
20BUILD_TARGET= bundle 20BUILD_TARGET= bundle
21 21
22# C++11 22# C++11
23GCC_REQD+= 4.8 23GCC_REQD+= 4.8
24 24
25BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 # alloca 25BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 # alloca
26 26
 27CONFIGURE_ARGS+= --os=UNIX
27CONFIGURE_ARGS+= --prefix-dir=${PREFIX} 28CONFIGURE_ARGS+= --prefix-dir=${PREFIX}
28CONFIGURE_ARGS+= --binary-dir=bin 29CONFIGURE_ARGS+= --binary-dir=bin
29CONFIGURE_ARGS+= --data-dir=share/openttd 30CONFIGURE_ARGS+= --data-dir=share/openttd
30CONFIGURE_ARGS+= --doc-dir=share/doc/openttd 31CONFIGURE_ARGS+= --doc-dir=share/doc/openttd
31CONFIGURE_ARGS+= --icon-theme-dir=share/icons/hicolor 32CONFIGURE_ARGS+= --icon-theme-dir=share/icons/hicolor
32CONFIGURE_ARGS+= --install-dir=${DESTDIR} 33CONFIGURE_ARGS+= --install-dir=${DESTDIR}
33CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6 34CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6
34CONFIGURE_ARGS+= --menu-dir=share/applications 35CONFIGURE_ARGS+= --menu-dir=share/applications
35CONFIGURE_ARGS+= --personal-dir=.openttd 36CONFIGURE_ARGS+= --personal-dir=.openttd
36CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd 37CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd
37CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 
38CONFIGURE_ARGS+= --with-lzo2=${BUILDLINK_PREFIX.lzo}/lib 
39 38
40.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
41 40
42CONFIGURE_ARGS.DragonFly+= --os=FREEBSD 
43 
44.if ${OPSYS} == "Darwin" 41.if ${OPSYS} == "Darwin"
45CONFIGURE_ARGS+= --disable-cocoa-quickdraw 42CONFIGURE_ARGS+= --disable-cocoa-quickdraw
46CONFIGURE_ARGS+= --with-cocoa 43CONFIGURE_ARGS+= --with-cocoa
47CONFIGURE_ARGS+= --without-application-bundle 44CONFIGURE_ARGS+= --without-application-bundle
48CONFIGURE_ARGS+= --without-osx-sysroot 45CONFIGURE_ARGS+= --without-osx-sysroot
49.else 46.else
50.include "../../devel/SDL/buildlink3.mk" 47.include "../../devel/SDL/buildlink3.mk"
 48.include "../../x11/libxdg-basedir/buildlink3.mk"
51.endif 49.endif
52 50
53.include "../../archivers/lzo/buildlink3.mk" 51.include "../../archivers/lzo/buildlink3.mk"
54.include "../../archivers/xz/buildlink3.mk" 52.include "../../archivers/xz/buildlink3.mk"
55.include "../../audio/fluidsynth/buildlink3.mk" 53.include "../../audio/fluidsynth/buildlink3.mk"
56.include "../../converters/libiconv/buildlink3.mk" 54.include "../../converters/libiconv/buildlink3.mk"
57.include "../../devel/zlib/buildlink3.mk" 55.include "../../devel/zlib/buildlink3.mk"
58.include "../../fonts/fontconfig/buildlink3.mk" 56.include "../../fonts/fontconfig/buildlink3.mk"
59.include "../../graphics/freetype2/buildlink3.mk" 57.include "../../graphics/freetype2/buildlink3.mk"
60.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 58.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
61.include "../../graphics/png/buildlink3.mk" 59.include "../../graphics/png/buildlink3.mk"
62.include "../../sysutils/desktop-file-utils/desktopdb.mk" 60.include "../../sysutils/desktop-file-utils/desktopdb.mk"
63.include "../../textproc/icu/buildlink3.mk" 61.include "../../textproc/icu/buildlink3.mk"
cvs diff -r1.25 -r1.26 pkgsrc/games/openttd/PLIST (expand / switch to unified diff)

--- pkgsrc/games/openttd/PLIST 2019/04/25 15:55:07 1.25
+++ pkgsrc/games/openttd/PLIST 2020/03/26 14:48:36 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.25 2019/04/25 15:55:07 adam Exp $ 1@comment $NetBSD: PLIST,v 1.26 2020/03/26 14:48:36 nia Exp $
2bin/openttd 2bin/openttd
3man/man6/openttd.6 3man/man6/openttd.6
4share/applications/openttd.desktop 4share/applications/openttd.desktop
5share/doc/openttd/COPYING 5share/doc/openttd/COPYING
6share/doc/openttd/README.md 6share/doc/openttd/README.md
7share/doc/openttd/changelog.txt 7share/doc/openttd/changelog.txt
8share/doc/openttd/known-bugs.txt 8share/doc/openttd/known-bugs.txt
9share/doc/openttd/multiplayer.txt 9share/doc/openttd/multiplayer.txt
10share/icons/hicolor/128x128/apps/openttd.png 10share/icons/hicolor/128x128/apps/openttd.png
11share/icons/hicolor/16x16/apps/openttd.png 11share/icons/hicolor/16x16/apps/openttd.png
12share/icons/hicolor/256x256/apps/openttd.png 12share/icons/hicolor/256x256/apps/openttd.png
13share/icons/hicolor/32x32/apps/openttd.png 13share/icons/hicolor/32x32/apps/openttd.png
14share/icons/hicolor/48x48/apps/openttd.png 14share/icons/hicolor/48x48/apps/openttd.png
@@ -16,26 +16,27 @@ share/icons/hicolor/64x64/apps/openttd.p @@ -16,26 +16,27 @@ share/icons/hicolor/64x64/apps/openttd.p
16share/openttd/ai/compat_0.7.nut 16share/openttd/ai/compat_0.7.nut
17share/openttd/ai/compat_1.0.nut 17share/openttd/ai/compat_1.0.nut
18share/openttd/ai/compat_1.1.nut 18share/openttd/ai/compat_1.1.nut
19share/openttd/ai/compat_1.2.nut 19share/openttd/ai/compat_1.2.nut
20share/openttd/ai/compat_1.3.nut 20share/openttd/ai/compat_1.3.nut
21share/openttd/ai/compat_1.4.nut 21share/openttd/ai/compat_1.4.nut
22share/openttd/ai/compat_1.5.nut 22share/openttd/ai/compat_1.5.nut
23share/openttd/ai/compat_1.6.nut 23share/openttd/ai/compat_1.6.nut
24share/openttd/ai/compat_1.7.nut 24share/openttd/ai/compat_1.7.nut
25share/openttd/ai/compat_1.8.nut 25share/openttd/ai/compat_1.8.nut
26share/openttd/ai/compat_1.9.nut 26share/openttd/ai/compat_1.9.nut
27share/openttd/baseset/no_music.obm 27share/openttd/baseset/no_music.obm
28share/openttd/baseset/no_sound.obs 28share/openttd/baseset/no_sound.obs
 29share/openttd/baseset/openttd.32.bmp
29share/openttd/baseset/openttd.grf 30share/openttd/baseset/openttd.grf
30share/openttd/baseset/opntitle.dat 31share/openttd/baseset/opntitle.dat
31share/openttd/baseset/orig_dos.obg 32share/openttd/baseset/orig_dos.obg
32share/openttd/baseset/orig_dos.obm 33share/openttd/baseset/orig_dos.obm
33share/openttd/baseset/orig_dos.obs 34share/openttd/baseset/orig_dos.obs
34share/openttd/baseset/orig_dos_de.obg 35share/openttd/baseset/orig_dos_de.obg
35share/openttd/baseset/orig_extra.grf 36share/openttd/baseset/orig_extra.grf
36share/openttd/baseset/orig_tto.obm 37share/openttd/baseset/orig_tto.obm
37share/openttd/baseset/orig_win.obg 38share/openttd/baseset/orig_win.obg
38share/openttd/baseset/orig_win.obm 39share/openttd/baseset/orig_win.obm
39share/openttd/baseset/orig_win.obs 40share/openttd/baseset/orig_win.obs
40share/openttd/game/compat_1.2.nut 41share/openttd/game/compat_1.2.nut
41share/openttd/game/compat_1.3.nut 42share/openttd/game/compat_1.3.nut