CVS commit: pkgsrc/games/asc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 28 12:38:36 UTC 2019

Modified Files:
        pkgsrc/games/asc: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/asc/patches: patch-configure
Removed Files:
        pkgsrc/games/asc/patches: patch-source_ASCStringHelpers.h
            patch-source_Property.cpp patch-source_errors.h
            patch-source_gui.cpp patch-source_gui.h patch-source_password.cpp
            patch-source_strtmesg.cpp patch-source_tools_lib_errorout.cpp

Log Message:
asc: Update to 2.6.1.0

Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/games/asc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/asc/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/asc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/asc/patches/patch-configure
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/games/asc/patches/patch-source_ASCStringHelpers.h
cvs rdiff -u -r1.1 -r0 pkgsrc/games/asc/patches/patch-source_Property.cpp \
    pkgsrc/games/asc/patches/patch-source_errors.h \
    pkgsrc/games/asc/patches/patch-source_gui.cpp \
    pkgsrc/games/asc/patches/patch-source_gui.h \
    pkgsrc/games/asc/patches/patch-source_password.cpp \
    pkgsrc/games/asc/patches/patch-source_strtmesg.cpp \
    pkgsrc/games/asc/patches/patch-source_tools_lib_errorout.cpp

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

Modified files:

Index: pkgsrc/games/asc/Makefile
diff -u pkgsrc/games/asc/Makefile:1.64 pkgsrc/games/asc/Makefile:1.65
--- pkgsrc/games/asc/Makefile:1.64      Sun Aug 11 13:21:02 2019
+++ pkgsrc/games/asc/Makefile   Mon Oct 28 12:38:35 2019
@@ -1,57 +1,79 @@
-# $NetBSD: Makefile,v 1.64 2019/08/11 13:21:02 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2019/10/28 12:38:35 nia Exp $
 
-DISTNAME=      asc-source-1.16.4.0
-PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   20
+DISTNAME=      asc-2.6.1.0
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=  .tar.bz2
 
+DIST_SUBDIR=   asc
+
+DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=    frontiers.ogg
+DISTFILES+=    machine_wars.ogg
+DISTFILES+=    time_to_strike.ogg
+
+.for file in frontiers.ogg machine_wars.ogg time_to_strike.ogg
+SITES.${file}= http://www.asc-hq.org/music/
+.endfor
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.asc-hq.org/
-COMMENT=       Turn based strategy game
+COMMENT=       Turn based strategy game in the tradition of the Battle Isle series
+LICENSE=       gnu-gpl-v2
 
-DIST_SUBDIR=           asc
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} frontiers.mp3 \
-                       machine_wars.mp3 time_to_strike.mp3
-.for file in frontiers.mp3 machine_wars.mp3 time_to_strike.mp3
-SITES.${file}= http://asc-hq.org/
-.endfor
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
+TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake perl:build pkg-config
-REPLACE_PERL=          checkfordata.pl
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-paraguitest
-CPPFLAGS.NetBSD+=      -D_UNICODE_BROKEN_
-
-MAKE_ENV+=             top_src_dir=.
-
-# ../weaponguide.cpp:1205: virtual memory exhausted
-UNLIMIT_RESOURCES=     datasize
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=       --disable-gcc296-detection
-.endif
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+
+USE_TOOLS+=    perl pkg-config zip
+USE_TOOLS+=    gmake
+USE_LANGUAGES= c c++11
+
+# C++11
+GCC_REQD+=     4.7
+
+CPPFLAGS+=     -D__EXPORT__=export
+MAKE_ENV+=     top_builddir=.
+MAKE_ENV+=     src_dir=.
+
+SUBST_CLASSES+=                lua
+SUBST_STAGE.lua=       pre-configure
+SUBST_MESSAGE.lua=     Correcting lua library name.
+SUBST_FILES.lua+=      configure
+SUBST_SED.lua=         -e 's/lua5.1/lua-5.1/g'
+
+CONFIGURE_ARGS+=       --disable-sdltest
+CONFIGURE_ARGS+=       --disable-oggtest
+CONFIGURE_ARGS+=       --disable-vorbistest
+CONFIGURE_ARGS+=       --disable-ft2test
+
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/pixmaps
 
 post-extract:
