summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-25 18:38:05 +0000
committerjlam <jlam>2002-08-25 18:38:05 +0000
commitf22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch)
treed2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /lang
parent71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff)
downloadpkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5/Makefile5
-rw-r--r--lang/perl5/buildlink.mk2
-rw-r--r--lang/perl5/buildlink2.mk27
-rw-r--r--lang/tcl/Makefile4
-rw-r--r--lang/tcl/buildlink2.mk23
5 files changed, 56 insertions, 5 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index de4720800f4..8fb2b63eeb7 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2002/01/30 22:34:15 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2002/08/25 18:39:26 jlam Exp $
.include "../../lang/perl5/Makefile.common"
@@ -15,6 +15,7 @@ CONFLICTS= perl-5.00* perl-base-[0-9]* \
p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
perl-mk-[0-9]*
+USE_BUILDLINK2= # defined
HAS_CONFIGURE= # defined
CONFIGURE_SCRIPT= ./Configure
CONFIGURE_ARGS+= -sde
@@ -22,7 +23,7 @@ CONFIGURE_ARGS+= -Dprefix="${PREFIX}"
CONFIGURE_ARGS+= -Dscriptdir="${PREFIX}/bin"
CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
-CONFIGURE_ARGS+= -Dcc="${CC}"
+CONFIGURE_ARGS+= -Dcc="${CC:T}"
CONFIGURE_ARGS+= -Uusemymalloc
CONFIGURE_ARGS+= -Uinstallusrbinperl
diff --git a/lang/perl5/buildlink.mk b/lang/perl5/buildlink.mk
index 208ace74167..54f2cc3f22d 100644
--- a/lang/perl5/buildlink.mk
+++ b/lang/perl5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2002/07/24 19:43:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:27 jlam Exp $
#
# This Makefile fragment is included by packages that use perl.
#
diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk
new file mode 100644
index 00000000000..61768d56a39
--- /dev/null
+++ b/lang/perl5/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:27 jlam Exp $
+
+.if !defined(PERL5_BUILDLINK2_MK)
+PERL5_BUILDLINK2_MK= # defined
+
+USE_PERL5= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+PERL5_REQD?= 5.0
+BUILDLINK_PACKAGES+= perl
+BUILDLINK_DEPENDS.perl?= perl>=${PERL5_REQD}
+BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.perl=perl
+BUILDLINK_PREFIX.perl_DEFAULT= ${LOCALBASE}
+PERL5?= ${BUILDLINK_PREFIX.perl}/bin/perl
+
+BUILDLINK_FILES.perl= \
+ ${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/CORE/* \
+ ${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/auto/DynaLoader/DynaLoader.a
+
+BUILDLINK_TARGETS+= perl-buildlink
+
+perl-buildlink: _BUILDLINK_USE
+
+.endif # PERL5_BUILDLINK2_MK
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 24c55fd9bfc..ad43e09db87 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/03/20 18:04:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 18:39:28 jlam Exp $
#
DISTNAME= tcl8.3.4
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
MAKE_ENV+= TOUCH="${TOUCH}"
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
USE_LIBTOOL= yes
INSTALL_TARGET= install
diff --git a/lang/tcl/buildlink2.mk b/lang/tcl/buildlink2.mk
new file mode 100644
index 00000000000..47b3c3591d2
--- /dev/null
+++ b/lang/tcl/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:28 jlam Exp $
+
+.if !defined(TCL_BUILDLINK2_MK)
+TCL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= tcl
+BUILDLINK_DEPENDS.tcl?= tcl>=8.3.4
+BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.tcl=tcl
+BUILDLINK_PREFIX.tcl_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.tcl= include/tcl.h
+BUILDLINK_FILES.tcl+= include/tclDecls.h
+BUILDLINK_FILES.tcl+= include/tclPlatDecls.h
+BUILDLINK_FILES.tcl+= include/tcl/*/*.h
+BUILDLINK_FILES.tcl+= lib/libtcl83.*
+BUILDLINK_FILES.tcl+= lib/libtclstub83.*
+
+BUILDLINK_TARGETS+= tcl-buildlink
+
+tcl-buildlink: _BUILDLINK_USE
+
+.endif # TCL_BUILDLINK2_MK