- Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. The

  conversion generally consisted of making sure that -L options passed to
  the compiler in the configure script didn't refer to any directories
  outside of ${BUILDLINK_DIR} and ${X11BASE}, and replacing dependencies
  with buildlink.mk file inclusions.
- Add a buildlink.mk for use by other package Makefiles.

4 files changed, 111 insertions, 44 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 4dda952d990..f5afa86104c 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/12 20:33:10 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/07/05 05:53:53 jlam Exp $
 #
 
 DISTNAME=	kdelibs-2.1
@@ -7,24 +7,20 @@ CATEGORIES=	x11 kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
-DEPENDS+=		tiff-*:../../graphics/tiff
-DEPENDS+=		qt2-libs>=2.2.4:../../x11/qt2-libs
-DEPENDS+=		libaudiofile-*:../../audio/libaudiofile
-DEPENDS+=		jade>=1.2.1:../../textproc/jade
+USE_BUILDLINK_ONLY=	yes
 
 .include "../../x11/kde2/Makefile.part2"
 
-USE_LTDL=		yes
 LTCONFIG_OVERRIDE+=	${WRKSRC}/ksgmltools/ltconfig
 
 .include "../../mk/bsd.prefs.mk"
 
 .if (defined(KJS_USE_PCRE) && ${KJS_USE_PCRE} == yes)
-DEPENDS+=		pcre>=3.4:../../devel/pcre
+.include "../../devel/pcre/buildlink.mk"
 .endif
 
-CONFIGURE_ENV+=		KJS_USE_PCRE="${KJS_USE_PCRE}"
-LIBS=			-Wl,--export-dynamic
+CONFIGURE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
+LIBS+=			-Wl,--export-dynamic
 
 MKDIRS=	share/kde/icons/locolor/32x32/actions/kde \
 	share/kde/icons/locolor/22x22/mimetypes \
@@ -38,4 +34,11 @@ post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/$$d; \
 	done
 
+.include "../../archivers/bzip2/buildlink.mk"
+.include "../../audio/libaudiofile/buildlink.mk"
+.include "../../devel/libtool/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../textproc/jade/buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
new file mode 100644
index 00000000000..e7722ce6367
--- /dev/null
+++ b/x11/kdelibs2/buildlink.mk
@@ -0,0 +1,63 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/07/05 05:53:53 jlam Exp $
+#
+# This Makefile fragment is included by packages that use kdelibs2.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.kdelibs2 to the dependency pattern
+#     for the version of kdelibs2 desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(KDELIBS2_BUILDLINK_MK)
+KDELIBS2_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.kdelibs2?=	kdelibs-2.1nb1
+DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_PREFIX.kdelibs2=	${X11PREFIX}
+BUILDLINK_FILES.kdelibs2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/pkg/PLIST
+
+.if (defined(KJS_USE_PCRE) && ${KJS_USE_PCRE} == yes)
+.include "../../devel/pcre/buildlink.mk"
+.endif
+
+.include "../../archivers/bzip2/buildlink.mk"
+.include "../../audio/libaudiofile/buildlink.mk"
+.include "../../devel/libtool/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../textproc/jade/buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
+
+BUILDLINK_TARGETS.kdelibs2=	kdelibs2-buildlink
+BUILDLINK_TARGETS.kdelibs2+=	kdelibs2-buildlink-config-wrapper
+BUILDLINK_TARGETS.kdelibs2+=	kdelibs2-artsc-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.kdelibs2}
+
+BUILDLINK_CONFIG.kdelibs2=		${X11PREFIX}/bin/kde-config
+BUILDLINK_CONFIG_WRAPPER.kdelibs2=	${BUILDLINK_DIR}/bin/kde-config
+
+BUILDLINK_CONFIG.kdelibs2-artsc=	 ${X11PREFIX}/bin/artsc-config
+BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config
+
+.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+ARTSCCONFIG?=		${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc}
+KDECONFIG?=		${BUILDLINK_CONFIG_WRAPPER.kdelibs2}
+CONFIGURE_ENV+=		ARTSCCONFIG="${ARTSCCONFIG}"
+CONFIGURE_ENV+=		KDECONFIG="${KDECONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.kdelibs2}
+kdelibs2-buildlink: _BUILDLINK_USE
+kdelibs2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+kdelibs2-artsc-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# KDELIBS2_BUILDLINK_MK
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 8441dc414d6..b33e107fec8 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/05/24 22:18:22 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/07/05 05:53:53 jlam Exp $
 
 SHA1 (kdelibs-2.1.tar.bz2) = 5941037de8b47fb2d992ae780c28a8583f07d83c
 Size (kdelibs-2.1.tar.bz2) = 5020838 bytes
 SHA1 (patch-aa) = de413d73ae7a4359e49a4f29f4242017f098a6ea
 SHA1 (patch-ab) = d8fd5a336e7a0c22af4d4bf771c4f96261001b84
 SHA1 (patch-ac) = 11ac5f520e21ff403c6a3d04b61dfbd2d4036fae
