Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jan 2016 06:35:50 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404970 - head/lang/python-doc-html
Message-ID:  <201601010635.u016ZoOm025296@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Jan  1 06:35:50 2016
New Revision: 404970
URL: https://svnweb.freebsd.org/changeset/ports/404970

Log:
  - 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

Modified:
  head/lang/python-doc-html/Makefile

Modified: head/lang/python-doc-html/Makefile
==============================================================================
--- head/lang/python-doc-html/Makefile	Fri Jan  1 06:35:45 2016	(r404969)
+++ head/lang/python-doc-html/Makefile	Fri Jan  1 06:35:50 2016	(r404970)
@@ -14,6 +14,7 @@ COMMENT=	Documentation for the Python pr
 
 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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601010635.u016ZoOm025296>