diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-06-14 22:34:15 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-06-14 22:34:15 +0800 |
| commit | a43233c71888d0e3bc00f6859a3c828abe84dc00 (patch) | |
| tree | 280dbf5f893bcb8c93a1ba160d8b69b9a834b216 | |
| parent | ad21c0a5421fa9d990944f0cdda9244c92979c56 (diff) | |
| download | freebsd-ports-gnome-a43233c71888d0e3bc00f6859a3c828abe84dc00.tar.gz freebsd-ports-gnome-a43233c71888d0e3bc00f6859a3c828abe84dc00.tar.zst freebsd-ports-gnome-a43233c71888d0e3bc00f6859a3c828abe84dc00.zip | |
- Convert to new options helpers
- Remove bsd.port.post.mk
| -rw-r--r-- | devel/valgrind-snapshot/Makefile | 14 | ||||
| -rw-r--r-- | devel/valgrind/Makefile | 16 |
2 files changed, 9 insertions, 21 deletions
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile index 6a986a51a005..96ac696ebaa6 100644 --- a/devel/valgrind-snapshot/Makefile +++ b/devel/valgrind-snapshot/Makefile @@ -30,6 +30,9 @@ MAN1= callgrind_control.1 \ OPTIONS_DEFINE= MPI MPI_DESC= Enable build of MPI wrappers +MPI_LIB_DEPENDS= mpich:${PORTSDIR}/net/mpich2 + +OPTIONS_SUB= yes USE_BZIP2= yes USE_GMAKE= yes USES= pathfix pkgconfig @@ -43,15 +46,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMPI} -LIB_DEPENDS+= mpich:${PORTSDIR}/net/mpich2 -PLIST_SUB+= MPI="" -.else -PLIST_SUB+= MPI="@comment " -.endif - -.include <bsd.port.pre.mk> - .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 . if !exists(/usr/lib32/libc.so) @@ -70,4 +64,4 @@ post-patch: @${RM} -rf ${WRKSRC}/docs/html .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 3ba3ba1767c4..b828ff1ad46e 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -28,6 +28,9 @@ MAN1= callgrind_control.1 \ OPTIONS_DEFINE= MPI MPI_DESC= Enable build of MPI wrappers +MPI_LIB_DEPENDS= mpich:${PORTSDIR}/net/mpich2 + +OPTIONS_SUB= yes USE_BZIP2= yes USE_GMAKE= yes USES= pathfix pkgconfig @@ -41,16 +44,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMPI} -LIB_DEPENDS+= mpich:${PORTSDIR}/net/mpich2 -PLIST_SUB+= MPI="" -.else -PLIST_SUB+= MPI="@comment " -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" +if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 . if !exists(/usr/lib32/libc.so) CONFIGURE_ARGS+= --enable-only64bit @@ -68,4 +62,4 @@ post-patch: @${RM} -rf ${WRKSRC}/docs/html .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |