summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2002-10-01 13:29:21 +0000
committermarkd <markd@pkgsrc.org>2002-10-01 13:29:21 +0000
commit30921f4d10ccb81fbb47f733af166f67fb73754c (patch)
treec5556596d1a6d26614a9f9d547e8e1d625bd54ea
parente30115be7457c00e6a5615b3e55419d619e759bc (diff)
downloadpkgsrc-30921f4d10ccb81fbb47f733af166f67fb73754c.tar.gz
buildlink1 -> buildlink2
-rw-r--r--x11/kdelibs3/Makefile41
1 files changed, 17 insertions, 24 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5aae82329ae..14de7d05934 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/01 13:29:21 markd Exp $
DISTNAME= kdelibs-3.0.3
PKGREVISION= 1
@@ -10,10 +10,10 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.0.3
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
-CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
.include "../../mk/bsd.prefs.mk"
@@ -23,21 +23,14 @@ LIBS+= -Wl,--export-dynamic
GCC_VERSION!= gcc --version
.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha)
-.include "../../lang/gcc/Makefile.gcc"
+.include "../../lang/gcc/buildlink2.mk"
.endif
-# Override KDE_INCLUDES and QT_INCLUDES at build-time since their values
-# are used by reference within the kdelibs3 Makefiles
-#
-MAKE_FLAGS+= KDE_INCLUDES="-I${BUILDLINK_DIR}/include"
-MAKE_FLAGS+= QT_INCLUDES="-I${BUILDLINK_QTDIR}/include"
-
# The configure script looks for xml2-config in the environment as
# ${XML_CONFIG}, not as ${XML2_CONFIG} like it's supposed to.
#
CONFIGURE_ENV+= XML_CONFIG="${XML2_CONFIG}"
KDEDIR= ${PREFIX}
-BUILDLINK_KDEDIR= ${BUILDLINK_DIR}
REPLACE_PERL= \
${WRKSRC}/kio/proxytype.pl \
@@ -47,7 +40,7 @@ PLIST_SRC= ${WRKDIR}/PLIST
UNLIMIT_RESOURCES= datasize memorysize
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
BUILD_DEFS+= USE_CUPS
PLIST_SUBST+= CUPS=
@@ -96,18 +89,18 @@ post-install:
${ECHO} "@dirrm share/kde"; \
) > ${PLIST_SRC}
-.include "../../archivers/bzip2/buildlink.mk"
-.include "../../audio/arts/buildlink.mk"
-.include "../../devel/pcre/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../textproc/libxslt/buildlink.mk"
-.include "../../x11/kde3/buildlink.mk"
-.include "../../x11/qt3-libs/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../audio/arts/buildlink2.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../textproc/libxslt/buildlink2.mk"
+.include "../../x11/kde3/buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
# XXX On NetBSD, the egcs for: