Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Dec 2014 03:37: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: r375305 - head/games/fretsonfire-data
Message-ID:  <201412230337.sBN3bAMv051217@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Dec 23 03:37:09 2014
New Revision: 375305
URL: https://svnweb.freebsd.org/changeset/ports/375305
QAT: https://qat.redports.org/buildarchive/r375305/

Log:
  - Fix DATADIR (is an absolute path)
  - Add NO_ARCH
  - Simplify installation
  - Drop @dirrm* from plist
  
  Approved by:	bapt

Modified:
  head/games/fretsonfire-data/Makefile
  head/games/fretsonfire-data/pkg-plist

Modified: head/games/fretsonfire-data/Makefile
==============================================================================
--- head/games/fretsonfire-data/Makefile	Tue Dec 23 03:28:12 2014	(r375304)
+++ head/games/fretsonfire-data/Makefile	Tue Dec 23 03:37:09 2014	(r375305)
@@ -13,16 +13,14 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Frets on Fire data files
 
 NO_BUILD=	yes
-DATADIR=	share/${PKGNAMEPREFIX:S/-//}
+NO_ARCH=	yes
+DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 RESTRICTED=	Only Unreal Voodoo site is allowed to distribute the music
 WRKSRC=		${WRKDIR}/Frets\ on\ Fire-${PORTVERSION}
 
 EXTRACT_AFTER_ARGS=	--exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}"
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
-	@cd ${WRKSRC}/data && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \;
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Modified: head/games/fretsonfire-data/pkg-plist
==============================================================================
--- head/games/fretsonfire-data/pkg-plist	Tue Dec 23 03:28:12 2014	(r375304)
+++ head/games/fretsonfire-data/pkg-plist	Tue Dec 23 03:37:09 2014	(r375305)
@@ -243,14 +243,3 @@
 %%DATADIR%%/testi.dae
 %%DATADIR%%/theme.ini
 %%DATADIR%%/title.ttf
-@dirrm %%DATADIR%%/translations/old
-@dirrm %%DATADIR%%/songs/twibmpg
-@dirrm %%DATADIR%%/songs/tutorial
-@dirrm %%DATADIR%%/songs/defy
-@dirrm %%DATADIR%%/songs/bangbang
-@dirrm %%DATADIR%%/mods/Chilly
-@dirrm %%DATADIR%%/mods/LightGraphics
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/songs
-@dirrm %%DATADIR%%/mods
-@dirrm %%DATADIR%%



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