From 9bb0d96ea93fe7d169bb22cd824d463449d51611 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 14 Jun 2009 22:57:58 +0000 Subject: Remove @dirrm related logic. --- devel/GConf/Makefile | 6 +-- devel/GConf/schemas.mk | 6 +-- devel/bzr/plugin.mk | 11 +---- devel/distcc/Makefile.common | 4 +- devel/glib2/Makefile | 7 +-- devel/glib2/buildlink3.mk | 6 +-- devel/gnustep-base/buildlink3.mk | 101 +------------------------------------- devel/gnustep-make/buildlink3.mk | 26 +--------- devel/gnustep-objc/buildlink3.mk | 5 +- devel/libFoundation/buildlink3.mk | 45 +---------------- devel/libbonobo/Makefile | 6 +-- devel/libbonobo/buildlink3.mk | 8 +-- devel/libglade/buildlink3.mk | 6 +-- devel/ruby-log4r/Makefile | 9 ++-- 14 files changed, 16 insertions(+), 230 deletions(-) (limited to 'devel') diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index f342ba6d426..123f4b5b22f 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2009/05/18 08:26:24 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2009/06/14 22:57:59 joerg Exp $ # .include "../../devel/GConf/Makefile.common" @@ -18,10 +18,6 @@ CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path CONF_FILES+= ${EGDIR}/org.gnome.GConf.Defaults.conf \ ${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.gnome.GConf.Defaults.conf -PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \ - { print "@unexec $${RMDIR} -p %D/" $$2 \ - " 2>/dev/null || $${TRUE}"; next} - # XXX: We need to use XML_CATALOGS here to register the installed DTD. # But we have to wait until a public identifier is choosen for it. diff --git a/devel/GConf/schemas.mk b/devel/GConf/schemas.mk index d5fc6b6c365..395c5812317 100644 --- a/devel/GConf/schemas.mk +++ b/devel/GConf/schemas.mk @@ -1,4 +1,4 @@ -# $NetBSD: schemas.mk,v 1.1 2007/09/21 12:58:13 wiz Exp $ +# $NetBSD: schemas.mk,v 1.2 2009/06/14 22:57:59 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # GConf schema files. It takes care of registering them in the GConf @@ -51,10 +51,6 @@ INSTALL_TEMPLATES+= ${.CURDIR}/../../devel/GConf/files/install.tmpl DEINSTALL_TEMPLATES+= ${.CURDIR}/../../devel/GConf/files/deinstall.tmpl .endif -PRINT_PLIST_AWK+= /^@dirrm share\/gconf$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/gconf\/schemas$$/ \ - { print "@comment in GConf: " $$0; next; } - .include "../../mk/bsd.prefs.mk" .include "../../devel/GConf/buildlink3.mk" diff --git a/devel/bzr/plugin.mk b/devel/bzr/plugin.mk index 02fb427fb7d..8abefe86a42 100644 --- a/devel/bzr/plugin.mk +++ b/devel/bzr/plugin.mk @@ -1,4 +1,4 @@ -# $NetBSD: plugin.mk,v 1.1 2008/08/26 01:17:33 epg Exp $ +# $NetBSD: plugin.mk,v 1.2 2009/06/14 22:57:59 joerg Exp $ BZR_PLUGIN_NAME?= ${PKGBASE:S/^bzr-//} BZR_PLUGIN_TEST?= yes @@ -8,15 +8,6 @@ DEPENDS+= bzr>=1.6:../../devel/bzr # stolen from graphics/hicolor-icon-theme .include "../../mk/bsd.fast.prefs.mk" -dirs!= ${GREP} '^@dirrm ${PYSITELIB}' ${.CURDIR}/../../devel/bzr/PLIST | \ - ${CUT} -d ' ' -f 2 | ${SED} 's,\$${PYSITELIB},,' -.for d in ${dirs} -PRINT_PLIST_AWK+= /^@dirrm ${PYSITELIB:S/\//\\\//g}${d:S/\//\\\//g}$$/ \ - { \ - sub(/${PYSITELIB:S/\//\\\//g}/, "$${PYSITELIB}"); \ - print "@comment in bzr: " $$0; next; } -.endfor -.undef dirs .if !defined(TEST_TARGET) && !empty(BZR_PLUGIN_TEST:M[Yy][Ee][Ss]) # stolen from bzr-svn diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common index 50909fbf607..defcf0cea62 100644 --- a/devel/distcc/Makefile.common +++ b/devel/distcc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2009/06/13 06:46:41 rillig Exp $ +# $NetBSD: Makefile.common,v 1.9 2009/06/14 22:57:59 joerg Exp $ # used by devel/distcc-pump/Makefile # used by devel/distccmon-gnome/Makefile # used by devel/distccmon-gtk/Makefile @@ -35,8 +35,6 @@ SUBST_MESSAGE.doc= Fixing paths. .if empty(PKGNAME:Mdistcc-[0-9]*) DEPENDS+= distcc>=${DISTCC_VERSION}:../../devel/distcc -PRINT_PLIST_AWK+= /^@dirrm share\/distcc$$/ \ - { print "@comment in distcc: " $$0; next } .endif INSTALLATION_DIRS+= bin diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index f8d7498449d..c93f1a94c21 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.162 2009/06/05 16:08:25 drochner Exp $ +# $NetBSD: Makefile,v 1.163 2009/06/14 22:57:59 joerg Exp $ # When updating glib2, please apply patch-ak to configure.in # Then run a matching version of autoconf to regen patch-aa. @@ -82,11 +82,6 @@ TOOLS_NOOP+= gtkdoc-rebase CONFIGURE_ENV+= ac_cv_func_mmap_fixed_mapped=yes .endif -# Handle directories shared with devel/glib. -PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \ - { print "@unexec $${RMDIR} %D/" $$2 \ - " 2>/dev/null || $${TRUE}"; next; } - PLIST_VARS+= fam .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1" diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk index 84ee0147ce2..c107ebe1737 100644 --- a/devel/glib2/buildlink3.mk +++ b/devel/glib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/06/14 22:57:59 joerg Exp $ BUILDLINK_TREE+= glib2 @@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0 BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.14.3 BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 -PRINT_PLIST_AWK+= /^@dirrm lib\/gio$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/gio\/modules$$/ \ - { print "@comment in glib2: " $$0; next; } - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk index 9a8dca9b0aa..aba59932467 100644 --- a/devel/gnustep-base/buildlink3.mk +++ b/devel/gnustep-base/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/04/13 12:16:24 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/06/14 22:57:59 joerg Exp $ BUILDLINK_TREE+= gnustep-base @@ -9,105 +9,6 @@ BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.18.0 BUILDLINK_ABI_DEPENDS.gnustep-base+= gnustep-base>=1.18.0 BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base -PRINT_PLIST_AWK+= /^@dirrm include\/Foundation$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/GNUstepBase$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/GNUstepBase\/unicode$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/gnustep$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/gnustep\/base$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/gnustep\/unicode$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles$$/ { print "@comment in x11/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/DTDs$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks$$/ { print "@comment in x11/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/English.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Esperanto.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/French.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/German.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Italian.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Korean.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Languages$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Africa$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Argentina$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Indiana$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Kentucky$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/North_Dakota$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Antarctica$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Arctic$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Asia$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Atlantic$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Australia$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Brazil$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Canada$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Chile$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Etc$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Europe$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Indian$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Mexico$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Mideast$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Pacific$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/US$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/SSL.bundle$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/SSL.bundle\/Resources$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Spanish.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/TraditionalChinese.lproj$$/ { print "@comment in devel/gnustep-base: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/Foundation$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/GNUstepBase$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/GNUstepBase\/unicode$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/gnustep$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/gnustep\/base$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/gnustep\/unicode$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/DTDs$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Esperanto.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/French.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/German.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Italian.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Korean.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Languages$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Africa$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Argentina$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Indiana$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/Kentucky$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/America\/North_Dakota$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Antarctica$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Arctic$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Asia$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Atlantic$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Australia$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Brazil$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Canada$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Chile$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Etc$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Europe$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Indian$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Mexico$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Mideast$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/Pacific$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/NSTimeZones\/zones\/US$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/SSL.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/SSL.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/Spanish.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-base\/Versions\/1.18\/Resources\/TraditionalChinese.lproj$$/ { next; } - .include "../../devel/gnustep-make/buildlink3.mk" .include "../../devel/gnustep-objc/buildlink3.mk" .endif # GNUSTEP_BASE_BUILDLINK3_MK diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk index efcc763b6e8..b682000ef00 100644 --- a/devel/gnustep-make/buildlink3.mk +++ b/devel/gnustep-make/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/04/19 00:50:11 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/06/14 22:57:59 joerg Exp $ BUILDLINK_TREE+= gnustep-make @@ -13,30 +13,6 @@ BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS} BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS} - -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Library$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Auxiliary$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/examples\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Library$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Additional$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Auxiliary$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Master$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/examples\/GNUstep$$/ { next; } - .endif # GNUSTEP_MAKE_BUILDLINK3_MK BUILDLINK_TREE+= -gnustep-make diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk index 94ee04bed32..970b3f9f672 100644 --- a/devel/gnustep-objc/buildlink3.mk +++ b/devel/gnustep-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/04/13 12:12:44 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/06/14 22:58:00 joerg Exp $ BUILDLINK_TREE+= gnustep-objc @@ -11,9 +11,6 @@ BUILDLINK_PKGSRCDIR.gnustep-objc?= ../../devel/gnustep-objc BUILDLINK_LDFLAGS.gnustep-objc+= -lobjc -lpthread -PRINT_PLIST_AWK+= /^@dirrm include\/objc$$/ { print "@comment in devel/gnustep-objc: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/objc$$/ { next; } - .include "../../devel/gnustep-make/buildlink3.mk" .endif # GNUSTEP_OBJC_BUILDLINK3_MK diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk index 9eaee91fdbf..ea36ab021ba 100644 --- a/devel/libFoundation/buildlink3.mk +++ b/devel/libFoundation/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/04/18 02:19:23 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:00 joerg Exp $ BUILDLINK_TREE+= libFoundation @@ -8,49 +8,6 @@ LIBFOUNDATION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libFoundation+= libFoundation>=1.1.7.168 BUILDLINK_PKGSRCDIR.libFoundation?= ../../devel/libFoundation -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/${MACHINE_ARCH}$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/${MACHINE_ARCH}\/${LOWER_OPSYS}$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/${MACHINE_ARCH}\/${LOWER_OPSYS}\/GNU$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/Foundation$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/Foundation\/exceptions$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/extensions$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/libFoundation\/extensions\/exceptions$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/CharacterSets$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/Defaults$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Africa$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Asia$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Australia$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Canada$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Europe$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/SystemV$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/US$$/ { print "@comment in devel/libFoundation: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/${MACHINE_ARCH}$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/${MACHINE_ARCH}\/${LOWER_OPSYS}$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/${MACHINE_ARCH}\/${LOWER_OPSYS}\/GNU$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/Foundation$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/Foundation\/exceptions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/extensions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/libFoundation\/extensions\/exceptions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/CharacterSets$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/Defaults$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Africa$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Asia$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Australia$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Canada$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/Europe$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/SystemV$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/${PKGNAME}\/Resources\/libFoundation\/TimeZoneInfo\/US$$/ { next; } - FOUNDATION_LIB?= fd ADDITIONAL_INCLUDE_DIRS+=-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU .if !defined(NO_FOUNDATION_ENV) diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 16bfaa77794..188791d768e 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2009/06/05 07:09:31 obache Exp $ +# $NetBSD: Makefile,v 1.62 2009/06/14 22:58:00 joerg Exp $ DISTNAME= libbonobo-2.24.1 CATEGORIES= devel gnome @@ -33,10 +33,6 @@ EGDIR= ${PREFIX}/share/examples/bonobo-activation CONF_FILES= ${EGDIR}/bonobo-activation-config.xml \ ${PKG_SYSCONFDIR}/bonobo-activation-config.xml -PRINT_PLIST_AWK+= /^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \ - { print "@unexec $${RMDIR} %D/" $$2 \ - " 2>/dev/null || $${TRUE}"; next; } - BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk index 134b5a7c9b3..ad0804dddc3 100644 --- a/devel/libbonobo/buildlink3.mk +++ b/devel/libbonobo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/06/14 22:58:00 joerg Exp $ BUILDLINK_TREE+= libbonobo @@ -12,12 +12,6 @@ BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/* BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/* -PRINT_PLIST_AWK+= /^@dirrm lib\/bonobo$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/bonobo\/(monikers|servers)$$/ \ - { print "@comment in libbonobo: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/bonobo-2.0\/samples$$/ \ - { print "@comment in libbonobo: " $$0; next; } - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk index 1737cd31796..0e631591ee4 100644 --- a/devel/libglade/buildlink3.mk +++ b/devel/libglade/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:00 joerg Exp $ BUILDLINK_TREE+= libglade @@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.libglade+= libglade>=2.3.6 BUILDLINK_ABI_DEPENDS.libglade+= libglade>=2.5.1nb4 BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade -PRINT_PLIST_AWK+= /^@dirrm lib\/libglade$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/libglade\/2.0$$/ \ - { print "@comment in libglade: " $$0; next; } - .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .endif # LIBGLADE_BUILDLINK3_MK diff --git a/devel/ruby-log4r/Makefile b/devel/ruby-log4r/Makefile index c5eb067f890..fb076de590f 100644 --- a/devel/ruby-log4r/Makefile +++ b/devel/ruby-log4r/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:17:37 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2009/06/14 22:58:00 joerg Exp $ DISTNAME= log4r-1.0.5 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -15,12 +15,9 @@ GEM_BUILD= gemspec # GENERATE_PLIST+= \ ${ECHO} "@comment The following lines are automatically generated." && \ - ( cd ${DESTDIR}${PREFIX} && \ + cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/doc \! -type d -print | \ - ${SORT} && \ - ${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/doc -type d -print | \ - ${SORT} -r | ${SED} -e "s,^,@dirrm ," && \ - ${ECHO} "@dirrm "${GEM_LIBDIR:S|${PREFIX}/||:Q} ); + ${SORT} .include "../../misc/rubygems/rubygem.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3