summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc-ssp/Makefile5
-rw-r--r--lang/gcc/Makefile5
-rw-r--r--lang/gcc3-c/Makefile6
-rw-r--r--lang/gcc34-ada/Makefile5
-rw-r--r--lang/gcc34/Makefile6
-rw-r--r--lang/hugs/package.mk6
-rw-r--r--lang/kaffe-esound/Makefile4
-rw-r--r--lang/kaffe-x11/Makefile4
-rw-r--r--lang/lua/module.mk12
-rw-r--r--lang/mono/buildlink3.mk7
-rw-r--r--lang/ocaml/buildlink3.mk5
-rw-r--r--lang/php/pear.mk7
-rw-r--r--lang/php/pear_plist.php13
-rw-r--r--lang/py-html-docs/Makefile4
-rw-r--r--lang/py22-html-docs/Makefile4
-rw-r--r--lang/py23-html-docs/Makefile4
-rw-r--r--lang/py24-html-docs/Makefile4
-rw-r--r--lang/py25-html-docs/Makefile4
-rw-r--r--lang/python/pyversion.mk16
-rw-r--r--lang/ruby-doc-stdlib/Makefile5
-rw-r--r--lang/ruby/modules.mk12
-rw-r--r--lang/ruby/rubyversion.mk44
-rw-r--r--lang/sablevm-classpath-gui/Makefile6
-rw-r--r--lang/sablevm/Makefile11
-rw-r--r--lang/tcl/buildlink3.mk5
25 files changed, 40 insertions, 164 deletions
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 38df5d1307f..a0b5b70d69f 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2009/06/14 22:58:01 joerg Exp $
DISTNAME= gcc-2.95.3
PKGNAME= gcc-ssp-2.95.3.13
@@ -137,9 +137,6 @@ post-install:
${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
| ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
>> ${PLIST_SRC}
- ${FIND} ${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \
- >> ${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index f681103223f..fe0bf1ceaff 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2008/02/01 07:50:01 tnn Exp $
+# $NetBSD: Makefile,v 1.92 2009/06/14 22:58:01 joerg Exp $
DISTNAME= gcc-2.95.3
PKGREVISION= 7
@@ -115,9 +115,6 @@ post-install:
${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
| ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
>> ${PLIST_SRC}
- ${FIND} ${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \
- >> ${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 0a532e9e3b4..b4cd7576620 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/02/28 18:37:22 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2009/06/14 22:58:01 joerg Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
PKGREVISION= 1
@@ -28,9 +28,7 @@ post-build:
GENERATE_PLIST+= \
${FIND} ${DESTDIR:Q}${GCC_PREFIX} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"; \
- ${FIND} ${DESTDIR:Q}${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g";
+ | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"
post-install:
.if ${OPSYS} == "SunOS"
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index 27a33af4ca7..56390922033 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/09/27 15:46:11 abs Exp $
+# $NetBSD: Makefile,v 1.25 2009/06/14 22:58:02 joerg Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -168,9 +168,6 @@ post-install:
${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
| ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
>> ${PLIST_SRC}
- ${FIND} ${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \
- >> ${PLIST_SRC}
.if defined(USE_GCC34)
BUILDLINK_DEPMETHOD.gcc34= build
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 4a6553e0add..bf728e0a36d 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/04/22 18:59:54 hasso Exp $
+# $NetBSD: Makefile,v 1.42 2009/06/14 22:58:02 joerg Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -239,9 +239,7 @@ do-install:
GENERATE_PLIST+= \
${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"; \
- ${FIND} ${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g";
+ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"
.include "../../mk/bsd.prefs.mk"
.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
diff --git a/lang/hugs/package.mk b/lang/hugs/package.mk
index a513c886c74..667d05c50b2 100644
--- a/lang/hugs/package.mk
+++ b/lang/hugs/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.2 2007/03/07 12:51:17 jmmv Exp $
+# $NetBSD: package.mk,v 1.3 2009/06/14 22:58:02 joerg Exp $
#
PKGNAME= hugs98-${DISTNAME}
@@ -10,10 +10,6 @@ HUGS_RUN= ${BUILDLINK_PREFIX.hugs98}/bin/runhugs
HUGS_CPPHS= ${BUILDLINK_PREFIX.hugs98}/bin/cpphs-hugs
HUGS_HSC2HS= ${BUILDLINK_PREFIX.hugs98}/bin/hsc2hs-hugs
-PRINT_PLIST_AWK+= /^@dirrm lib\/hugs\/packages$$/ \
- { print "@comment in hugs: " $$0; next }
-
-
.include "../../lang/hugs/buildlink3.mk"
do-configure:
diff --git a/lang/kaffe-esound/Makefile b/lang/kaffe-esound/Makefile
index 344ddc06def..9a1782e84bd 100644
--- a/lang/kaffe-esound/Makefile
+++ b/lang/kaffe-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/05/16 19:11:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/14 22:58:02 joerg Exp $
#
.include "../../lang/kaffe/Makefile.common"
@@ -20,8 +20,6 @@ INSTALL_DIRS= libraries/clib/sound/esd
pre-build:
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
-PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
-
.include "../../audio/esound/buildlink3.mk"
.include "../../lang/kaffe/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index a69fc8b0738..8571d227b3c 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:56 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/06/14 22:58:02 joerg Exp $
#
.include "../../lang/kaffe/Makefile.common"
@@ -29,8 +29,6 @@ INSTALL_DIRS+= libraries/javalib/external/classpath/native/jawt
pre-build:
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
-PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
-
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/glib2/buildlink3.mk"
diff --git a/lang/lua/module.mk b/lang/lua/module.mk
index b3348dee96c..b7fc8899193 100644
--- a/lang/lua/module.mk
+++ b/lang/lua/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.2 2009/01/24 02:56:19 obache Exp $
+# $NetBSD: module.mk,v 1.3 2009/06/14 22:58:02 joerg Exp $
#
# This Makefile fragment is intended to be included by packages that
# install Lua packages.
@@ -14,11 +14,6 @@ LUA_PKGPREFIX= lua
LUA_LDIR= share/lua/${_LUA_VERSION}
PLIST_SUBST+= LUA_LDIR=${LUA_LDIR}
-PRINT_PLIST_AWK+= /^@dirrm share\/lua$$/ { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${LUA_LDIR:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${LUA_LDIR:S|/|\\/|g}/ \
- { gsub(/${LUA_LDIR:S|/|\\/|g}/, "$${LUA_LDIR}"); print; next; }
-
.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
DEPENDS+= lua-${_LUA_VERSION}.*:../../lang/lua
.else
@@ -27,11 +22,6 @@ PLIST_SUBST+= LUA_CDIR=${LUA_CDIR}
BUILDLINK_API_DEPENDS.lua+= lua-${_LUA_VERSION}.*
-PRINT_PLIST_AWK+= /^@dirrm lib\/lua$$/ { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${LUA_CDIR:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${LUA_CDIR:S|/|\\/|g}/ \
- { gsub(/${LUA_CDIR:S|/|\\/|g}/, "$${LUA_CDIR}"); print; next; }
-
.include "../../lang/lua/buildlink3.mk"
.endif
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index cf1e26e3fb8..e42487a9846 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2009/03/25 22:37:13 he Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2009/06/14 22:58:02 joerg Exp $
BUILDLINK_TREE+= mono
@@ -10,11 +10,6 @@ BUILDLINK_ABI_DEPENDS.mono?= mono>=2.2nb4
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q}
-PRINT_PLIST_AWK+= /^@dirrm lib\/mono\/gac$$/ \
- { print "@comment in mono: " $$0; next; }
-PRINT_PLIST_AWK+= /^@dirrm lib\/mono$$/ \
- { print "@comment in mono: " $$0; next; }
-
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.endif # MONO_BUILDLINK3_MK
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index d98662d6779..e213e9507c8 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/05/16 07:22:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/06/14 22:58:02 joerg Exp $
BUILDLINK_TREE+= ocaml
@@ -15,9 +15,6 @@ BUILDLINK_DEPMETHOD.ocaml?= build
INSTALL_UNSTRIPPED= yes
. endif
-PRINT_PLIST_AWK+= /^@dirrm lib\/ocaml$$/ \
- { print "@comment in ocaml: " $$0; next }
-
BUILDLINK_TARGETS+= ocaml-wrappers
OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
ocamlopt ocamlopt.opt
diff --git a/lang/php/pear.mk b/lang/php/pear.mk
index e15d597b3b3..d7bb4e7f8c1 100644
--- a/lang/php/pear.mk
+++ b/lang/php/pear.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pear.mk,v 1.12 2009/01/19 19:55:02 abs Exp $
+# $NetBSD: pear.mk,v 1.13 2009/06/14 22:58:02 joerg Exp $
#
# This Makefile fragment is intended to be included by packages that build
# and install pear packages.
@@ -37,16 +37,11 @@ PEAR_LIB= lib/php
PEAR_DESTDIR= -R ${DESTDIR}
.endif
-# whether @dirrm for baseinstalldir should be included in PLIST
-PEAR_DIRRM_BASEDIR?= # empty
-
# Dynamic PLIST, generated via a helper PHP script, which parses the package
# XML config file.
PEAR_GENERATE_PLIST= \
${ECHO} "@comment The following lines are automatically generated"; \
PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \
- PEAR_DIRRM_BASEDIR="${PEAR_DIRRM_BASEDIR}" \
- PEAR_DIRRM_EXCLUDE="${PEAR_DIRRM_EXCLUDE}" \
${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \
-C -n ${PKGDIR}/../../lang/php/pear_plist.php;
GENERATE_PLIST+= ${PEAR_GENERATE_PLIST}
diff --git a/lang/php/pear_plist.php b/lang/php/pear_plist.php
index fc34f920d80..6f3244708e5 100644
--- a/lang/php/pear_plist.php
+++ b/lang/php/pear_plist.php
@@ -1,5 +1,5 @@
<?php
-# $NetBSD: pear_plist.php,v 1.6 2009/01/19 19:55:02 abs Exp $
+# $NetBSD: pear_plist.php,v 1.7 2009/06/14 22:58:02 joerg Exp $
# Parses package XML file and outputs appropriate PLIST
$PEAR_LIB = getenv('PEAR_LIB');
@@ -55,15 +55,4 @@ foreach($info['filelist'] as $f => $v) {
while(($f = dirname($f)) && $f != '.')
$dirrm["{$prefix}{$f}"] = true;
}
-
-# output @dirrm directives, in reverse order so that deeper
-# directories are removed first
-$dirrm = array_keys($dirrm);
-rsort($dirrm);
-foreach($dirrm as $dir) {
- $fulldir = "{$PEAR_LIB}/$dir";
- if ($PEAR_DIRRM_EXCLUDE && substr($fulldir, 0, strlen($PEAR_DIRRM_EXCLUDE)) == $PEAR_DIRRM_EXCLUDE)
- continue;
- echo "@dirrm $fulldir\n";
-}
?>
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index d0e33ec4d73..4049a9666ec 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/06/14 22:58:02 joerg Exp $
#
DISTNAME= html-2.0
@@ -29,7 +29,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py22-html-docs/Makefile b/lang/py22-html-docs/Makefile
index c9b6005fa11..d26ff2246ae 100644
--- a/lang/py22-html-docs/Makefile
+++ b/lang/py22-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/14 22:58:03 joerg Exp $
#
DISTNAME= html-2.2.2
@@ -29,7 +29,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py23-html-docs/Makefile b/lang/py23-html-docs/Makefile
index 81a43645980..68a500d2cd8 100644
--- a/lang/py23-html-docs/Makefile
+++ b/lang/py23-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/14 22:58:03 joerg Exp $
#
DISTNAME= html-2.3.3
@@ -29,7 +29,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py24-html-docs/Makefile b/lang/py24-html-docs/Makefile
index eb79afcc631..8561e98099d 100644
--- a/lang/py24-html-docs/Makefile
+++ b/lang/py24-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/14 22:58:03 joerg Exp $
#
DISTNAME= html-2.4.3
@@ -30,7 +30,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py25-html-docs/Makefile b/lang/py25-html-docs/Makefile
index d9f179ab38a..78ec3316173 100644
--- a/lang/py25-html-docs/Makefile
+++ b/lang/py25-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/06/03 16:23:24 smb Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/14 22:58:03 joerg Exp $
#
DISTNAME= html-2.5.2
@@ -30,7 +30,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${WRKSRC} && pax -rw -pe [a-z]* ${DESTDIR}${PREFIX}/${HTMLDIR}
cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index f393483b79e..5173117e800 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.70 2009/04/19 15:14:19 snj Exp $
+# $NetBSD: pyversion.mk,v 1.71 2009/06/14 22:58:03 joerg Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -164,20 +164,6 @@ PYLIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
print distutils.sysconfig.get_python_lib(0, 1, \"\")" || ${ECHO} ""
PYSITELIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
print distutils.sysconfig.get_python_lib(0, 0, \"\")" || ${ECHO} ""
-
-PRINT_PLIST_AWK+= /^@dirrm ${PYINC:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${PYSITELIB:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${PYLIB:S|/|\\/|g}$$/ { next; }
-
-PRINT_PLIST_AWK+= /^(@dirrm )?${PYINC:S|/|\\/|g}/ \
- { gsub(/${PYINC:S|/|\\/|g}/, "$${PYINC}"); \
- print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${PYSITELIB:S|/|\\/|g}/ \
- { gsub(/${PYSITELIB:S|/|\\/|g}/, "$${PYSITELIB}"); \
- print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${PYLIB:S|/|\\/|g}/ \
- { gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}"); \
- print; next; }
.endif
ALL_ENV+= PYTHON=${PYTHONBIN}
diff --git a/lang/ruby-doc-stdlib/Makefile b/lang/ruby-doc-stdlib/Makefile
index 502b3746f04..e04f7306322 100644
--- a/lang/ruby-doc-stdlib/Makefile
+++ b/lang/ruby-doc-stdlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/14 22:58:03 joerg Exp $
DISTNAME= ruby-doc-stdlib-0.10.1
CATEGORIES= lang ruby
@@ -27,8 +27,5 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cd ${DESTDIR}${PREFIX} && \
${FIND} ${DOCDIR} -type f -print >> ${PLIST_SRC}
- cd ${DESTDIR}${PREFIX} && \
- ${FIND} -d ${DOCDIR} -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 62befd9046f..8242dddf44f 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.26 2009/05/16 07:22:04 rillig Exp $
+# $NetBSD: modules.mk,v 1.27 2009/06/14 22:58:03 joerg Exp $
.if !defined(_RUBY_MODULE_MK)
_RUBY_MODULE_MK= # defined
@@ -163,14 +163,4 @@ ruby-simple-install:
.endif # USE_RUBY_INSTALL
.include "replace.mk"
-
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITEARCHLIB:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITELIB:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_VENDORARCHLIB:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_VENDORLIB:S|/|\\/|g}$$/ \
- { next; }
-
.endif
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 06875e78902..b3627a2c129 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.46 2009/06/10 12:45:34 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.47 2009/06/14 22:58:03 joerg Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -305,13 +305,9 @@ RUBY_PLIST_COMMENT_CMD= \
RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \
${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \
${SORT} -u
-RUBY_PLIST_DIRS_CMD= ( cd ${DESTDIR}${PREFIX}; \
- ${FIND} ${RUBY_DYNAMIC_DIRS} -type d -print ) | ${SORT} -ru | \
- ${SED} -e 's|^|@dirrm |'
RUBY_GENERATE_PLIST = ( \
${RUBY_PLIST_COMMENT_CMD}; \
- ${RUBY_PLIST_FILES_CMD}; \
- ${RUBY_PLIST_DIRS_CMD} ) > ${RUBY_PLIST_DYNAMIC}
+ ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC}
.endif
.if !empty(RUBY_NOVERSION:M[nN][oO])
@@ -327,52 +323,40 @@ RUBY_GENERATE_PLIST = ( \
PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \
{ gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_ARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_VENDORLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITEARCHLIB:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITELIB:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITELIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_SITELIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITELIB_BASE:S|/|\\/|g}$$/ \
+PRINT_PLIST_AWK+= /^${RUBY_SITELIB_BASE:S|/|\\/|g}$$/ \
{ gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_VENDORLIB_BASE:S|/|\\/|g}$$/ \
+PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB_BASE:S|/|\\/|g}$$/ \
{ gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \
print; next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_LIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_LIB:S|/|\\/|g}/ \
{ gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \
print; next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_DOC:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_DOC:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_DOC:S|/|\\/|g}/ \
{ gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \
print; next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_EG:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_EG:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_EG:S|/|\\/|g}/ \
{ gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \
print; next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SITERIDIR:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SITERIDIR:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \
{ gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \
print; next; }
-PRINT_PLIST_AWK+= /^@dirrm ${RUBY_SYSRIDIR:S|/|\\/|g}$$/ \
- { next; }
-PRINT_PLIST_AWK+= /^(@dirrm )?${RUBY_SYSRIDIR:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}/ \
{ gsub(/${RUBY_SYSRIDIR:S|/|\\/|g}/, "$${RUBY_SYSRIDIR}"); \
print; next; }
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 059c229bd91..fe78f5e6d6e 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/06/14 22:58:03 joerg Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -16,10 +16,6 @@ BUILD_DIRS= native/jni/classpath
BUILD_DIRS+= native/jni/gtk-peer
INSTALL_DIRS= native/jni/gtk-peer
-PRINT_PLIST_AWK+= \
- /^@dirrm java\/sablevm\/lib\/sablevm-classpath$$/ \
- { print "@comment in sablevm-classpath: "$$0; next; }
-
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/glib2/buildlink3.mk"
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index 6b956402f4c..03de386d846 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/04/08 22:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/06/14 22:58:03 joerg Exp $
#
DISTNAME= sablevm-1.13
@@ -26,15 +26,6 @@ JAVA_HOME= ${PREFIX}/java/sablevm
JAVA_WRAPPERS+= java
JAVA_WRAPPER_BIN.java= ${JAVA_HOME}/bin/java-sablevm --classpath $${CLASSPATH}
-PRINT_PLIST_AWK+= /^@dirrm java\/sablevm$$/ \
- || /^@dirrm java\/sablevm\/share$$/ \
- || /^@dirrm java\/sablevm\/include$$/ \
- || /^@dirrm java\/sablevm\/lib$$/ \
- || /^@dirrm java\/sablevm\/lib\/sablevm\/jre$$/ \
- || /^@dirrm java\/sablevm\/lib\/sablevm$$/ \
- { print "@comment in sablevm-classpath: " $$0; \
- next; }
-
BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/lib
INSTALLATION_DIRS= java/sablevm/lib/sablevm/bin java/sablevm/lib/sablevm/jre
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 5d68998fd61..7f7e9197460 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/06/14 22:58:03 joerg Exp $
BUILDLINK_TREE+= tcl
@@ -19,9 +19,6 @@ BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
-PRINT_PLIST_AWK+= /^@dirrm lib\/tcl$$/ \
- { print "@comment in tcl: " $$0; next; }
-
.include "../../mk/dlopen.buildlink3.mk"
.endif # TCL_BUILDLINK3_MK
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 04:55:18 +0000