-SHA1 (patch-ad) = 902e30cfd7e4ee8a91fe9899ef188bfa8ad23bff
+SHA1 (patch-ad) = 0f60efe8a2d22dc8b4e146834af06201657061d3
 SHA1 (patch-ae) = 1eae84672f4f792b7d56d9c958be585f30f9f056
 SHA1 (patch-af) = 542431463c9716001ebf17ea7a3b2506ed83f825
 SHA1 (patch-ag) = 750f4868cd2c81ec0317898ef1761a40016a86a8
diff --git a/x11/kdelibs2/patches/patch-ad b/x11/kdelibs2/patches/patch-ad
index 1864ada6d01..9c78b9cde60 100644
--- a/x11/kdelibs2/patches/patch-ad
+++ b/x11/kdelibs2/patches/patch-ad
@@ -1,20 +1,17 @@
-$NetBSD: patch-ad,v 1.2 2001/05/24 22:18:22 skrll Exp $
+$NetBSD: patch-ad,v 1.3 2001/07/05 05:53:53 jlam Exp $
 
---- configure.orig	Thu Feb 22 18:17:52 2001
+--- configure.orig	Thu Feb 22 13:17:52 2001
 +++ configure
-@@ -6188,9 +6188,10 @@
-   x_libraries="/usr/lib";  else
-   x_libraries=$kde_x_libraries
-   X_LDFLAGS="-L$x_libraries"
-+  X_WLRFLAGS="-Wl,-R$x_libraries"
- fi
- all_includes="$X_INCLUDES"
--all_libraries="$X_LDFLAGS"
-+all_libraries="$X_LDFLAGS $X_WLRFLAGS"
- 
- 
- 
-@@ -6790,7 +6791,7 @@
+@@ -5849,7 +5849,7 @@
+    for dir in $kde_use_extra_libs; do
+      kde_extra_libs="$kde_extra_libs $dir"
+      KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
+-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
++     #USER_LDFLAGS="$USER_LDFLAGS -L$dir"	# buildlink.mk
+    done
+    IFS=$ac_save_ifs
+    kde_use_extra_libs="added"
+@@ -6790,7 +6790,7 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
@@ -23,26 +20,30 @@ $NetBSD: patch-ad,v 1.2 2001/05/24 22:18:22 skrll Exp $
  
  
  
-@@ -12406,6 +12407,9 @@
+@@ -7043,7 +7043,7 @@
+ if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
+  QT_LDFLAGS=""
+ else
+- QT_LDFLAGS="-L$qt_libraries"
++ QT_LDFLAGS="-L${QTDIR}/lib"			# buildlink.mk
+  all_libraries="$all_libraries $QT_LDFLAGS"
  fi
  
- 
-+if test $KJS_USE_PCRE = yes; then
-+pcre_save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I${LOCALBASE}/include"
- for ac_hdr in pcreposix.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -12445,6 +12449,8 @@
-   echo "$ac_t""no" 1>&6
+@@ -7369,11 +7369,11 @@
+ if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then
+  KDE_INCLUDES=""
+ else
+- KDE_INCLUDES="-I$kde_includes"
++ KDE_INCLUDES="-I${BUILDLINK_DIR}/include"	# buildlink.mk
+  all_includes="$KDE_INCLUDES $all_includes"
  fi
- done
-+CPPFLAGS="$pcre_save_CPPFLAGS"
-+fi
- 
- 
- 
-@@ -13183,7 +13189,7 @@
+  
+-KDE_LDFLAGS="-L$kde_libraries"
++KDE_LDFLAGS="-L${BUILDLINK_DIR}/lib"		# buildlink.mk
+ if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
+  all_libraries="$all_libraries $KDE_LDFLAGS"
+ fi
+@@ -13183,7 +13183,7 @@
  
  
  
@@ -51,7 +52,7 @@ $NetBSD: patch-ad,v 1.2 2001/05/24 22:18:22 skrll Exp $
  
  
  CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST"
-@@ -14140,7 +14146,7 @@
+@@ -14140,7 +14140,7 @@
      esac
    done