- convert to autogenerated packing list

- support staging
- convert to options helpers
- install docs and examples into staging area unconditionally
- unmute installation commands
- bump PORTREVISION

Requested by:	miwi
Approved by:	portmgr (blanket)

1 files changed, 35 insertions, 44 deletions

diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index 0183d2fd6ed5..8c744ec1467a 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mx-base
 PORTVERSION=	3.2.6
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	https://downloads.egenix.com/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,55 +12,45 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	eGenix mx-Extension Series for Python
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
-
-PYDISTUTILS_PKGNAME=	egenix-mx-base
-
-PORTDOCS=	COPYRIGHT MANIFEST README LICENSE PKG-INFO
-ADDITIONAL_DOCS=	mx/DateTime/Doc/mxDateTime.pdf \
-			mx/Proxy/Doc/mxProxy.pdf \
-			mx/Queue/Doc/mxQueue.pdf \
-			mx/Stack/Doc/mxStack.pdf \
-			mx/TextTools/Doc/mxTextTools.pdf \
-			mx/Tools/Doc/mxTools.pdf \
-			mx/BeeBase/Doc/mxBeeBase.pdf \
-			mx/URL/Doc/mxURL.pdf \
-			mx/UID/Doc/mxUID.pdf
-
-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS_DEFINE=	DOCS ZOPE EXAMPLES
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MZOPE}
-USES=		zope
-.endif
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
+OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}/options
+OPTIONS_DEFINE=		DOCS ZOPE EXAMPLES
+ZOPE_USES=		zope
+
+TXTDOCS=	COPYRIGHT MANIFEST README LICENSE PKG-INFO
+PDFDOCS=	mx/DateTime/Doc/mxDateTime.pdf \
+		mx/Proxy/Doc/mxProxy.pdf \
+		mx/Queue/Doc/mxQueue.pdf \
+		mx/Stack/Doc/mxStack.pdf \
+		mx/TextTools/Doc/mxTextTools.pdf \
+		mx/Tools/Doc/mxTools.pdf \
+		mx/BeeBase/Doc/mxBeeBase.pdf \
+		mx/URL/Doc/mxURL.pdf \
+		mx/UID/Doc/mxUID.pdf
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e '/pdf/d' ${WRKSRC}/egenix_mx_base.py
 	@${REINPLACE_CMD} -e '/Examples/d' ${WRKSRC}/egenix_mx_base.py
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.for i in ${ADDITIONAL_DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${TXTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PDFDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 	@${SED} -e "s;%%PYTHON_SITELIBDIR%%;${PYTHON_SITELIBDIR};g" \
-		< ${FILESDIR}/index.html.in > ${DOCSDIR}/index.html
-	@${CHMOD} 644 ${DOCSDIR}/index.html
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}/mx/DateTime
-	@${INSTALL_DATA} ${WRKSRC}/mx/DateTime/Examples/* ${EXAMPLESDIR}/mx/DateTime
-	@${MKDIR} ${EXAMPLESDIR}/mx/TextTools
-	@${INSTALL_DATA} ${WRKSRC}/mx/TextTools/Examples/* ${EXAMPLESDIR}/mx/TextTools
-	@${MKDIR} ${EXAMPLESDIR}/mx/Tools
-	@${INSTALL_DATA} ${WRKSRC}/mx/Tools/Examples/* ${EXAMPLESDIR}/mx/Tools
-.endif
+		< ${FILESDIR}/index.html.in > ${STAGEDIR}${DOCSDIR}/index.html
+	@${CHMOD} 644 ${STAGEDIR}${DOCSDIR}/index.html
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mx/DateTime
+	${INSTALL_DATA} ${WRKSRC}/mx/DateTime/Examples/* ${STAGEDIR}${EXAMPLESDIR}/mx/DateTime
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mx/TextTools
+	${INSTALL_DATA} ${WRKSRC}/mx/TextTools/Examples/* ${STAGEDIR}${EXAMPLESDIR}/mx/TextTools
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mx/Tools
+	${INSTALL_DATA} ${WRKSRC}/mx/Tools/Examples/* ${STAGEDIR}${EXAMPLESDIR}/mx/Tools
+
 .include <bsd.port.mk>