From 25af8023e389ad74f611a76796d55cf53274cd61 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Sun, 11 Mar 2001 13:42:47 +0000 Subject: [PATCH] Even better way of handling multiple post-extract targets. Submitted by: jeh --- www/mod_php4/Makefile | 8 +------- www/mod_php4/scripts/configure.php | 2 ++ www/mod_php5/Makefile | 8 +------- www/mod_php5/scripts/configure.php | 2 ++ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index a467a671072a..9c7ba331528b 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -101,12 +101,6 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -post-extract: -.if target(post-extract-jstring) - ${MAKE} post-extract-jstring -.endif -.if target(post-extract-ming) - ${MAKE} post-extract-ming -.endif +post-extract: ${POSTEXTRACT} .include diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 986fd90fe9a6..10fbfbec5abb 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -170,6 +170,7 @@ DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php-4.0RC2_jstring-1.0.tar.gz CONFIGURE_ARGS+=--enable-jstring BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf +POSTEXTRACT+= post-extract-jstring post-extract-jstring: [ -d \${WRKDIR}/jstring ] && \\ @@ -193,6 +194,7 @@ BUILD_DEPENDS+= /nonexistent:\${PORTSDIR}/graphics/ming:extract BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf LIB_DEPENDS+= ming.2:\${PORTSDIR}/graphics/ming +POSTEXTRACT+= post-extract-ming post-extract-ming: [ -d \${PORTSDIR}/graphics/ming/work ] && \\ diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index a467a671072a..9c7ba331528b 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -101,12 +101,6 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -post-extract: -.if target(post-extract-jstring) - ${MAKE} post-extract-jstring -.endif -.if target(post-extract-ming) - ${MAKE} post-extract-ming -.endif +post-extract: ${POSTEXTRACT} .include diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 986fd90fe9a6..10fbfbec5abb 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -170,6 +170,7 @@ DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php-4.0RC2_jstring-1.0.tar.gz CONFIGURE_ARGS+=--enable-jstring BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf +POSTEXTRACT+= post-extract-jstring post-extract-jstring: [ -d \${WRKDIR}/jstring ] && \\ @@ -193,6 +194,7 @@ BUILD_DEPENDS+= /nonexistent:\${PORTSDIR}/graphics/ming:extract BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf LIB_DEPENDS+= ming.2:\${PORTSDIR}/graphics/ming +POSTEXTRACT+= post-extract-ming post-extract-ming: [ -d \${PORTSDIR}/graphics/ming/work ] && \\