kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add AUTO{CONF,MAKE}_{ENV,ARGS}. Among other things, this will fix

Browse source 
audio/libao, audio/libogg, audio/libvorbis and audio/vorbis-tools
which need --add-missing to be passed to automake.

PR:		22610
Submitted by:	Theo van Klaveren <t.vanklaveren@student.utwente.nl>, roger, sobomax
This commit is contained in:
Satoshi Asami 2000-11-16 13:06:29 +00:00
parent b5c80055a7
commit f440390503
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=35187
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mk/bsd.port.mk
View file

@ -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} \

1
audio/libao/Makefile
View file

@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/ao
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
AUTOMAKE_ARGS= --add-missing
post-patch:
cd ${WRKSRC} && ${ACLOCAL}

1
audio/libogg/Makefile
View file

@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/ogg
ACLOCAL?= ${LOCALBASE}/bin/aclocal
AUTOHEADER?= ${LOCALBASE}/bin/autoheader
AUTOMAKE_ARGS= --add-missing
post-patch:
cd ${WRKSRC} && ${ACLOCAL}

3
audio/libvorbis/Makefile
View file

@ -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}

5
audio/vorbis-tools/Makefile
View file

@ -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