svn commit: r360483 - in head/french: homard tvdownloader

[Adam Weinberger]

Author: adamw
Date: Thu Jul  3 23:22:31 2014
New Revision: 360483
URL: http://svnweb.freebsd.org/changeset/ports/360483
QAT: https://qat.redports.org/buildarchive/r360483/

Log:
  Get rid of NOPORTDOCS.

Modified:
  head/french/homard/Makefile
  head/french/tvdownloader/Makefile

Modified: head/french/homard/Makefile
==============================================================================
--- head/french/homard/Makefile	Thu Jul  3 23:00:54 2014	(r360482)
+++ head/french/homard/Makefile	Thu Jul  3 23:22:31 2014	(r360483)
@@ -38,6 +38,8 @@ DOCS=		A_Lire.txt Readme.txt
 PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
 		UNAMES=${OPSYS} HOMARDPG=${HOMARDPG} ASTER_TOOLS=${ASTER_TOOLS}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -69,17 +71,13 @@ do-install:
 	${MKDIR} ${STAGEDIR}${ASTER_TOOLS}/
 	${LN} -fs ${HOMARDDIR}/homard ${STAGEDIR}${ASTER_TOOLS}/
 	${LN} -fs ${HOMARDDIR}/aster_homard_py ${STAGEDIR}${ASTER_TOOLS}/
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/Linux64/CAS_TESTS && ${COPYTREE_SHARE} .	\
 		${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.post.mk>

Modified: head/french/tvdownloader/Makefile
==============================================================================
--- head/french/tvdownloader/Makefile	Thu Jul  3 23:00:54 2014	(r360482)
+++ head/french/tvdownloader/Makefile	Thu Jul  3 23:22:31 2014	(r360483)
@@ -24,6 +24,10 @@ USES=		shebangfix
 SHEBANG_FILES=	doc/installdox
 ALL_TARGET=	build
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|@python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile ${WRKSRC}/src/Makefile
@@ -31,7 +35,7 @@ pre-configure:
 		${WRKSRC}/tvdownloader.sh
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|'	\
 		${WRKSRC}/tvdownload.desktop
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|%%DOC%%|#|' ${WRKSRC}/Makefile
 .else
 	${REINPLACE_CMD} -e 's|%%DOC%%||' ${WRKSRC}/Makefile