Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Nov 2014 19:13:18 +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: r373516 - head/games/el-data
Message-ID:  <201411271913.sARJDIjI002774@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Nov 27 19:13:18 2014
New Revision: 373516
URL: https://svnweb.freebsd.org/changeset/ports/373516
QAT: https://qat.redports.org/buildarchive/r373516/

Log:
  - Simplify installation and plist generation
  - Fix tab after WWW:
  - Remove unused variables
  
  PR:		195358
  Submitted by:	amdmi3
  Approved by:	bapt

Modified:
  head/games/el-data/Makefile
  head/games/el-data/pkg-descr

Modified: head/games/el-data/Makefile
==============================================================================
--- head/games/el-data/Makefile	Thu Nov 27 19:11:41 2014	(r373515)
+++ head/games/el-data/Makefile	Thu Nov 27 19:13:18 2014	(r373516)
@@ -22,10 +22,11 @@ USES=		dos2unix zip:infozip
 DOS2UNIX_GLOB=	*.ini *.txt
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
-PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-/_/}linux
 EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}.zip
 
+PORTDATA=	*
+
 OPTIONS_DEFINE=	ELSOUND ELMUSIC
 OPTIONS_DEFAULT=	ELSOUND ELMUSIC
 ELSOUND_DESC=	Install additional sound files
@@ -35,12 +36,10 @@ ELMUSIC_DESC=	Install additional music f
 
 .if ${PORT_OPTIONS:MELSOUND}
 DISTFILES+=	EL_sound_191${EXTRACT_SUFX}:sound
-HAVE_ESOUND=	yes
 .endif
 
 .if ${PORT_OPTIONS:MELMUSIC}
 DISTFILES+=	EL_music_full${EXTRACT_SUFX}:music
-HAVE_EMUSIC=	yes
 .endif
 
 do-extract:
@@ -64,17 +63,7 @@ post-extract:
 	@${FIND} ${WRKSRC} -type f -name "*.bin" -print0 | \
 		${XARGS} -0 ${RM} -R
 
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
-	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	@cd ${WRKSRC} && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \;
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Modified: head/games/el-data/pkg-descr
==============================================================================
--- head/games/el-data/pkg-descr	Thu Nov 27 19:11:41 2014	(r373515)
+++ head/games/el-data/pkg-descr	Thu Nov 27 19:13:18 2014	(r373516)
@@ -1,3 +1,3 @@
 The Eternal Lands data and sounds files.
 
-WWW:	http://www.eternal-lands.com/
+WWW: http://www.eternal-lands.com/



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