Page MenuHomeFreeBSD

D6667.diff
No OneTemporary

D6667.diff

Index: head/devel/valgrind-devel/Makefile
===================================================================
--- head/devel/valgrind-devel/Makefile
+++ head/devel/valgrind-devel/Makefile
@@ -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 @@
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 @@
.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
Index: head/devel/valgrind-devel/pkg-plist
===================================================================
--- head/devel/valgrind-devel/pkg-plist
+++ head/devel/valgrind-devel/pkg-plist
@@ -259,12 +259,12 @@
%%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
Index: head/devel/valgrind/Makefile
===================================================================
--- head/devel/valgrind/Makefile
+++ head/devel/valgrind/Makefile
@@ -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 @@
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 @@
.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
Index: head/devel/valgrind/pkg-plist
===================================================================
--- head/devel/valgrind/pkg-plist
+++ head/devel/valgrind/pkg-plist
@@ -259,12 +259,12 @@
%%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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 12:25 PM (1 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31870913
Default Alt Text
D6667.diff (4 KB)

Event Timeline