From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  9 13:47:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D14ADC62;
 Wed,  9 Oct 2013 13:47:49 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4D4D27D5;
 Wed,  9 Oct 2013 13:47:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99DlnrK096330;
 Wed, 9 Oct 2013 13:47:49 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99Dlnrj096328;
 Wed, 9 Oct 2013 13:47:49 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310091347.r99Dlnrj096328@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 9 Oct 2013 13:47:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329899 - head/devel/cppunit
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2013 13:47:49 -0000

Author: bdrewery
Date: Wed Oct  9 13:47:48 2013
New Revision: 329899
URL: http://svnweb.freebsd.org/changeset/ports/329899

Log:
  - Convert to staging
  - Convert WITH_DOXYGEN to an option

Modified:
  head/devel/cppunit/Makefile
  head/devel/cppunit/pkg-plist

Modified: head/devel/cppunit/Makefile
==============================================================================
--- head/devel/cppunit/Makefile	Wed Oct  9 13:23:57 2013	(r329898)
+++ head/devel/cppunit/Makefile	Wed Oct  9 13:47:48 2013	(r329899)
@@ -9,28 +9,21 @@ MASTER_SITES=	SF
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	C++ port of the JUnit framework for unit testing
 
+OPTIONS_DEFINE=	DOXYGEN
+
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
-.if defined(WITH_DOXYGEN)
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOXYGEN}
+BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
 CONFIGURE_ARGS+=	--enable-doc --enable-doxygen --enable-html-docs
-PLIST_SUB+=	HTMLDOCS="" PORTDOCS=""
+PLIST_SUB+=		HTMLDOCS="" PORTDOCS=""
 .else
 CONFIGURE_ARGS+=	--disable-doc --disable-doxygen
-PLIST_SUB+=	HTMLDOCS="@comment "
-.endif
-
-MAN1=		cppunit-config.1
-#MANCOMPRESSED=	no
-
-pre-everything::
-.if !defined(WITH_DOXYGEN)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You could define WITH_DOXYGEN if you want HTML documentation"
-	@${ECHO_MSG}
+PLIST_SUB+=		HTMLDOCS="@comment "
 .endif
 
 post-patch:
@@ -38,15 +31,13 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-install:
-	@${FIND} ${PREFIX}/include/cppunit ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/include/cppunit -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.if !defined(NOPORTDOCS) || defined(WITH_DOXYGEN)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/FAQ ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${FIND} ${STAGEDIR}${PREFIX}/include/cppunit ! -type d | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${PREFIX}/include/cppunit -type d | ${SORT} -r | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/FAQ ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/cppunit/pkg-plist
==============================================================================
--- head/devel/cppunit/pkg-plist	Wed Oct  9 13:23:57 2013	(r329898)
+++ head/devel/cppunit/pkg-plist	Wed Oct  9 13:47:48 2013	(r329899)
@@ -6,6 +6,7 @@ lib/libcppunit.a
 lib/libcppunit.la
 lib/libcppunit.so
 libdata/pkgconfig/cppunit.pc
+man/man1/cppunit-config.1.gz
 share/aclocal/cppunit.m4
 %%HTMLDOCS%%%%DOCSDIR%%/index.html
 %%HTMLDOCS%%%%DOCSDIR%%/_additional_message_8cpp.html