CVS commit: pkgsrc/games/openttd

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 26 14:48:36 UTC 2020

Modified Files:
        pkgsrc/games/openttd: Makefile PLIST

Log Message:
openttd: Make the PLIST consistent and remove some bogus config args


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/games/openttd/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/openttd/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/openttd/Makefile
diff -u pkgsrc/games/openttd/Makefile:1.85 pkgsrc/games/openttd/Makefile:1.86
--- pkgsrc/games/openttd/Makefile:1.85  Mon Mar 23 10:29:30 2020
+++ pkgsrc/games/openttd/Makefile       Thu Mar 26 14:48:36 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2020/03/23 10:29:30 nia Exp $
+# $NetBSD: Makefile,v 1.86 2020/03/26 14:48:36 nia Exp $
 
 DISTNAME=      openttd-1.9.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games
 MASTER_SITES=  https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -24,6 +24,7 @@ GCC_REQD+=    4.8
 
 BUILDLINK_TRANSFORM+=  opt:-std=c++11:-std=gnu++11 # alloca
 
+CONFIGURE_ARGS+=       --os=UNIX
 CONFIGURE_ARGS+=       --prefix-dir=${PREFIX}
 CONFIGURE_ARGS+=       --binary-dir=bin
 CONFIGURE_ARGS+=       --data-dir=share/openttd
@@ -34,13 +35,9 @@ CONFIGURE_ARGS+=     --man-dir=${PKGMANDIR}/
 CONFIGURE_ARGS+=       --menu-dir=share/applications
 CONFIGURE_ARGS+=       --personal-dir=.openttd
 CONFIGURE_ARGS+=       --shared-dir=${VARBASE}/games/openttd
-CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=       --with-lzo2=${BUILDLINK_PREFIX.lzo}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS.DragonFly+=     --os=FREEBSD
-
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=       --disable-cocoa-quickdraw
 CONFIGURE_ARGS+=       --with-cocoa
@@ -48,6 +45,7 @@ CONFIGURE_ARGS+=      --without-application-b
 CONFIGURE_ARGS+=       --without-osx-sysroot
 .else
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../x11/libxdg-basedir/buildlink3.mk"
 .endif
 
 .include "../../archivers/lzo/buildlink3.mk"

Index: pkgsrc/games/openttd/PLIST
diff -u pkgsrc/games/openttd/PLIST:1.25 pkgsrc/games/openttd/PLIST:1.26
--- pkgsrc/games/openttd/PLIST:1.25     Thu Apr 25 15:55:07 2019
+++ pkgsrc/games/openttd/PLIST  Thu Mar 26 14:48:36 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2019/04/25 15:55:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/03/26 14:48:36 nia Exp $
 bin/openttd
 man/man6/openttd.6
 share/applications/openttd.desktop
@@ -26,6 +26,7 @@ share/openttd/ai/compat_1.8.nut
 share/openttd/ai/compat_1.9.nut
 share/openttd/baseset/no_music.obm
 share/openttd/baseset/no_sound.obs
+share/openttd/baseset/openttd.32.bmp
 share/openttd/baseset/openttd.grf
 share/openttd/baseset/opntitle.dat
 share/openttd/baseset/orig_dos.obg