--OaZoDhBhXzo6bW1J
Content-Type: multipart/mixed; boundary="uXxzq0nDebZQVNAZ"
Content-Disposition: inline


--uXxzq0nDebZQVNAZ
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

hi,

On Mon, May 19, 2003 at 09:40:11PM +0200, Kulcs=E1r Ferenc wrote:
> On Thu, 24 Apr 2003 11:26:59 +0900 (JST) Masao Uebayashi
> <uebayasi@pultek.co.jp> wrote:
> >=20
> > Here is the package source and a patch to fix another Buildlink2 /
> > Autoconf problem, which may be incorporated into Pkgsrc soon.  This
> > patch was made by Lubomir Sedlacik.
>=20
> Thank's a lot! It works fine with tcl8.3.2, tcl8.4.x and several
> version of AOLServer on -current 1.6R.

the second patch is actually wrong.  the attached one is known to work
but you might experience problems with packages which expect
AUTOMAKE_OVERRIDE to be YES without checking (e.g. www/libwww) which are
broken by design, imho.


regards,

--=20
-- Lubomir Sedlacik <salo@Xtrmntr.org>                   --
--                  <salo@silcnet.org>                   --

--uXxzq0nDebZQVNAZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="auto.diff"
Content-Transfer-Encoding: quoted-printable

Index: autoconf.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/mk/autoconf.mk,v
retrieving revision 1.3
diff -u -r1.3 autoconf.mk
--- autoconf.mk	2002/10/03 19:36:36	1.3
+++ autoconf.mk	2003/04/23 15:50:04
@@ -12,6 +12,8 @@
 .if !defined(AUTOCONF_MK)
 AUTOCONF_MK=3D	# defined
=20
+AUTOMAKE_OVERRIDE=3D	no
+
 # minimal required version
 AUTOCONF_REQD?=3D 2.50
=20
Index: bsd.buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/mk/buildlink2/bsd.buildlink2.mk,v
retrieving revision 1.83
diff -u -r1.83 bsd.buildlink2.mk
--- bsd.buildlink2.mk	2003/05/02 08:32:26	1.83
+++ bsd.buildlink2.mk	2003/05/05 23:29:58
@@ -981,16 +981,19 @@
 # status for each of the GNU auto* tools, which should cause GNU configure
 # scripts to think that they can't be found.
 #
+# Create symbolic links in ${BUILDLINK_DIR} to real GNU auto* tools in case
+# autoconf.mk or automake.mk is included.
+#
 AUTOMAKE_OVERRIDE?=3D	yes
 _GNU_MISSING=3D		${.CURDIR}/../../mk/gnu-config/missing
-_HIDE_PROGS.autoconf=3D	bin/autoconf	bin/autoconf-2.13		\
+_hide_PROGS.autoconf=3D	bin/autoconf	bin/autoconf-2.13		\
 			bin/autoheader	bin/autoheader-2.13		\
 			bin/autom4te					\
 			bin/autoreconf	bin/autoreconf-2.13		\
 			bin/autoscan	bin/autoscan-2.13		\
 			bin/autoupdate	bin/autoupdate-2.13		\
 			bin/ifnames	bin/ifnames-2.13
-_HIDE_PROGS.automake=3D	bin/aclocal	bin/aclocal-1.4			\
+_hide_PROGS.automake=3D	bin/aclocal	bin/aclocal-1.4			\
 					bin/aclocal-1.5			\
 					bin/aclocal-1.6			\
 					bin/aclocal-1.7			\
@@ -998,23 +1001,41 @@
 					bin/automake-1.5		\
 					bin/automake-1.6		\
 					bin/automake-1.7
+_show_PROGS.autoconf=3D   bin/autoconf					\
+                        bin/autoheader					\
+                        bin/autoreconf
+_show_PROGS.automake=3D   bin/automake					\
+                        bin/aclocal
=20
 .if empty(AUTOMAKE_OVERRIDE:M[nN][oO])
 do-buildlink: hide-autotools
+_autotools_=3D		autoconf automake
+.elif defined(AUTOCONF_MK)
+do-buildlink: show-autotools
+_autotools_=3D		autoconf
+.  if defined(AUTOMAKE_MK)
+_autotools_+=3D		automake
+.  endif
+_ACTION_AUTOTOOLS=3D	show
 .endif
=20
-hide-autotools:	# empty
+_ACTION_AUTOTOOLS?=3D	hide
=20
-.for _autotool_ in autoconf automake
-hide-autotools: hide-${_autotool_}
-.  for _prog_ in ${_HIDE_PROGS.${_autotool_}}
-hide-${_autotool_}: ${BUILDLINK_DIR}/${_prog_}
+${_ACTION_AUTOTOOLS}-autotools:	# empty
+
+.for _autotool_ in ${_autotools_}
+${_ACTION_AUTOTOOLS}-autotools: ${_ACTION_AUTOTOOLS}-${_autotool_}
+.  for _prog_ in ${_${_ACTION_AUTOTOOLS}_PROGS.${_autotool_}}
+${_ACTION_AUTOTOOLS}-${_autotool_}: ${BUILDLINK_DIR}/${_prog_}
 ${BUILDLINK_DIR}/${_prog_}: ${_GNU_MISSING}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO} "#!${BUILDLINK_SHELL}" > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO} "exec ${_GNU_MISSING} ${_prog_:T:C/-[0-9].*$//}" >> ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${_PKG_SILENT}${_PKG_DEBUG}						\
+	if [ ${_ACTION_AUTOTOOLS} =3D "hide" ]; then				\
+		${ECHO} "#!${BUILDLINK_SHELL}" > ${.TARGET};			\
+		${ECHO} "exec ${_GNU_MISSING} ${_prog_:T:C/-[0-9].*$//}" >> ${.TARGET}; \
+		${CHMOD} +x ${.TARGET};						\
+	else									\
+		${LN} -s ${${_prog_:S/bin\///:S/a/A/g:S/b/B/g:S/c/C/g:S/d/D/g:S/e/E/g:S/=
f/F/g:S/g/G/g:S/h/H/g:S/i/I/g:S/j/J/g:S/k/K/g:S/l/L/g:S/m/M/g:S/n/N/g:S/o/O=
/g:S/p/P/g:S/q/Q/g:S/r/R/g:S/s/S/g:S/t/T/g:S/u/U/g:S/v/V/g:S/w/W/g:S/x/X/g:=
S/y/Y/g:S/z/Z/g}} ${.TARGET};			\
+	fi
 .  endfor
 .endfor

--uXxzq0nDebZQVNAZ--

--OaZoDhBhXzo6bW1J
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (NetBSD)

iD8DBQE+ycwOiwjDDlS8cmMRAltRAJ0e23caqmPfokkop2iaPlMD9KAm7gCgkTZf
K3mz3zCE+VahtNsYr6V+vW4=
=gQy3
-----END PGP SIGNATURE-----

--OaZoDhBhXzo6bW1J--