aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-11-16 13:06:29 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-11-16 13:06:29 +0000
commitf440390503fe6c5a40f8e97dac1ab5d1572b53de (patch)
tree683a62cfab73ac3e1852ce8fbde27d0c7b0bb395
parentb5c80055a71ad38a84391f1d32d764f72961aca0 (diff)
downloadports-f440390503fe6c5a40f8e97dac1ab5d1572b53de.tar.gz
ports-f440390503fe6c5a40f8e97dac1ab5d1572b53de.zip
Notes
-rw-r--r--Mk/bsd.port.mk12
-rw-r--r--audio/libao/Makefile1
-rw-r--r--audio/libogg/Makefile1
-rw-r--r--audio/libvorbis/Makefile3
-rw-r--r--audio/vorbis-tools/Makefile5
5 files changed, 17 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 32664fc690ae..f632b6ba1e70 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -139,9 +139,15 @@ FreeBSD_MAINTAINER= asami@FreeBSD.org
# USE_AUTOMAKE - Says that the port uses automake. Implies USE_AUTOCONF.
# AUTOMAKE - Set to path of GNU automake if not in $PATH (default:
# automake).
+# AUTOMAKE_ARGS - Pass these args to automake if ${USE_AUTOMAKE} is set.
+# AUTOMAKE_ENV - Pass these env (shell-like) to automake if
+# ${USE_AUTOMAKE} is set.
# USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE.
# AUTOCONF - Set to path of GNU autoconf if not in $PATH (default:
# autoconf).
+# AUTOCONF_ARGS - Pass these args to autoconf if ${USE_AUTOCONF} is set.
+# AUTOCONF_ENV - Pass these env (shell-like) to autoconf if
+# ${USE_AUTOCONF} is set.
# USE_LIBTOOL - Says that the port uses Libtool. Implies GNU_CONFIGURE.
# LIBTOOL - Set to path of libtool (default: libtool).
# LIBTOOLFILES - Files to patch for libtool (defaults: "aclocal.m4" if
@@ -1755,10 +1761,12 @@ do-patch:
.if !target(do-configure)
do-configure:
.if defined(USE_AUTOMAKE)
- @(cd ${CONFIGURE_WRKSRC} && ${AUTOMAKE})
+ @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${AUTOMAKE} \
+ ${AUTOMAKE_ARGS})
.endif
.if defined(USE_AUTOCONF)
- @(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
+ @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
+ ${AUTOCONF_ARGS})
.endif
@if [ -f ${SCRIPTDIR}/configure ]; then \
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index cd5d53531c17..8278952a6d14 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/ao
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
+AUTOMAKE_ARGS= --add-missing
post-patch:
cd ${WRKSRC} && ${ACLOCAL}
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 09f1780d4e7f..e98e31d9f00c 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/ogg
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
+AUTOMAKE_ARGS= --add-missing
post-patch:
cd ${WRKSRC} && ${ACLOCAL}
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 4a07df698e7a..c3ede23fe7da 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -24,7 +24,8 @@ WRKSRC= ${WRKDIR}/vorbis
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS+= --with-ogg=${LOCALBASE}
+CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
+AUTOMAKE_ARGS= --add-missing
post-patch:
cd ${WRKSRC} && ${ACLOCAL}
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 73826a8ce7e6..18b146e14635 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -25,8 +25,9 @@ WRKSRC= ${WRKDIR}/vorbis-tools
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS+= --with-ogg=${LOCALBASE} \
- --with-ao=${LOCALBASE}
+CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \
+ --with-ao=${LOCALBASE}
+AUTOMAKE_ARGS= --add-missing
MAN1= ogg123.1