From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 21:22:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE66AA38; Fri, 17 Jan 2014 21:22:05 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 90AAF1CEB; Fri, 17 Jan 2014 21:22:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HLM5Xr088467; Fri, 17 Jan 2014 21:22:05 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HLM5le088466; Fri, 17 Jan 2014 21:22:05 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201401172122.s0HLM5le088466@svn.freebsd.org> From: Marcus von Appen Date: Fri, 17 Jan 2014 21:22:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340109 - head/games/pysolfc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 21:22:05 -0000 Author: mva Date: Fri Jan 17 21:22:05 2014 New Revision: 340109 URL: http://svnweb.freebsd.org/changeset/ports/340109 QAT: https://qat.redports.org/buildarchive/r340109/ Log: - Enable stagedir support - Use PYDISTUTILS_AUTOPLIST Deleted: head/games/pysolfc/pkg-plist Modified: head/games/pysolfc/Makefile Modified: head/games/pysolfc/Makefile ============================================================================== --- head/games/pysolfc/Makefile Fri Jan 17 21:04:50 2014 (r340108) +++ head/games/pysolfc/Makefile Fri Jan 17 21:22:05 2014 (r340109) @@ -1,4 +1,3 @@ -# Created by: Marcus von Appen # $FreeBSD$ PORTNAME= pysolfc @@ -21,8 +20,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkin USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes -PYDISTUTILS_PKGNAME= PySolFC +PYDISTUTILS_AUTOPLIST= yes +PLIST_FILES= share/pixmaps/pysolfc.png DATADIR= ${PREFIX}/share/PySolFC WRKSRC= ${WRKDIR}/PySolFC-${PORTVERSION} PORTDOCS= README @@ -34,23 +34,12 @@ CARDSET_DUPS= 2000 crystal-mahjongg dash OPTIONS_DEFINE= CARDSETS DOCS NLS CARDSETS_DESC= Install additional cardsets +OPTIONS_SUB= yes -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MCARDSETS} -DISTFILES+= PySolFC-Cardsets-${DISTVERSION}${EXTRACT_SUFX}:cardsets -PLIST_SUB+= CARDSETS="" -.else -PLIST_SUB+= CARDSETS="@comment " -.endif +CARDSETS_DISTFILES= PySolFC-Cardsets-${DISTVERSION}${EXTRACT_SUFX}:cardsets +NLS_USES= gettext -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +.include post-patch: @${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc @@ -66,26 +55,22 @@ post-patch: ${XARGS} ${RM} -rf @${FIND} ${WRKSRC} -name "*.bak" -delete - post-install: - ${LN} -sf ${PREFIX}/share/icons/pysol01.png \ - ${PREFIX}/share/pixmaps/${PORTNAME}.png + ${LN} -s ${PREFIX}/share/icons/pysol01.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .if ${PORT_OPTIONS:MCARDSETS} .for cdir in ${CARDSET_DUPS} @${RM} -rf ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir} .endfor @cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \ - ${COPYTREE_SHARE} \* ${DATADIR} + ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} @cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \ ${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST} @cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \ ${FIND} . -type d -mindepth 1 | ${SORT} -r | \ ${SED} -e 's|^./|@dirrm ${DATADIR_REL}/|' >> ${TMPPLIST} .endif - @${ECHO} '@dirrm ${DATADIR_REL}' >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR}/ - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif + @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include