From owner-svn-ports-head@FreeBSD.ORG Thu Nov 27 19:13:19 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D681EE2; Thu, 27 Nov 2014 19:13:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 000EB29; Thu, 27 Nov 2014 19:13:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sARJDIwU002776; Thu, 27 Nov 2014 19:13:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sARJDIjI002774; Thu, 27 Nov 2014 19:13:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411271913.sARJDIjI002774@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 27 Nov 2014 19:13:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373516 - head/games/el-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 19:13:19 -0000 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 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/