-       mv ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
+       mv ${WRKDIR}/*.ogg ${WRKSRC}/data/music
+
+post-build:
+       cd ${WRKSRC} && ${PREFIX}/bin/icotool -i 1 -x -o asc.png \
+           source/win32/msvc/ASC/icon2.ico
 
-# bug in 1.16.4.0, remove on update
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/data/asc.gfx ${DESTDIR}${PREFIX}/share/games/asc
+       ${INSTALL_DATA} ${FILESDIR}/asc.desktop \
+           ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/asc.png \
+           ${DESTDIR}${PREFIX}/share/pixmaps
 
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDLmm/buildlink3.mk"
-.include "../../devel/libsigc++1/buildlink3.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../audio/SDL_sound/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/physfs/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../x11/paragui/buildlink3.mk"
+.include "../../lang/lua51/buildlink3.mk"
+.include "../../multimedia/xvidcore/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/asc/PLIST
diff -u pkgsrc/games/asc/PLIST:1.4 pkgsrc/games/asc/PLIST:1.5
--- pkgsrc/games/asc/PLIST:1.4  Sun Jun 14 17:56:40 2009
+++ pkgsrc/games/asc/PLIST      Mon Oct 28 12:38:35 2019
@@ -1,24 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/28 12:38:35 nia Exp $
 bin/asc
 bin/asc_demount
-bin/asc_makegfx
 bin/asc_mapedit
 bin/asc_mount
 bin/asc_weaponguide
 man/man6/asc.6
 man/man6/asc_demount.6
-man/man6/asc_makegfx.6
 man/man6/asc_mapedit.6
 man/man6/asc_mount.6
 man/man6/asc_weaponguide.6
-share/games/asc/asc.gfx
-share/games/asc/asc_dlg.zip
-share/games/asc/buildings.con
-share/games/asc/main.con
-share/games/asc/mk1.con
-share/games/asc/music/frontiers.mp3
-share/games/asc/music/machine_wars.mp3
-share/games/asc/music/time_to_strike.mp3
-share/games/asc/trrobj.con
-share/games/asc/trrobj2.con
-share/games/asc/units-mk3.con
+share/appdata/asc.appdata.xml
+share/applications/asc.desktop
+share/games/asc/asc2_dlg.zip
+share/games/asc/main.ascdat
+share/games/asc/music/frontiers.ogg
+share/games/asc/music/machine_wars.ogg
+share/games/asc/music/time_to_strike.ogg
+share/pixmaps/asc.png

Index: pkgsrc/games/asc/distinfo
diff -u pkgsrc/games/asc/distinfo:1.13 pkgsrc/games/asc/distinfo:1.14
--- pkgsrc/games/asc/distinfo:1.13      Tue Nov  3 20:56:44 2015
+++ pkgsrc/games/asc/distinfo   Mon Oct 28 12:38:35 2019
@@ -1,26 +1,19 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 20:56:44 agc Exp $
+$NetBSD: distinfo,v 1.14 2019/10/28 12:38:35 nia Exp $
 
-SHA1 (asc/asc-source-1.16.4.0.tar.bz2) = 338081823943e08848325e6f2126e5c533517ae9
-RMD160 (asc/asc-source-1.16.4.0.tar.bz2) = a4de675628875cc36f30b39d1fb1ef3ac879e369
-SHA512 (asc/asc-source-1.16.4.0.tar.bz2) = cda8f530661c360248e5bacf43d1fb5bce81b9078cf533bf2bc147b8bcfd65cd80ba9b9d0665199542df64e8a9d2973db9e9211574ac92b6da860632f517133c
-Size (asc/asc-source-1.16.4.0.tar.bz2) = 11730677 bytes
-SHA1 (asc/frontiers.mp3) = 7c6753fb5fe5e498fa780271da0a302c0619a1ca
-RMD160 (asc/frontiers.mp3) = 4d2ec2ff647ef6ef66a2264465b86451bbba64f5
-SHA512 (asc/frontiers.mp3) = b3e365f5c305416bcb1a746de85250e3e400751c5328d520edfe4180bd9c25dbafd1a87e520d206a2566d71e6e6886239d8b3421de8c97dc0e482149d3d83dac
-Size (asc/frontiers.mp3) = 4407769 bytes
-SHA1 (asc/machine_wars.mp3) = d05e92b46ae0e90d9f3b38ce9c4b41bde599a02e
-RMD160 (asc/machine_wars.mp3) = 192b2a4f20676cd1ce3145df08997d9793ea373f
-SHA512 (asc/machine_wars.mp3) = 0f18a52bb551ed4138de2a37607a5d368e17f08d505ce2835574ed056a149e0df103df3fd66c752bce6de0a6b43544e3d05b015de054d91115e2e3435584a914
-Size (asc/machine_wars.mp3) = 2905989 bytes
-SHA1 (asc/time_to_strike.mp3) = 76abf03155d9a21584f30c20370db0a93449c78a
-RMD160 (asc/time_to_strike.mp3) = a402a00e490f7aca0871b52165d63f3bde3b3bff
-SHA512 (asc/time_to_strike.mp3) = 1d07827774246c59d516fdf2b2fd6d00f6b7ae7e2b90786ed7afd34b9a5c660c6c50dc2e085318c4892a6f5bcf5712271b92cf001dd647f58b4ee54e704dcf42
-Size (asc/time_to_strike.mp3) = 3242969 bytes
-SHA1 (patch-source_ASCStringHelpers.h) = 21caf558907c4eaafe88d714520b014a1c19f57b
-SHA1 (patch-source_Property.cpp) = a8a8e154f8aa5a884cb9fe0e74c806dcaf3020b2
-SHA1 (patch-source_errors.h) = 5d288a390984a5ab673609e3487feb5ab1ee6a8a
-SHA1 (patch-source_gui.cpp) = 3611c053b08fa175bf89b79b9cd0a4d5202affc8
-SHA1 (patch-source_gui.h) = 7e94c8fb53148da05177614fe79e9448693a54b8
-SHA1 (patch-source_password.cpp) = fa56110a045e111f772f09b9e9998d84a76e7d5a
-SHA1 (patch-source_strtmesg.cpp) = 3aa86f7e739983294a86c9ab5a8c0c4a6007c449
-SHA1 (patch-source_tools_lib_errorout.cpp) = 9ccfa2d4447a3606fe72c9a60e79881fdfc1b080
+SHA1 (asc/asc-2.6.1.0.tar.bz2) = 3731e8016143d3c83364f67f4ac7d8e7491b7a50
+RMD160 (asc/asc-2.6.1.0.tar.bz2) = f66fd672638c13661618b0e9a7e364a694793322
+SHA512 (asc/asc-2.6.1.0.tar.bz2) = 9bf6c8ef44e4f8df32335d6fda3d755e74065cfa36cfab913c7f5990cea0d7f7215642e290a0aa0eaa98417a0f19a971d17fd4b464dbece9f60880bd32daee2e
+Size (asc/asc-2.6.1.0.tar.bz2) = 42569531 bytes
+SHA1 (asc/frontiers.ogg) = 2c41ff90e6d8598e7efe7414cd61df0972720b71
+RMD160 (asc/frontiers.ogg) = d9180257b34871301d55ec4db37fab3d144ceecf
+SHA512 (asc/frontiers.ogg) = 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
+Size (asc/frontiers.ogg) = 4691844 bytes
+SHA1 (asc/machine_wars.ogg) = e889908b8d6e84a5df90be9ccc965074c6ed94b0
+RMD160 (asc/machine_wars.ogg) = 41da08dce0671329bb7bb16f52249f1baeaa1b49
+SHA512 (asc/machine_wars.ogg) = 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
+Size (asc/machine_wars.ogg) = 3138308 bytes
+SHA1 (asc/time_to_strike.ogg) = 27f06d312a7a58aa853b46e3775d6fecd813d57a
+RMD160 (asc/time_to_strike.ogg) = 03f67601e729ba8cbdeb01b6e0b4317bbe10e435
+SHA512 (asc/time_to_strike.ogg) = 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
+Size (asc/time_to_strike.ogg) = 3830679 bytes
+SHA1 (patch-configure) = 03ab5b82af9ec361dd671194554ca30abf9b240e

Added files:

Index: pkgsrc/games/asc/patches/patch-configure
diff -u /dev/null pkgsrc/games/asc/patches/patch-configure:1.1
--- /dev/null   Mon Oct 28 12:38:36 2019
+++ pkgsrc/games/asc/patches/patch-configure    Mon Oct 28 12:38:35 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2019/10/28 12:38:35 nia Exp $
+
+Shell portability.
+
+--- configure.orig     2015-12-06 14:12:04.000000000 +0000
++++ configure
+@@ -22981,7 +22981,7 @@ fi
+ 
+ 
+ 
+-if test "x$missingmusic" == xx ; then
++if test "x$missingmusic" = xx ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+ The music files could not be found. These are not distributed together with the
+ source code because of their size.