Fix violations of automake/autoconf rules, other customary ports technique

that can lead to unpredicatble build failures on different platforms and individual setups. Approved by: implicit - build fixes/autoconf/automake violations with maintainers blessing
author: Alan Eldridge <alane@FreeBSD.org> 2002-12-29 14:46:21 +0000
committer: Alan Eldridge <alane@FreeBSD.org> 2002-12-29 14:46:21 +0000
commit: c31d1624a52e542887b548e5dab31e10453526a9 (patch)
tree: c38f5dfed15391ddd793c95a3fbd0e109ef8917b
parent: 136a28a642be2a6ae7bbc1917191ff0f7131223a (diff)
download: ports-c31d1624a52e542887b548e5dab31e10453526a9.tar.gz
ports-c31d1624a52e542887b548e5dab31e10453526a9.zip
4 files changed, 116 insertions, 56 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 6287425b049a..e8ac4b176f6a 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -14,33 +14,48 @@ DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
+BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+
+USE_PERL5=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
-USE_PERL5=	yes
 WRKSRC=	${WRKDIR}
 
+APR_CONF_ENV=	${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh
+
+APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh \
+		CPPFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
+
+APR_UTIL_CONF_ARGS=	--with-apr=../apr/ --with-expat=${PREFIX}
+
 pre-fetch:
-	@${SH} pkg-install apr PRE-INSTALL
+	${SH} pkg-install apr PRE-INSTALL
 
 pre-configure:
-	@(cd ${WRKDIR}/apr/ && ./buildconf)
-	@(cd ${WRKDIR}/apr-util/ && ./buildconf)
+	cd ${WRKDIR}/apr; ./buildconf
+	cd ${WRKDIR}/apr-util; ./buildconf
 
 do-configure:
-	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	cd ${WRKDIR}/apr; \
+		${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/apr-util; \
+		${SETENV} ${APR_UTIL_CONF_ENV} \
+		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} 
 
 do-build:
-	@(cd ${WRKDIR}/apr/ && make)
-	@(cd ${WRKDIR}/apr-util/ && make)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make
 
 do-install:
-	@(cd ${WRKDIR}/apr/ && make install)
-	(cd ${WRKDIR}/apr-util/ && make install)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make install
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make install
 
 .include <bsd.port.mk>
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 6287425b049a..e8ac4b176f6a 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -14,33 +14,48 @@ DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
+BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+
+USE_PERL5=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
-USE_PERL5=	yes
 WRKSRC=	${WRKDIR}
 
+APR_CONF_ENV=	${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh
+
+APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh \
+		CPPFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
+
+APR_UTIL_CONF_ARGS=	--with-apr=../apr/ --with-expat=${PREFIX}
+
 pre-fetch:
-	@${SH} pkg-install apr PRE-INSTALL
+	${SH} pkg-install apr PRE-INSTALL
 
 pre-configure:
-	@(cd ${WRKDIR}/apr/ && ./buildconf)
-	@(cd ${WRKDIR}/apr-util/ && ./buildconf)
+	cd ${WRKDIR}/apr; ./buildconf
+	cd ${WRKDIR}/apr-util; ./buildconf
 
 do-configure:
-	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	cd ${WRKDIR}/apr; \
+		${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/apr-util; \
+		${SETENV} ${APR_UTIL_CONF_ENV} \
+		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} 
 
 do-build:
-	@(cd ${WRKDIR}/apr/ && make)
-	@(cd ${WRKDIR}/apr-util/ && make)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make
 
 do-install:
-	@(cd ${WRKDIR}/apr/ && make install)
-	(cd ${WRKDIR}/apr-util/ && make install)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make install
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make install
 
 .include <bsd.port.mk>
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 6287425b049a..e8ac4b176f6a 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -14,33 +14,48 @@ DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
+BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+
+USE_PERL5=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
-USE_PERL5=	yes
 WRKSRC=	${WRKDIR}
 
+APR_CONF_ENV=	${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh
+
+APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh \
+		CPPFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
+
+APR_UTIL_CONF_ARGS=	--with-apr=../apr/ --with-expat=${PREFIX}
+
 pre-fetch:
-	@${SH} pkg-install apr PRE-INSTALL
+	${SH} pkg-install apr PRE-INSTALL
 
 pre-configure:
-	@(cd ${WRKDIR}/apr/ && ./buildconf)
-	@(cd ${WRKDIR}/apr-util/ && ./buildconf)
+	cd ${WRKDIR}/apr; ./buildconf
+	cd ${WRKDIR}/apr-util; ./buildconf
 
 do-configure:
-	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	cd ${WRKDIR}/apr; \
+		${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/apr-util; \
+		${SETENV} ${APR_UTIL_CONF_ENV} \
+		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} 
 
 do-build:
-	@(cd ${WRKDIR}/apr/ && make)
-	@(cd ${WRKDIR}/apr-util/ && make)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make
 
 do-install:
-	@(cd ${WRKDIR}/apr/ && make install)
-	(cd ${WRKDIR}/apr-util/ && make install)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make install
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make install
 
 .include <bsd.port.mk>
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 6287425b049a..e8ac4b176f6a 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -14,33 +14,48 @@ DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
+BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+
+USE_PERL5=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
-USE_PERL5=	yes
 WRKSRC=	${WRKDIR}
 
+APR_CONF_ENV=	${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh
+
+APR_UTIL_CONF_ENV=${CONFIGURE_ENV} \
+		CONFIG_SHELL=/bin/sh \
+		CPPFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
+
+APR_UTIL_CONF_ARGS=	--with-apr=../apr/ --with-expat=${PREFIX}
+
 pre-fetch:
-	@${SH} pkg-install apr PRE-INSTALL
+	${SH} pkg-install apr PRE-INSTALL
 
 pre-configure:
-	@(cd ${WRKDIR}/apr/ && ./buildconf)
-	@(cd ${WRKDIR}/apr-util/ && ./buildconf)
+	cd ${WRKDIR}/apr; ./buildconf
+	cd ${WRKDIR}/apr-util; ./buildconf
 
 do-configure:
-	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	cd ${WRKDIR}/apr; \
+		${SETENV} ${APR_CONF_ENV} ./configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/apr-util; \
+		${SETENV} ${APR_UTIL_CONF_ENV} \
+		./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} 
 
 do-build:
-	@(cd ${WRKDIR}/apr/ && make)
-	@(cd ${WRKDIR}/apr-util/ && make)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make
 
 do-install:
-	@(cd ${WRKDIR}/apr/ && make install)
-	(cd ${WRKDIR}/apr-util/ && make install)
+	cd ${WRKDIR}/apr; ${SETENV} ${MAKE_ENV} make install
+	cd ${WRKDIR}/apr-util; ${SETENV} ${MAKE_ENV} make install
 
 .include <bsd.port.mk>
author	Alan Eldridge <alane@FreeBSD.org>	2002-12-29 14:46:21 +0000
committer	Alan Eldridge <alane@FreeBSD.org>	2002-12-29 14:46:21 +0000
commit	c31d1624a52e542887b548e5dab31e10453526a9 (patch)
tree	c38f5dfed15391ddd793c95a3fbd0e109ef8917b
parent	136a28a642be2a6ae7bbc1917191ff0f7131223a (diff)
download	ports-c31d1624a52e542887b548e5dab31e10453526a9.tar.gz ports-c31d1624a52e542887b548e5dab31e10453526a9.zip