Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jun 2016 20:34:21 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416294 - in head/devel: valgrind valgrind-devel
Message-ID:  <201606022034.u52KYLMf053337@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers (src committer)
Date: Thu Jun  2 20:34:21 2016
New Revision: 416294
URL: https://svnweb.freebsd.org/changeset/ports/416294

Log:
  Add a MANPAGES knob to devel/valgrind{-devel}
  
  devel/valgrind/Makefile
  devel/valgrind/pkg-plist
  devel/valgrind-devel/Makefile
  devel/valgrind-devel/pkg-plist
  	Add a MANPAGES option. valgrind's man pages are built with
  	docbook-xml, which has lots of dependencies. Disabling MANPAGES will
  	speed the build.
  
  Reviewed by:	bdrewery, brd
  Approved by:	bdrewery (ports, maintainer)
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D6667

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

Modified: head/devel/valgrind-devel/Makefile
==============================================================================
--- head/devel/valgrind-devel/Makefile	Thu Jun  2 20:15:28 2016	(r416293)
+++ head/devel/valgrind-devel/Makefile	Thu Jun  2 20:34:21 2016	(r416294)
@@ -4,7 +4,7 @@
 PORTNAME=	valgrind
 PORTVERSION=	3.10.1.20160113
 DISTVERSIONPREFIX=	freebsd-
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
@@ -26,17 +26,20 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-
-OPTIONS_DEFINE=		MPI DOCS
+OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
+OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
+
+DOCS_BUILD_DEPENDS=    docbook-xsl>=0:textproc/docbook-xsl \
+                       xsltproc:textproc/libxslt
+MANPAGES_BUILD_DEPENDS=        docbook-xsl>=0:textproc/docbook-xsl \
+                       xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
@@ -86,7 +89,9 @@ post-patch:
 .endif
 
 post-build:
+.if ${PORT_OPTIONS:MMANPAGES}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
+.endif
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
 .endif

Modified: head/devel/valgrind-devel/pkg-plist
==============================================================================
--- head/devel/valgrind-devel/pkg-plist	Thu Jun  2 20:15:28 2016	(r416293)
+++ head/devel/valgrind-devel/pkg-plist	Thu Jun  2 20:34:21 2016	(r416294)
@@ -259,12 +259,12 @@ lib/valgrind/powerpc-altivec64l.xml
 %%X86%%lib/valgrind/vgpreload_memcheck-x86-freebsd.so
 %%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
 libdata/pkgconfig/valgrind.pc
-man/man1/callgrind_annotate.1.gz
-man/man1/callgrind_control.1.gz
-man/man1/cg_annotate.1.gz
-man/man1/cg_diff.1.gz
-man/man1/cg_merge.1.gz
-man/man1/ms_print.1.gz
-man/man1/valgrind-listener.1.gz
-man/man1/valgrind.1.gz
-man/man1/vgdb.1.gz
+%%MANPAGES%%man/man1/callgrind_annotate.1.gz
+%%MANPAGES%%man/man1/callgrind_control.1.gz
+%%MANPAGES%%man/man1/cg_annotate.1.gz
+%%MANPAGES%%man/man1/cg_diff.1.gz
+%%MANPAGES%%man/man1/cg_merge.1.gz
+%%MANPAGES%%man/man1/ms_print.1.gz
+%%MANPAGES%%man/man1/valgrind-listener.1.gz
+%%MANPAGES%%man/man1/valgrind.1.gz
+%%MANPAGES%%man/man1/vgdb.1.gz

Modified: head/devel/valgrind/Makefile
==============================================================================
--- head/devel/valgrind/Makefile	Thu Jun  2 20:15:28 2016	(r416293)
+++ head/devel/valgrind/Makefile	Thu Jun  2 20:34:21 2016	(r416294)
@@ -4,7 +4,7 @@
 PORTNAME=	valgrind
 PORTVERSION=	3.10.1.20160113
 DISTVERSIONPREFIX=	freebsd-
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
@@ -25,17 +25,19 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-
-OPTIONS_DEFINE=		MPI DOCS
+OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
+OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
+DOCS_BUILD_DEPENDS=    docbook-xsl>=0:textproc/docbook-xsl \
+                       xsltproc:textproc/libxslt
+MANPAGES_BUILD_DEPENDS=        docbook-xsl>=0:textproc/docbook-xsl \
+                       xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
@@ -85,7 +87,9 @@ post-patch:
 .endif
 
 post-build:
+.if ${PORT_OPTIONS:MMANPAGES}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
+.endif
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
 .endif

Modified: head/devel/valgrind/pkg-plist
==============================================================================
--- head/devel/valgrind/pkg-plist	Thu Jun  2 20:15:28 2016	(r416293)
+++ head/devel/valgrind/pkg-plist	Thu Jun  2 20:34:21 2016	(r416294)
@@ -259,12 +259,12 @@ lib/valgrind/powerpc-altivec64l.xml
 %%X86%%lib/valgrind/vgpreload_memcheck-x86-freebsd.so
 %%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
 libdata/pkgconfig/valgrind.pc
-man/man1/callgrind_annotate.1.gz
-man/man1/callgrind_control.1.gz
-man/man1/cg_annotate.1.gz
-man/man1/cg_diff.1.gz
-man/man1/cg_merge.1.gz
-man/man1/ms_print.1.gz
-man/man1/valgrind-listener.1.gz
-man/man1/valgrind.1.gz
-man/man1/vgdb.1.gz
+%%MANPAGES%%man/man1/callgrind_annotate.1.gz
+%%MANPAGES%%man/man1/callgrind_control.1.gz
+%%MANPAGES%%man/man1/cg_annotate.1.gz
+%%MANPAGES%%man/man1/cg_diff.1.gz
+%%MANPAGES%%man/man1/cg_merge.1.gz
+%%MANPAGES%%man/man1/ms_print.1.gz
+%%MANPAGES%%man/man1/valgrind-listener.1.gz
+%%MANPAGES%%man/man1/valgrind.1.gz
+%%MANPAGES%%man/man1/vgdb.1.gz



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