From owner-svn-ports-all@FreeBSD.ORG  Thu Jul  3 23:22:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AACE196A;
 Thu,  3 Jul 2014 23:22:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7DB1D2088;
 Thu,  3 Jul 2014 23:22:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63NMWR0049701;
 Thu, 3 Jul 2014 23:22:32 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63NMWHr049699;
 Thu, 3 Jul 2014 23:22:32 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407032322.s63NMWHr049699@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 3 Jul 2014 23:22:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360483 - in head/french: homard tvdownloader
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jul 2014 23:22:32 -0000

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