Attachment 11044 Details for Bug 21903 – file.diff

[patch] file.diff

file.diff (text/plain), 1.63 KB, created by clefevre on 2000-10-11 04:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clefevre

Created: 2000-10-11 04:40:01 UTC

Size: 1.63 KB

patch

obsolete

>Index: bsd.port.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.355
>diff -u -r1.355 bsd.port.mk
>--- bsd.port.mk	2000/10/08 11:43:54	1.355
>+++ bsd.port.mk	2000/10/11 03:25:52
>@@ -139,6 +139,11 @@
> # 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		- Any extra arguments to GNU automake in configure
>+#				  stages (default: none).
>+# USE_ACLOCAL	- Says that the port uses autoconf.  Implies USE_AUTOCONF.
>+# ACLOCAL		- Set to path of GNU aclocal if not in $PATH (default:
>+#				  aclocal).
> # USE_AUTOCONF	- Says that the port uses autoconf.  Implies GNU_CONFIGURE.
> # AUTOCONF		- Set to path of GNU autoconf if not in $PATH (default:
> #				  autoconf).
>@@ -750,6 +755,9 @@
> USE_AUTOCONF=	yes
> BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
> .endif
>+.if defined(USE_ACLOCAL)
>+USE_AUTOCONF=	yes
>+.endif
> .if defined(USE_AUTOCONF)
> GNU_CONFIGURE=	yes
> BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
>@@ -895,6 +903,7 @@
> # Miscellaneous overridable commands:
> GMAKE?=			gmake
> AUTOMAKE?=		automake
>+ACLOCAL?=		aclocal
> AUTOCONF?=		autoconf
> LIBTOOL?=		libtool
> XMKMF?=			xmkmf -a
>@@ -1784,9 +1793,12 @@
> .if !target(do-configure)
> do-configure:
> .if defined(USE_AUTOMAKE)
>-	@(cd ${WRKSRC} && ${AUTOMAKE})
>+	@(cd ${WRKSRC} && ${AUTOMAKE} ${AUTOMAKE_ARGS})
> .endif
> .if defined(USE_AUTOCONF)
>+.if defined(USE_ACLOCAL)
>+	@(cd ${WRKSRC} && ${ACLOCAL})
>+.endif
> 	@(cd ${WRKSRC} && ${AUTOCONF})
> .endif
> 	@if [ -f ${SCRIPTDIR}/configure ]; then \

Actions: View | Diff

Attachments on bug 21903: 11044 | 11045