Rework build to use buildlink.mk files so that it won't pick up installed

headers and libraries during a "make build".  Add a patch to directly
modify the configure script to remove build dependency on autoconf.

5 files changed, 61 insertions, 29 deletions

diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index 5410b4eead7..fea9e4da65a 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2001/05/03 04:23:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2001/05/28 03:24:29 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -11,19 +11,18 @@ VFLIB_SRC=		${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=		tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=		http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
-
 VFLIB_VERSION=		2.24.2
-PLIST_SUBST+=		VFLIB_VERSION=${VFLIB_VERSION} \
-			VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
+PLIST_SUBST+=		VFLIB_VERSION=${VFLIB_VERSION}
+PLIST_SUBST+=		VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../graphics/freetype-lib/buildlink.mk"
+
 FT_LIB=			ttf -lintl
-FT_INCLUDEDIR=		${LOCALBASE}/include/freetype
-FT_LIBDIR=		${LOCALBASE}/lib
+FT_INCLUDEDIR=		${BUILDLINK_INCDIR}/freetype
+FT_LIBDIR=		${BUILDLINK_LIBDIR}
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-freetype="${FT_LIB}"
@@ -31,12 +30,14 @@ CONFIGURE_ARGS+=	--with-freetype-includedir=${FT_INCLUDEDIR}
 CONFIGURE_ARGS+=	--with-freetype-libdir=${FT_LIBDIR}
 MAKE_ENV+=		LOCAL_LDFLAGS="${LDFLAGS}"
 
+CFLAGS+=		-I${BUILDLINK_INCDIR}
+LDFLAGS+=		-L${BUILDLINK_LIBDIR}
+
 DISTINFO_FILE=		${.CURDIR}/../../japanese/vflib-lib/distinfo
 PATCHDIR=		${.CURDIR}/../../japanese/vflib-lib/patches
 
 EXTRACT_ONLY=		${VFLIB_SRC}
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
+pre-configure: ${BUILDLINK_TARGETS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/distinfo b/japanese/vflib-lib/distinfo
index 9f68689bcf1..989796e78bf 100644
--- a/japanese/vflib-lib/distinfo
+++ b/japanese/vflib-lib/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/05/03 04:37:21 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/05/28 03:24:29 jlam Exp $
 
 SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5
 Size (VFlib2-2.24.2.tar.gz) = 540093 bytes
 SHA1 (patch-aa) = c78284c8126b8a2f1ccf43360b9f2e0f0468c2e1
-SHA1 (patch-ab) = 2f7162f02ab1825a143f4fd63410aa24c61cf8c7
+SHA1 (patch-ab) = 1654d8a602097eed3a8fb4c146287eadbae0c3be
 SHA1 (patch-ac) = 72d5c5b58d48afe2a22e4e96c898fb992707a7a2
-SHA1 (patch-ad) = c2b73135f82f5bedba419b82627060145aa6268e
+SHA1 (patch-ad) = 329c265785f4e3134b67f37c1e1d1f7f6aa60337
 SHA1 (patch-ae) = 6b2512548bc122b915c15067791aeecfcb2ef8a6
+SHA1 (patch-af) = daae96f7c5218eb9fd22d297121a93f5bd266bed
diff --git a/japanese/vflib-lib/patches/patch-ab b/japanese/vflib-lib/patches/patch-ab
index d300e040fe7..4775d14327a 100644
--- a/japanese/vflib-lib/patches/patch-ab
+++ b/japanese/vflib-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2000/07/19 21:42:12 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/28 03:24:30 jlam Exp $
 
 --- configure.in.orig	Wed Feb 17 23:58:02 1999
 +++ configure.in	Wed Jul 19 17:36:22 2000
@@ -14,19 +14,6 @@ $NetBSD: patch-ab,v 1.2 2000/07/19 21:42:12 jlam Exp $
  
  AC_SUBST(freetype_includedir)
  AC_SUBST(freetype_libdir)
-@@ -75,10 +80,10 @@
- AC_ARG_WITH(
-  freetype-libdir,
-  [  --with-freetype-libdir=DIR       FreeType library files are in DIR],
-- if test "${withval}" = yes; then withval=""; fi;
-+ [if test "${withval}" = yes; then withval=""; fi;
-  if test "${withval}" = ""; 
-  then freetype_libdir=""
-- else freetype_libdir=-L${withval}; fi)
-+ else freetype_libdir="-Wl,-R${withval} -L${withval}"; fi])
- if test -n "$freetype_lib" ; then
-   echo "Enabled the TrueType font driver"; 
-   OLD_CPPFLAGS=${CPPFLAGS}; OLD_LIBS=${LIBS}
 @@ -117,6 +122,7 @@
  AC_CONFIG_HEADER(src/with.h src/config.h)
  AC_OUTPUT(Makefile make-sub src/Makefile tools/Imakefile)
diff --git a/japanese/vflib-lib/patches/patch-ad b/japanese/vflib-lib/patches/patch-ad
index d4b8659b6d6..1d1a514b067 100644
--- a/japanese/vflib-lib/patches/patch-ad
+++ b/japanese/vflib-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/05/28 03:24:30 jlam Exp $
 
 --- tools/Imakefile.in.orig	Tue Oct 27 03:02:45 1998
 +++ tools/Imakefile.in	Mon May  1 04:41:40 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $
    VFLIB_LIBDIR = ../src
  
 -      VFLIB = $(VFLIB_LIBDIR)/libVFlib2.la
-+      VFLIB = $(LDFLAGS) -lVFlib2 -lttf -lintl -lm
++      VFLIB = $(LDFLAGS) -lVFlib2 $(EXT_LIBRARY)
  
            PROGRAMS = disol    kban    ktest    vfperf    vftest    fmtest  
                SRCS = disol.c  kban.c  ktest.c  vfperf.c  vftest.c  fmtest.c
diff --git a/japanese/vflib-lib/patches/patch-af b/japanese/vflib-lib/patches/patch-af
new file mode 100644
index 00000000000..50cc1754c71
--- /dev/null
+++ b/japanese/vflib-lib/patches/patch-af
@@ -0,0 +1,43 @@
+$NetBSD: patch-af,v 1.1 2001/05/28 03:24:30 jlam Exp $
+
+--- configure.orig	Wed Feb 17 23:58:33 1999
++++ configure	Sun May 27 18:43:19 2001
+@@ -78,6 +78,8 @@
+ ac_help="$ac_help
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
+ ac_help="$ac_help
++  --enable-tools                   Build VFlib tools"
++ac_help="$ac_help
+   --with-freetype[=LIB]            Link FreeType library LIB [LIB=ttf]"
+ ac_help="$ac_help
+   --with-freetype-includedir=DIR   FreeType include files are in DIR"
+@@ -1480,6 +1614,14 @@
+ fi
+ 
+ 
++# Check whether --enable-tools or --disable-tools was given.
++if test "${enable_tools+set}" = set; then
++  enableval="$enable_tools"
++  build_tools=yes
++else
++  build_tools=no
++fi
++
+ 
+ 
+ 
+@@ -2616,6 +2761,7 @@
+ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ 
+ 
++if test "$build_tools" = "yes" ; then
+ if test -d /usr/openwin ; then \
+ 	(cd tools; \
+ 	 OPENWINHOME=/usr/openwin; \
+@@ -2623,5 +2769,6 @@
+      	 xmkmf;)  \
+ else \
+ 	(cd tools; xmkmf -a) \
++fi
+ fi
+