- Add NO_ARCH

- Simplify Makefile:
  - Remove WRKSRC=WRKDIR/DISTNAME (default value)
  - Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk

1 files changed, 8 insertions, 11 deletions

diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index dc18985..995e35a 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Documentation for the Python programming language
 
 PORTSCOUT=	ignore:1
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		python:build tar:bzip2
 
@@ -22,23 +23,19 @@ PLIST=		${WRKDIR}/pkg-plist.${DOCFORMAT}
 
 DOCFORMAT?=	html
 
-.include <bsd.port.pre.mk>
+.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
+IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
+.endif
 
-.  if ${DOCFORMAT} == "html" || ${DOCFORMAT} == "text"
-WRKSRC=		${WRKDIR}/${DISTNAME}
-.  else
+.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "text"
 WRKSRC=		${WRKDIR}/docs-pdf
-.  endif
-.  if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
-IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
-.  endif
+.endif
 
 pre-install:
-	@cd ${WRKSRC} && \
-		(${FIND} . -type f | ${SED} -e 's|^\./|%%DOCSDIR%%/|' | ${SORT}) > ${PLIST}
+	@${FIND} ${WRKSRC} -type f | ${SED} -e 's|^${WRKSRC}|%%DOCSDIR%%|' | ${SORT} > ${PLIST}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>