Date: Wed, 23 Dec 2015 23:29:45 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404329 - head/games/asc Message-ID: <201512232329.tBNNTj6Q017050@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Wed Dec 23 23:29:44 2015 New Revision: 404329 URL: https://svnweb.freebsd.org/changeset/ports/404329 Log: - Update to 2.6.0.0 PR: 205205 Submitted by: ports fury Approved by: mat (mentor) Differential Revision: D4635 Modified: head/games/asc/Makefile head/games/asc/distinfo Modified: head/games/asc/Makefile ============================================================================== --- head/games/asc/Makefile Wed Dec 23 23:16:49 2015 (r404328) +++ head/games/asc/Makefile Wed Dec 23 23:29:44 2015 (r404329) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= asc -PORTVERSION= 2.6.0.0 -PORTREVISION= 6 +PORTVERSION= 2.6.1.0 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \ http://www.asc-hq.org/music/:music -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS:S/$/:music/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -21,23 +20,18 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ libboost_regex.so:${PORTSDIR}/devel/boost-libs \ - libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 \ + libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libloki.so:${PORTSDIR}/devel/loki -OPTIONS_DEFINE= MUSIC XVID -MUSIC_DESC= Install extra music files - -USES= compiler:c++11-lib gmake libtool lua:51 perl5 pkgconfig tar:bzip2 +USES= compiler:c++11-lib gmake libtool lua perl5 pkgconfig tar:bzip2 USE_CXXSTD= c++11 USE_SDL= image mixer sound sdl USE_WX= 3.0 -WX_UNICODE= yes WX_CONF_ARGS= absolute USE_PERL5= build GNU_CONFIGURE= yes -CFLAGS+= -D_UNICODE_BROKEN_ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -51,28 +45,25 @@ PLIST_FILES= bin/asc \ man/man6/asc_mapedit.6.gz \ man/man6/asc_mount.6.gz \ man/man6/asc_weaponguide.6.gz \ - share/appdata/asc.appdata.xml -PORTDATA= * + share/appdata/asc.appdata.xml \ + ${DATADIR}/asc2_dlg.zip \ + ${DATADIR}/main.ascdat DESKTOP_ENTRIES="Advanced Strategic Command" "Turn based strategic game" "" \ "${PORTNAME}" "" "" -.include <bsd.port.options.mk> +OPTIONS_DEFINE= MUSIC XVID -.if ${PORT_OPTIONS:MXVID} -LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid -.else -CONFIGURE_ENV+= ac_cv_lib_xvidcore_xvid_encore=no -.endif - -.if ${PORT_OPTIONS:MMUSIC} -ASC_MUSICS= frontiers.ogg time_to_strike.ogg machine_wars.ogg - -post-extract: -.for i in ${ASC_MUSICS} - @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/data/music -.endfor -.endif +MUSIC_DESC= Install extra music files +MUSIC_DISTFILES= ${ASC_MUSICS:S,$,:music,} +MUSIC_PLIST_FILES= ${ASC_MUSICS:S,^,%%DATADIR%%/music/,} +XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid +XVID_CONFIGURE_ENV_OFF= ac_cv_lib_xvidcore_xvid_encore=no +ASC_MUSICS= frontiers.ogg time_to_strike.ogg machine_wars.ogg + +post-extract-MUSIC-on: + @(cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${ASC_MUSICS} \ + ${WRKSRC}/data/music) post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" -print0 | ${XARGS} -0 \ @@ -80,9 +71,11 @@ post-patch: 's|/games/|/|g' @${REINPLACE_CMD} -e \ 's|/games/|/|g ; \ - s|lua >=|lua-5.1 >=|g ; \ + s|lua >= 5.1 |lua-${LUA_VER}|g ;\ /if test/s|==|=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|? 0 :|? (void)0 :|' ${WRKSRC}/source/errors.h + @${REINPLACE_CMD} -e \ + 's|tAttackH|AttackH|' ${WRKSRC}/source/actions/vehicleattack.h .include <bsd.port.mk> Modified: head/games/asc/distinfo ============================================================================== --- head/games/asc/distinfo Wed Dec 23 23:16:49 2015 (r404328) +++ head/games/asc/distinfo Wed Dec 23 23:29:44 2015 (r404329) @@ -1,5 +1,5 @@ -SHA256 (asc/asc-2.6.0.0.tar.bz2) = e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb -SIZE (asc/asc-2.6.0.0.tar.bz2) = 42280527 +SHA256 (asc/asc-2.6.1.0.tar.bz2) = 9a1e58e73ba8fdf5d5ac85cdb66804bf688dce2940a8a9c26796de6b6d4f8ddb +SIZE (asc/asc-2.6.1.0.tar.bz2) = 42569531 SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff SIZE (asc/frontiers.ogg) = 4691844 SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512232329.tBNNTj6Q017050>