summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/gauche/Makefile6
-rw-r--r--lang/gcc3/Makefile.common6
-rw-r--r--lang/gcc34/buildlink3.mk5
-rw-r--r--lang/gcc44/buildlink3.mk5
-rw-r--r--lang/gcc45/buildlink3.mk5
-rw-r--r--lang/gcc46-libs/Makefile7
-rw-r--r--lang/gcc46/buildlink3.mk4
-rw-r--r--lang/gcc47-libs/Makefile7
-rw-r--r--lang/gcc47/buildlink3.mk4
-rw-r--r--lang/gcc48-libs/Makefile7
-rw-r--r--lang/gcc48/buildlink3.mk4
-rw-r--r--lang/gcc49-libs/Makefile7
-rw-r--r--lang/gcc49/buildlink3.mk4
-rw-r--r--lang/gcc5-libs/Makefile7
-rw-r--r--lang/gcc5/buildlink3.mk4
-rw-r--r--lang/oo2c/Makefile7
-rw-r--r--lang/perl5/buildlink3.mk6
-rw-r--r--lang/ruby/gem-vars.mk6
-rw-r--r--lang/ruby/modules.mk5
-rw-r--r--lang/scm/Makefile5
-rw-r--r--lang/tcl/buildlink3.mk9
-rw-r--r--lang/tcl85/buildlink3.mk9
22 files changed, 38 insertions, 91 deletions
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 98456a20bd4..6756b924fd6 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2015/02/27 14:35:01 tnn Exp $
+# $NetBSD: Makefile,v 1.68 2015/11/25 12:51:16 jperkin Exp $
#
DISTNAME= Gauche-0.9.4
@@ -15,11 +15,9 @@ DEPENDS+= slib-[0-9]*:../../devel/slib
.include "options.mk"
-EVAL_PREFIX+= SLIB_PREFIX=slib
-
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-slib=${SLIB_PREFIX}/share/slib
+CONFIGURE_ARGS+= --with-slib=${LOCALBASE}/share/slib
CONFIGURE_ARGS+= --enable-threads=pthreads
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 62bffa36e48..c50fa4c18d1 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2014/10/05 16:41:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2015/11/25 12:51:16 jperkin Exp $
#
# used by lang/gcc3/language.mk
# used by lang/gcc3-c/Makefile
@@ -89,9 +89,7 @@ MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
DEPENDS+= binutils>=2.13.2.1:../../devel/binutils
-EVAL_PREFIX+= BINUTILS_PREFIX=binutils
-BINUTILS_PREFIX_DEFAULT= ${LOCALBASE}
-CONFIGURE_ARGS+= --with-as=${BINUTILS_PREFIX}/${MACHINE_GNU_PLATFORM}/bin/as
+CONFIGURE_ARGS+= --with-as=${LOCALBASE}/${MACHINE_GNU_PLATFORM}/bin/as
.endif
OPSYSVARS+= GCC_SHARED_ARG
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index b4ab92bb916..13903279d74 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,13 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.22 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc34
.if !defined(GCC34_BUILDLINK3_MK)
GCC34_BUILDLINK3_MK:=
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc34=gcc34
-.include "../../mk/find-prefix.mk"
-
_GCC34_SUBDIR= gcc34
_GCC34_PREFIX= ${BUILDLINK_PREFIX.gcc34}/${_GCC34_SUBDIR}
diff --git a/lang/gcc44/buildlink3.mk b/lang/gcc44/buildlink3.mk
index 07cb61a4c96..b4e7961501d 100644
--- a/lang/gcc44/buildlink3.mk
+++ b/lang/gcc44/buildlink3.mk
@@ -1,13 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.10 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc44
.if !defined(GCC44_BUILDLINK3_MK)
GCC44_BUILDLINK3_MK:=
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc44=gcc44
-.include "../../mk/find-prefix.mk"
-
_GCC44_SUBDIR= gcc44
_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR}
diff --git a/lang/gcc45/buildlink3.mk b/lang/gcc45/buildlink3.mk
index d8d10f67b46..f7480a853fb 100644
--- a/lang/gcc45/buildlink3.mk
+++ b/lang/gcc45/buildlink3.mk
@@ -1,13 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc45
.if !defined(GCC45_BUILDLINK3_MK)
GCC45_BUILDLINK3_MK:=
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc45=gcc45
-.include "../../mk/find-prefix.mk"
-
_GCC45_SUBDIR= gcc45
_GCC45_PREFIX= ${BUILDLINK_PREFIX.gcc45}/${_GCC45_SUBDIR}
diff --git a/lang/gcc46-libs/Makefile b/lang/gcc46-libs/Makefile
index 90297b71a35..a45f11ec2bd 100644
--- a/lang/gcc46-libs/Makefile
+++ b/lang/gcc46-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/01 01:31:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/25 12:51:16 jperkin Exp $
GCC_PKGNAME= gcc46
GCC46_DIST_VERSION:= 4.6.4
@@ -27,11 +27,8 @@ BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC46_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc4
.include "../../mk/bsd.prefs.mk"
-FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC46_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
-
LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
-LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX= ${LOCALBASE}/${LIBGCC_SUBPREFIX}
GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
BUILD_DEFS+= GCC_TARGET_MACHINE
diff --git a/lang/gcc46/buildlink3.mk b/lang/gcc46/buildlink3.mk
index f0dba4a4f06..107e05fa95c 100644
--- a/lang/gcc46/buildlink3.mk
+++ b/lang/gcc46/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/01/01 01:29:56 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc46
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc46+= gcc46>=4.6.0
BUILDLINK_PKGSRCDIR.gcc46= ../../lang/gcc46
BUILDLINK_DEPMETHOD.gcc46?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc46=gcc46
-.include "../../mk/find-prefix.mk"
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc46}/gcc46
BUILDLINK_FILES.gcc46= #empty
diff --git a/lang/gcc47-libs/Makefile b/lang/gcc47-libs/Makefile
index b942e71d35f..3281ef904c6 100644
--- a/lang/gcc47-libs/Makefile
+++ b/lang/gcc47-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/06/22 15:38:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/25 12:51:16 jperkin Exp $
GCC_PKGNAME= gcc47
.include "../../lang/${GCC_PKGNAME}/version.mk"
@@ -28,11 +28,8 @@ BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc4
.include "../../mk/bsd.prefs.mk"
-FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC47_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
-
LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
-LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX= ${LOCALBASE}/${LIBGCC_SUBPREFIX}
GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
BUILD_DEFS+= GCC_TARGET_MACHINE
diff --git a/lang/gcc47/buildlink3.mk b/lang/gcc47/buildlink3.mk
index 07f32313634..dba01132a51 100644
--- a/lang/gcc47/buildlink3.mk
+++ b/lang/gcc47/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc47
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc47+= gcc47>=4.7.0
BUILDLINK_PKGSRCDIR.gcc47= ../../lang/gcc47
BUILDLINK_DEPMETHOD.gcc47?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc47=gcc47
-.include "../../mk/find-prefix.mk"
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc47}/gcc47
BUILDLINK_FILES.gcc47= #empty
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index 9d2b087da55..c67e0df8cf3 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/06/22 15:38:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2015/11/25 12:51:16 jperkin Exp $
GCC_PKGNAME= gcc48
.include "../../lang/${GCC_PKGNAME}/version.mk"
@@ -28,11 +28,8 @@ BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc4
.include "../../mk/bsd.prefs.mk"
-FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
-
LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
-LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX= ${LOCALBASE}/${LIBGCC_SUBPREFIX}
GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
BUILD_DEFS+= GCC_TARGET_MACHINE
diff --git a/lang/gcc48/buildlink3.mk b/lang/gcc48/buildlink3.mk
index 39253c61c6a..7e3dea656f9 100644
--- a/lang/gcc48/buildlink3.mk
+++ b/lang/gcc48/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/09/11 15:16:08 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/11/25 12:51:16 jperkin Exp $
BUILDLINK_TREE+= gcc48
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc48+= gcc48>=4.8.0
BUILDLINK_PKGSRCDIR.gcc48= ../../lang/gcc48
BUILDLINK_DEPMETHOD.gcc48?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc48=gcc48
-.include "../../mk/find-prefix.mk"
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc48}/gcc48
BUILDLINK_FILES.gcc48= #empty
diff --git a/lang/gcc49-libs/Makefile b/lang/gcc49-libs/Makefile
index 5e0b0d34e36..da327e7b7e7 100644
--- a/lang/gcc49-libs/Makefile
+++ b/lang/gcc49-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/01 13:40:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:51:17 jperkin Exp $
GCC_PKGNAME= gcc49
.include "../../lang/${GCC_PKGNAME}/version.mk"
@@ -30,11 +30,8 @@ BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC49_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc4
.include "../../mk/bsd.prefs.mk"
-FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC49_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
-
LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
-LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX= ${LOCALBASE}/${LIBGCC_SUBPREFIX}
GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
BUILD_DEFS+= GCC_TARGET_MACHINE
diff --git a/lang/gcc49/buildlink3.mk b/lang/gcc49/buildlink3.mk
index ac1cb5a15b0..1573d18af4b 100644
--- a/lang/gcc49/buildlink3.mk
+++ b/lang/gcc49/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $
BUILDLINK_TREE+= gcc49
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc49+= gcc49>=4.9.1
BUILDLINK_PKGSRCDIR.gcc49= ../../lang/gcc49
BUILDLINK_DEPMETHOD.gcc49?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc49=gcc49
-.include "../../mk/find-prefix.mk"
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc49}/gcc49
BUILDLINK_FILES.gcc49= #empty
diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile
index 82bfde115da..41117eadab4 100644
--- a/lang/gcc5-libs/Makefile
+++ b/lang/gcc5-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/10/14 20:17:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/25 12:51:17 jperkin Exp $
GCC_PKGNAME= gcc5
.include "../../lang/${GCC_PKGNAME}/version.mk"
@@ -30,11 +30,8 @@ BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC5_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc5
.include "../../mk/bsd.prefs.mk"
-FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC5_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
-
LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
-LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX= ${LOCALBASE}/${LIBGCC_SUBPREFIX}
GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
BUILD_DEFS+= GCC_TARGET_MACHINE
diff --git a/lang/gcc5/buildlink3.mk b/lang/gcc5/buildlink3.mk
index 9b67414a0c2..8bf39153573 100644
--- a/lang/gcc5/buildlink3.mk
+++ b/lang/gcc5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/11/25 12:51:17 jperkin Exp $
BUILDLINK_TREE+= gcc5
@@ -10,8 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc5+= gcc5>=5.1
BUILDLINK_PKGSRCDIR.gcc5= ../../lang/gcc5
BUILDLINK_DEPMETHOD.gcc5?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc5=gcc5
-.include "../../mk/find-prefix.mk"
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc5}/gcc5
BUILDLINK_FILES.gcc5= #empty
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 69733a64d5c..d7f9fb9c760 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/06/12 10:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/11/25 12:51:17 jperkin Exp $
DISTNAME= oo2c_${BITS}-2.0.11
PKGNAME= oo2c-2.0.11
@@ -25,9 +25,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
USE_LIBTOOL= yes
-EVAL_PREFIX+= LIBTOOL_PREFIX=libtool-base
-LIBTOOL_PREFIX_DEFAULT= ${LOCALBASE}
-
TEST_TARGET= test
INSTALLATION_DIRS= share/doc/html share/emacs/site-lisp
@@ -42,7 +39,7 @@ SUBST_SED.destdir+= -e 's,>${PREFIX}/bin<,>${DESTDIR}${PREFIX}/bin<,g'
SUBST_CLASSES+= pkg-unwrap
SUBST_STAGE.pkg-unwrap= post-install
SUBST_FILES.pkg-unwrap= ${DESTDIR}${PREFIX}/lib/oo2c/oo2crc.xml
-SUBST_SED.pkg-unwrap= -e 's,${WRAPPER_DIR},${LIBTOOL_PREFIX},g'
+SUBST_SED.pkg-unwrap= -e 's,${WRAPPER_DIR},${LOCALBASE},g'
post-install:
${LN} -sf ${PREFIX}/lib/oo2c/oocdoc/html ${DESTDIR}${PREFIX}/share/doc/html/oo2c
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 037cc1b1a96..4e7cab42991 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.56 2015/06/11 13:44:23 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.57 2015/11/25 12:51:17 jperkin Exp $
BUILDLINK_TREE+= perl
@@ -18,9 +18,7 @@ BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
_TOOLS_USE_PKGSRC.perl= yes
-FIND_PREFIX:= PERLDIR=perl
-.include "../../mk/find-prefix.mk"
-PERL5= ${PERLDIR}/bin/perl
+PERL5= ${LOCALBASE}/bin/perl
pkgbase := perl
.include "../../mk/pkg-build-options.mk"
diff --git a/lang/ruby/gem-vars.mk b/lang/ruby/gem-vars.mk
index b1473e7e7b3..270f8c4f674 100644
--- a/lang/ruby/gem-vars.mk
+++ b/lang/ruby/gem-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gem-vars.mk,v 1.2 2015/04/26 16:51:26 rodent Exp $
+# $NetBSD: gem-vars.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $
#
# This Makefile fragment defines various make(1) variables for Ruby gems
# support.
@@ -15,9 +15,7 @@ MAKE_ENV+= GEM_PATH=${GEM_PATH}
RUBYGEM_LANG?= en_US.UTF-8
RUBYGEM_ENV?= LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG}
-FIND_PREFIX+= RUBY_PREFIX=${RUBY_BASE}
-.include "../../mk/find-prefix.mk"
-RUBYGEM= ${RUBY_PREFIX}/bin/${RUBYGEM_NAME}
+RUBYGEM= ${LOCALBASE}/bin/${RUBYGEM_NAME}
RUBY_GEMS_VERSION?= ${RUBY_GEMS_PKGSRC_VERS}
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 352c1c15e33..0946123052b 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.35 2014/03/13 17:06:42 taca Exp $
+# $NetBSD: modules.mk,v 1.36 2015/11/25 12:51:17 jperkin Exp $
.if !defined(_RUBY_MODULE_MK)
_RUBY_MODULE_MK= # defined
@@ -205,8 +205,7 @@ BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-rake>=0.8.7:../../devel/ruby-rake
# RAKE
# The path to the ``rake'' binary.
#
-EVAL_PREFIX+= RAKE_PREFIX=${RAKE_NAME}
-RAKE= ${RAKE_PREFIX}/bin/${RAKE_NAME}
+RAKE= ${LOCALBASE}/bin/${RAKE_NAME}
MAKE_ENV+= RAKE=${RAKE:Q}
.endif
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index f4f763a24cf..220a1b8c57a 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/02/08 23:39:55 wiedi Exp $
+# $NetBSD: Makefile,v 1.26 2015/11/25 12:51:17 jperkin Exp $
#
# Convert the version number as follows 2d2 -> 2.4.2, where the d is
# changed to a 4, representing the 4th letter.
@@ -20,7 +20,6 @@ COMMENT= Portable scheme interpreter
DEPENDS+= slib>=3.1.1:../../devel/slib
WRKSRC= ${WRKDIR}/scm
-EVAL_PREFIX+= SLIB_PREFIX=slib
INFO_FILES= yes
LDFLAGS.SunOS+= -lsocket -lnsl
@@ -46,7 +45,7 @@ INSTALLATION_DIRS= ${PKGINFODIR} share/scm
.include "../../mk/readline.buildlink3.mk"
post-extract:
- ${SED} -e "s|@SLIB_PREFIX@|"${SLIB_PREFIX:Q}"|g" \
+ ${SED} -e "s|@SLIB_PREFIX@|"${LOCALBASE}"|g" \
${FILESDIR}/require.scm > ${WRKSRC}/require.scm
${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \
-e "s|@COMPILED_INITS@|${COMPILED_INITS:=();}|g" \
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index c920ae5263a..7060922a0a2 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2014/02/26 11:24:28 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2015/11/25 12:51:17 jperkin Exp $
BUILDLINK_TREE+= tcl
@@ -17,13 +17,10 @@ BUILDLINK_FILES.tcl+= bin/tclsh*
BUILDLINK_TRANSFORM+= l:tcl:tcl86
BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86
-TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
-
_TOOLS_USE_PKGSRC.tclsh= yes
-FIND_PREFIX:= TOOLS_PREFIX.tclsh=tcl
-.include "../../mk/find-prefix.mk"
-TCLSH= ${TOOLS_PREFIX.tclsh}/bin/tclsh
+TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/tcl85/buildlink3.mk b/lang/tcl85/buildlink3.mk
index 670a6f59f6f..0c2560fb3c4 100644
--- a/lang/tcl85/buildlink3.mk
+++ b/lang/tcl85/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/03/17 00:04:43 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $
BUILDLINK_TREE+= tcl
@@ -17,13 +17,10 @@ BUILDLINK_FILES.tcl+= bin/tclsh*
BUILDLINK_TRANSFORM+= l:tcl:tcl85
BUILDLINK_TRANSFORM+= l:tcl8.5:tcl85
-TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
-
_TOOLS_USE_PKGSRC.tclsh= yes
-FIND_PREFIX:= TOOLS_PREFIX.tclsh=tcl
-.include "../../mk/find-prefix.mk"
-TCLSH= ${TOOLS_PREFIX.tclsh}/bin/tclsh
+TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 04:54:23 +0000