Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Oct 2014 13:14:10 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371815 - head/games/asc
Message-ID:  <201410311314.s9VDEApH018102@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Oct 31 13:14:09 2014
New Revision: 371815
URL: https://svnweb.freebsd.org/changeset/ports/371815
QAT: https://qat.redports.org/buildarchive/r371815/

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Simplify installation and plist

Modified:
  head/games/asc/Makefile

Modified: head/games/asc/Makefile
==============================================================================
--- head/games/asc/Makefile	Fri Oct 31 13:13:59 2014	(r371814)
+++ head/games/asc/Makefile	Fri Oct 31 13:14:09 2014	(r371815)
@@ -14,15 +14,16 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Turn based, multiplayer strategic game with nice graphics
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/lib/libloki.so:${PORTSDIR}/devel/loki
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+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 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libloki.so:${PORTSDIR}/devel/loki
 
 OPTIONS_DEFINE=	MUSIC XVID
 MUSIC_DESC=	Install extra music files
@@ -49,39 +50,26 @@ 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 \
-		%%DATADIR%%/asc2_dlg.zip \
-		%%DATADIR%%/main.ascdat
-PLIST_DIRS=	${ASC_MUSICDIR} \
-		%%DATADIR%%
-PLIST_DIRSTRY=	share/appdata
+		share/appdata/asc.appdata.xml
+PORTDATA=	*
 
 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 i in ${ASC_MUSICS}
-PLIST_FILES+=	${ASC_MUSICDIR}/${i}
-.endfor
-.else
-.undef ASC_MUSICS
-.undef ASC_MUSICDIR
-.endif
-
 .if ${PORT_OPTIONS:MXVID}
 LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 .else
 CONFIGURE_ENV+=	ac_cv_lib_xvidcore_xvid_encore=no
 .endif
 
-post-extract:
 .if ${PORT_OPTIONS:MMUSIC}
+ASC_MUSICS=	frontiers.ogg time_to_strike.ogg machine_wars.ogg
+
+post-extract:
 .for i in ${ASC_MUSICS}
-	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw ${i} ${WRKSRC}/data/music)
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/data/music
 .endfor
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410311314.s9VDEApH018102>