svn commit: r340109 - head/games/pysolfc

Marcus von Appen mva at FreeBSD.org
Fri Jan 17 21:22:05 UTC 2014


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 <bsd.port.options.mk>
-
-.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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>


More information about the svn-ports-all mailing list