Bug 185511 - games/asc: Update to version 2.6.0.0
Summary: games/asc: Update to version 2.6.0.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Danilo Egea Gondolfo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-05 18:10 UTC by tkato432
Modified: 2014-01-19 19:30 UTC (History)
0 users

See Also:


Attachments
file.diff (4.16 KB, patch)
2014-01-05 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-01-05 18:10:04 UTC
- Update to version 2.6.0.0

Remove file:
files/patch-tools-groupfile.cpp
Comment 1 Danilo Egea Gondolfo freebsd_committer 2014-01-05 19:47:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->danilo

I'll take it.
Comment 2 dfilter service freebsd_committer 2014-01-19 19:25:03 UTC
Author: danilo
Date: Sun Jan 19 19:24:56 2014
New Revision: 340344
URL: http://svnweb.freebsd.org/changeset/ports/340344
QAT: https://qat.redports.org/buildarchive/r340344/

Log:
  - Update from 2.5.0.0 to 2.6.0.0
  - Convert USE_GMAKE to USES
  - Add a desktop entry
  - Add stage support
  
  PR:		ports/185511
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/games/asc/files/
Modified:
  head/games/asc/Makefile
  head/games/asc/distinfo   (contents, props changed)

Modified: head/games/asc/Makefile
==============================================================================
--- head/games/asc/Makefile	Sun Jan 19 19:13:34 2014	(r340343)
+++ head/games/asc/Makefile	Sun Jan 19 19:24:56 2014	(r340344)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	asc
-PORTVERSION=	2.5.0.0
-PORTREVISION=	2
+PORTVERSION=	2.6.0.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
-		http://www.asc-hq.org/music/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS}
+		http://www.asc-hq.org/music/:music
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS:S/$/:music/}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -27,36 +26,47 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 OPTIONS_DEFINE=	MUSIC XVID
 MUSIC_DESC=	Install extra music files
 
-USES=		perl5 pkgconfig
 USE_BZIP2=	yes
+USES=		gmake perl5 pkgconfig
 USE_SDL=	image mixer sound sdl
 USE_WX=		2.4+
 WX_CONF_ARGS=	absolute
 USE_LUA=	5.1
 LUA_COMPS=	lua
 USE_PERL5=	build
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-MAN6=		asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
-		asc_weaponguide.6
-PLIST_FILES=	bin/asc bin/asc_demount bin/asc_mapedit bin/asc_mount \
-		bin/asc_weaponguide \
-		%%DATADIR%%/asc2_dlg.zip %%DATADIR%%/main.ascdat
-PLIST_DIRS=	${ASC_MUSICDIR} %%DATADIR%%
-
 CFLAGS+=	-D_UNICODE_BROKEN_
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/asc \
+		bin/asc_demount \
+		bin/asc_mapedit \
+		bin/asc_mount \
+		bin/asc_weaponguide \
+		man/man6/asc.6.gz \
+		man/man6/asc_demount.6.gz \
+		man/man6/asc_mapedit.6.gz \
+		man/man6/asc_mount.6.gz \
+		man/man6/asc_weaponguide.6.gz \
+		share/appdata/asc.appdata.xml \
+		%%DATADIR%%/asc2_dlg.zip \
+		%%DATADIR%%/main.ascdat
+PLIST_DIRS=	${ASC_MUSICDIR} \
+		%%DATADIR%%
+PLIST_DIRSTRY=	share/appdata
+
+DESKTOP_ENTRIES="Advanced Strategic Command" "Turn based strategic game" "" \
+		"${PORTNAME}" "" ""
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMUSIC}
 ASC_MUSICS=	frontiers.ogg time_to_strike.ogg machine_wars.ogg
 ASC_MUSICDIR=	%%DATADIR%%/music
-.for file in ${ASC_MUSICS}
-PLIST_FILES+=	${ASC_MUSICDIR}/${file}
+.for i in ${ASC_MUSICS}
+PLIST_FILES+=	${ASC_MUSICDIR}/${i}
 .endfor
 .else
 .undef ASC_MUSICS
@@ -71,9 +81,8 @@ CONFIGURE_ENV+=	ac_cv_lib_xvidcore_xvid_
 
 post-extract:
 .if ${PORT_OPTIONS:MMUSIC}
-.for file in ${ASC_MUSICS}
-	@${TAR} -C ${DISTDIR}/${DIST_SUBDIR} -cf - ${file} | \
-		${TAR} -C ${WRKSRC}/data/music --unlink -xf -
+.for i in ${ASC_MUSICS}
+	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw ${i} ${WRKSRC}/data/music)
 .endfor
 .endif
 
@@ -85,8 +94,7 @@ post-patch:
 		's|/games/|/|g ; \
 		 s|lua >=|lua-5.1 >=|g ; \
 		 /if test/s|==|=|g' ${WRKSRC}/configure
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e \
+		's|? 0 :|? (void)0 :|' ${WRKSRC}/source/errors.h
 
 .include <bsd.port.mk>

Modified: head/games/asc/distinfo
==============================================================================
--- head/games/asc/distinfo	Sun Jan 19 19:13:34 2014	(r340343)
+++ head/games/asc/distinfo	Sun Jan 19 19:24:56 2014	(r340344)
@@ -1,5 +1,5 @@
-SHA256 (asc/asc-2.5.0.0.tar.bz2) = ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6
-SIZE (asc/asc-2.5.0.0.tar.bz2) = 42084514
+SHA256 (asc/asc-2.6.0.0.tar.bz2) = e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb
+SIZE (asc/asc-2.6.0.0.tar.bz2) = 42280527
 SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff
 SIZE (asc/frontiers.ogg) = 4691844
 SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Danilo Egea Gondolfo freebsd_committer 2014-01-19 19:25:20 UTC
State Changed
From-To: open->closed

Committed. Thanks!