diff options
141 files changed, 211 insertions, 1048 deletions
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk index c6cba9012ed..168a47a0cac 100644 --- a/audio/arts/buildlink3.mk +++ b/audio/arts/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:23:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= arts @@ -9,9 +9,6 @@ BUILDLINK_API_DEPENDS.arts+= arts>=1.1.4nb1 BUILDLINK_ABI_DEPENDS.arts+= arts>=1.5.8nb1 BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts -PRINT_PLIST_AWK+= /^@dirrm include\/arts$$/ \ - { print "@comment in arts: " $$0; next; } - .include "../../audio/libaudiofile/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk index 156a1e918ee..209b50d3c54 100644 --- a/audio/audacious/buildlink3.mk +++ b/audio/audacious/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= audacious @@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.audacious+= audacious>=1.5.0 BUILDLINK_PKGSRCDIR.audacious?= ../../audio/audacious BUILDLINK_DEPMETHOD.audacious?= build -PRINT_PLIST_AWK+= /^@dirrm share\/audacious\/images$$/ \ - { print "@comment in audacious: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/audacious$$/ \ - { print "@comment in audacious: " $$0; next; } - .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk index 449fc06c94c..e967202c547 100644 --- a/audio/bmp/buildlink3.mk +++ b/audio/bmp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= bmp @@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.bmp+= bmp>=0.9.7rc2nb3 BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7nb5 BUILDLINK_PKGSRCDIR.bmp?= ../../audio/bmp -PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Input$$/ \ - { print "@comment in bmp: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Output$$/ \ - { print "@comment in bmp: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Visualization$$/ \ - { print "@comment in bmp: " $$0; next; } - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk index e80b516641e..d06bba5c28c 100644 --- a/audio/libao/buildlink3.mk +++ b/audio/libao/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= libao @@ -24,8 +24,6 @@ DEPENDS+= libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN} . endif . endif -PRINT_PLIST_AWK+= /^@dirrm lib\/ao\/plugins-2$$/ \ - { print "@comment in libao: " $$0; next } .endif # LIBAO_BUILDLINK3_MK BUILDLINK_TREE+= -libao diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 9ff90d48414..a23757daeef 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2009/06/05 22:17:08 zafer Exp $ +# $NetBSD: Makefile,v 1.54 2009/06/14 22:57:58 joerg Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -69,11 +69,7 @@ post-install: # Create PLIST fragment for Perl modules. # @cd ${PREFIX} && \ - ( \ - ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl; \ - ${FIND} lib/${PKGBASE}/perl5 -type d | ${SORT} -r | \ - ${SED} 's,^,@dirrm ,g' >> ${WRKDIR}/PLIST.perl \ - ) + ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl .endif .include "../../converters/libiconv/buildlink3.mk" diff --git a/chat/telepathy-glib/buildlink3.mk b/chat/telepathy-glib/buildlink3.mk index 92ebf04f423..79a0bb0c01c 100644 --- a/chat/telepathy-glib/buildlink3.mk +++ b/chat/telepathy-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= telepathy-glib @@ -8,9 +8,6 @@ TELEPATHY_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.telepathy-glib+= telepathy-glib>=0.7.18 BUILDLINK_PKGSRCDIR.telepathy-glib?= ../../chat/telepathy-glib -PRINT_PLIST_AWK+= /^@dirrm include\/telepathy-1.0$$/ \ - { print "@comment in telepathy-glib: " $$0; next; } - .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index c29324f0018..3afbe0ee2b7 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.39 2008/05/26 02:13:16 joerg Exp $ +# $NetBSD: cross.mk,v 1.40 2009/06/14 22:57:58 joerg Exp $ # Shared definitions for building a cross-compile environment. @@ -287,12 +287,8 @@ post-install-plist: @${SED} -e 's|$${TARGET_ARCH}|${TARGET_ARCH}|' \ -e 's|$${EGCS_INTVERSION}|${EGCS_INTVERSION}|' \ ${PLIST_PRE} >${PLIST_SRC} - @${ECHO} '@dirrm ${TARGET_ARCH}/bin' >>${PLIST_SRC} - @${ECHO} '@exec mkdir -p ${TARGET_ARCH}/include' >>${PLIST_SRC} - @${ECHO} '@dirrm ${TARGET_ARCH}/include' >>${PLIST_SRC} - @${ECHO} '@exec mkdir -p ${TARGET_ARCH}/lib' >>${PLIST_SRC} - @${ECHO} '@dirrm ${TARGET_ARCH}/lib' >>${PLIST_SRC} - @${ECHO} '@dirrm ${TARGET_ARCH}' >>${PLIST_SRC} + @${ECHO} '@pkgdir ${TARGET_ARCH}/include' >>${PLIST_SRC} + @${ECHO} '@pkgdir ${TARGET_ARCH}/lib' >>${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index d2bc43b9802..e8ac1cdc423 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/05/20 00:58:09 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2009/06/14 22:57:58 joerg Exp $ DISTNAME= freetds-0.82 PKGREVISION= 2 @@ -56,8 +56,6 @@ GENERATE_PLIST+= \ ( cd ${WRKSRC}/doc/doc/${DISTNAME} && \ ${FIND} reference userguide -type d -print && \ cd ${WRKSRC}/doc && ${FIND} images -type d -print ) | \ - ${SED} -e "s,^,@dirrm "${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT} -r && \ - ${ECHO} "@dirrm "${DOCDIR:S|${PREFIX}/||:Q}; .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk index 345806d5be1..07bae748b08 100644 --- a/databases/libgda/buildlink3.mk +++ b/databases/libgda/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/05/20 00:58:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/06/14 22:57:58 joerg Exp $ BUILDLINK_TREE+= libgda @@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.libgda+= libgda>=2.99.2 BUILDLINK_ABI_DEPENDS.libgda+= libgda>=3.0.1 BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda -PRINT_PLIST_AWK+= /^@dirrm lib\/libgda-3.0\/providers$$/ \ - { print "@comment in libgda: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/libgda-3.0$$/ \ - { print "@comment in libgda: " $$0; next; } - .include "../../mk/bsd.fast.prefs.mk" pkgbase := libgda diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile index 69e917cd892..f810be9cb0b 100644 --- a/databases/postgresql81-client/Makefile +++ b/databases/postgresql81-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2009/05/20 00:58:11 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2009/06/14 22:57:58 joerg Exp $ PKGNAME= postgresql81-client-${BASE_VERS} PKGREVISION= 1 @@ -52,11 +52,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql81-client .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor -.if !empty(PG_SUBPREFIX) -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}" -.else -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@comment empty line" -.endif # XXX work around core dumps with the native libedit USE_GNU_READLINE= yes diff --git a/databases/postgresql81-client/PLIST b/databases/postgresql81-client/PLIST index 16b94b9d9c7..17ba4671ea1 100644 --- a/databases/postgresql81-client/PLIST +++ b/databases/postgresql81-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:43:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.16 2009/06/14 22:57:58 joerg Exp $ ${PG_SUBPREFIX}bin/clusterdb ${PG_SUBPREFIX}bin/createdb ${PG_SUBPREFIX}bin/createlang @@ -1469,4 +1469,3 @@ ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/pgscripts.mo ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/psql.mo ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample ${PG_SUBPREFIX}share/postgresql/psqlrc.sample -${PG_DIRRM_SUBPREFIX} diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile index a0c1593aa13..e048b4a687e 100644 --- a/databases/postgresql82-client/Makefile +++ b/databases/postgresql82-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/05/20 00:58:11 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2009/06/14 22:57:59 joerg Exp $ PKGNAME= postgresql82-client-${BASE_VERS} PKGREVISION= 1 @@ -54,11 +54,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql82-client .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor -.if !empty(PG_SUBPREFIX) -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}" -.else -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@comment empty line" -.endif # XXX work around core dumps with the native libedit USE_GNU_READLINE= yes diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST index b96bf832257..47780c3bbb1 100644 --- a/databases/postgresql82-client/PLIST +++ b/databases/postgresql82-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:43:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2009/06/14 22:57:59 joerg Exp $ ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo @@ -1546,4 +1546,3 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/xplang.html ${PG_SUBPREFIX}share/doc/postgresql/html/xtypes.html ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample ${PG_SUBPREFIX}share/postgresql/psqlrc.sample -${PG_DIRRM_SUBPREFIX} diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index 900bfb30a43..dd47f6e8e40 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/05/20 00:58:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2009/06/14 22:57:59 joerg Exp $ PKGNAME= postgresql83-client-${BASE_VERS} PKGREVISION= 1 @@ -51,11 +51,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql83-client .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor -.if !empty(PG_SUBPREFIX) -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}" -.else -PLIST_SUBST+= PG_DIRRM_SUBPREFIX="@comment empty line" -.endif # XXX work around core dumps with the native libedit USE_GNU_READLINE= yes diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST index 42fd4584729..bc8a115f83c 100644 --- a/databases/postgresql83-client/PLIST +++ b/databases/postgresql83-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:43:22 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/06/14 22:57:59 joerg Exp $ ${PG_SUBPREFIX}bin/clusterdb ${PG_SUBPREFIX}bin/createdb ${PG_SUBPREFIX}bin/createlang @@ -1752,4 +1752,3 @@ ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pgscripts.mo ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/psql.mo ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample ${PG_SUBPREFIX}share/postgresql/psqlrc.sample -${PG_DIRRM_SUBPREFIX} diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index c698404d026..168d5c9303c 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2009/02/23 09:05:02 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2009/06/14 22:57:59 joerg Exp $ # DISTNAME= shared-mime-info-0.60 @@ -30,8 +30,6 @@ FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database" PRINT_PLIST_AWK+= /^share\/mime\/packages/ { print; next; } PRINT_PLIST_AWK+= /^share\/mime/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/mime\/packages$$/ { print; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/mime/ { next; } .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk index 3d23e1a1cb1..09e99a478fe 100644 --- a/databases/shared-mime-info/mimedb.mk +++ b/databases/shared-mime-info/mimedb.mk @@ -1,4 +1,4 @@ -# $NetBSD: mimedb.mk,v 1.5 2006/06/15 22:13:58 jlam Exp $ +# $NetBSD: mimedb.mk,v 1.6 2009/06/14 22:57:59 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # mime customization files. It takes care of registering them in the global @@ -18,11 +18,6 @@ FILES_SUBST+= UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mi PRINT_PLIST_AWK+= /^share\/mime\/packages/ { print; next; } PRINT_PLIST_AWK+= /^share\/mime\// { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/mime\/packages$$/ \ - { print "@comment in shared-mime-info: " $$0; \ - next; } -PRINT_PLIST_AWK+= /^@dirrm share\/mime\// { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/mime$$/ { next; } .include "../../databases/shared-mime-info/buildlink3.mk" 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" diff --git a/doc/guide/Makefile b/doc/guide/Makefile index a049b401e5a..7b7189be687 100644 --- a/doc/guide/Makefile +++ b/doc/guide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2009/04/08 22:43:23 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2009/06/14 22:58:00 joerg Exp $ # DISTNAME= pkgsrc-guide-${PKGVERSION} @@ -73,9 +73,6 @@ post-install: ${FIND} ${DOCDIR} \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \ >> ${PLIST_SRC} - ${FIND} ${DOCDIR} -type d -print \ - | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \ - >> ${PLIST_SRC} # install the single-file HTML and ascii output into the pkgsrc doc/ # directory, for distribution with pkgsrc. diff --git a/emulators/compat_netbsd/gencompat.sh b/emulators/compat_netbsd/gencompat.sh index 3fea3713d01..080f0a18de0 100755 --- a/emulators/compat_netbsd/gencompat.sh +++ b/emulators/compat_netbsd/gencompat.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: gencompat.sh,v 1.1 2007/12/31 19:52:19 jlam Exp $ +# $NetBSD: gencompat.sh,v 1.2 2009/06/14 22:58:00 joerg Exp $ # # This script generates the distfiles and PLISTs for the NetBSD compat* # packages. @@ -94,30 +94,16 @@ for arch in $archlist; do [ -d $compat_extras_pkgdir ] || mkdir -p $compat_extras_pkgdir # Generate PLISTs and distfiles. - ( echo '@comment $NetBSD: gencompat.sh,v 1.1 2007/12/31 19:52:19 jlam Exp $' + ( echo '@comment $NetBSD: gencompat.sh,v 1.2 2009/06/14 22:58:00 joerg Exp $' find $compat_dir \! -type d | sort | sed 's,'$compat_dir'/,${EMULSUBDIRSLASH},' - find $compat_dir -type d | sort -r | - sed 's,'$compat_dir'/,@dirrm ${EMULSUBDIRSLASH},' | - while read d; do - case $d in - [@$]*) echo $d ;; - esac - done ) > $compat_pkgdir/PLIST.$arch tar cf $compat_pkgdir/$compat_dir.tar $compat_dir bzip2 -9 $compat_pkgdir/$compat_dir.tar - ( echo '@comment $NetBSD: gencompat.sh,v 1.1 2007/12/31 19:52:19 jlam Exp $' + ( echo '@comment $NetBSD: gencompat.sh,v 1.2 2009/06/14 22:58:00 joerg Exp $' find $compat_extras_dir \! -type d | sort | sed 's,'$compat_extras_dir'/,${EMULSUBDIRSLASH},' - find $compat_extras_dir -type d | sort -r | - sed 's,'$compat_extras_dir'/,@dirrm ${EMULSUBDIRSLASH},' | - while read d; do - case $d in - [@$]*) echo $d ;; - esac - done ) > $compat_extras_pkgdir/PLIST.$arch tar cf $compat_extras_pkgdir/$compat_extras_dir.tar $compat_extras_dir bzip2 -9 $compat_extras_pkgdir/$compat_extras_dir.tar diff --git a/fonts/adobe-cidfonts/Makefile b/fonts/adobe-cidfonts/Makefile index 8e03e70f339..2c5b03c7e4d 100644 --- a/fonts/adobe-cidfonts/Makefile +++ b/fonts/adobe-cidfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2009/06/14 22:58:00 joerg Exp $ DISTNAME= adobe-cidfonts-20000901 CATEGORIES= fonts @@ -38,9 +38,7 @@ RESOURCEDIR= ${PREFIX}/${RESOURCESUBDIR} GENERATE_PLIST= \ for f in ${DISTFILES:O:u}; do \ ${ECHO} ${RESOURCESUBDIR}/CIDFont/$$f; \ - done; \ - ${ECHO} "@dirrm ${RESOURCESUBDIR}/CIDFont"; \ - ${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCESUBDIR} 2>/dev/null || ${TRUE}"; + done do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CIDFont diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index a46fef2e02a..f4d5a4e557b 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/01/12 19:22:18 adam Exp $ +# $NetBSD: Makefile,v 1.39 2009/06/14 22:58:00 joerg Exp $ DISTNAME= rocksndiamonds-3.2.6.0 CATEGORIES= games x11 @@ -74,7 +74,6 @@ do-install: find "$${d}" -type d -print | { while read subdir; do \ ${INSTALL_DATA_DIR} \ ${DESTDIR}${SHAREDIR}/"$${subdir}"; \ - ${ECHO} "@dirrm ${SHARESUBDIR}/$${subdir}"; \ done ; } | sort -r >> ${WRKDIR}/PLIST.D; \ find "$${d}" -type f -print | while read f; do \ ${INSTALL_DATA} "$${f}" \ diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index 629a9fb4ddf..b4d1886d2dc 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:15 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2009/06/14 22:58:01 joerg Exp $ DISTNAME= Rollemup PKGNAME= rollemup-1.0 @@ -54,11 +54,6 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/README.Rollemup \ ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; \ - ${FIND} ${GAMES_DIR}/Rollemup -type f -print >> ${PLIST_SRC}; \ - for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | ${SORT} -r`; do \ - ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \ - done) ${CHOWN} -R ${ROOT_USER}:${GAMEGRP} \ ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup ${CHMOD} ${GAMEDIRMODE} ${DESTDIR}${PREFIX}/${GAMES_DIR}/Rollemup/Games diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk index f0656367dd3..262dbfda66c 100644 --- a/graphics/clutter/buildlink3.mk +++ b/graphics/clutter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/06/14 22:58:01 joerg Exp $ # BUILDLINK_TREE+= clutter @@ -9,9 +9,6 @@ CLUTTER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clutter+= clutter>=0.8.0 BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter -PRINT_PLIST_AWK+= /^@dirrm include\/clutter-0.8$$/ \ - { print "@comment in clutter: " $$0; next; } - pkgbase := clutter .include "../../mk/pkg-build-options.mk" diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index c4b226cbc62..21d7bc44aba 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:01 joerg Exp $ BUILDLINK_TREE+= gnome-icon-theme @@ -13,16 +13,6 @@ BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme # of packages that use gnome-icon-theme and are executed during build. # USE_TOOLS+= perl - -. include "../../mk/bsd.fast.prefs.mk" - -dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/gnome-icon-theme/PLIST | \ - ${CUT} -d ' ' -f 2 -. for d in ${dirs} -PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ - { print "@comment in gnome-icon-theme: " $$0; next; } -. endfor -. undef dirs .endif # GNOME_ICON_THEME_BUILDLINK3_MK BUILDLINK_TREE+= -gnome-icon-theme diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index f3cb9c2ad92..1b75b95a550 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/05/16 07:22:03 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/06/14 22:58:01 joerg Exp $ BUILDLINK_TREE+= hicolor-icon-theme @@ -11,15 +11,6 @@ BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme .include "../../mk/bsd.fast.prefs.mk" -dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/hicolor-icon-theme/PLIST | \ - ${CUT} -d ' ' -f 2 -. for d in ${dirs} -PRINT_PLIST_AWK+= /^@exec ..MKDIR. %D\/${d:S/\//\\\//g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ - { print "@comment in hicolor-icon-theme: " $$0; next; } -. endfor -. undef dirs - .if !defined(HICOLOR_ICON_THEME_DEPEND_ONLY) EVAL_PREFIX+= PREFIX.gtk2=gtk2+ FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache" diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk index 0776645219c..f4bb3e05ec1 100644 --- a/graphics/libkipi/buildlink3.mk +++ b/graphics/libkipi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:01 joerg Exp $ BUILDLINK_TREE+= libkipi @@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1.5 BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.5nb5 BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi -. for dir in share/kde/apps/kipi/data share/kde/apps/kipi -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in libkipi: " $$0; next; } -. endfor - .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 29de2bfd991..1eabff58ff1 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.160 2009/06/09 12:12:00 abs Exp $ +# $NetBSD: Makefile,v 1.161 2009/06/14 22:58:01 joerg Exp $ DISTNAME= netpbm-10.34 PKGREVISION= 1 @@ -91,11 +91,6 @@ post-install: ${MV} misc share/netpbm && \ ${CHOWN} -R ${BINOWN}:${BINGRP} . && \ ${FIND} * \! -type d -print | ${SORT} >${PLIST_SRC} && \ - ${FIND} * -type d -print | \ - while read DIR; do \ - ${TEST} -d "${DESTDIR}${PREFIX}/$${DIR}" || \ - ${ECHO} "@dirrm $${DIR}"; \ - done >>${PLIST_SRC} && \ pax -rwpppm . ${DESTDIR}${PREFIX} ${RM} -fr ${STAGEDIR} ${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print | \ 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 diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk index eeffdfe0672..d39d82910ad 100644 --- a/mail/evolution-data-server/buildlink3.mk +++ b/mail/evolution-data-server/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:24:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2009/06/14 22:58:04 joerg Exp $ BUILDLINK_TREE+= evolution-data-server @@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.8.0 BUILDLINK_ABI_DEPENDS.evolution-data-server?= evolution-data-server>=2.22.3nb1 BUILDLINK_PKGSRCDIR.evolution-data-server?= ../../mail/evolution-data-server -PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/extensions$$/ \ - { print "@comment in evolution-data-server: " $$0; next } -PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/camel-providers$$/ \ - { print "@comment in evolution-data-server: " $$0; next } -PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \ - { print "@comment in evolution-data-server: " $$0; next } - .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk index a56580e4f0f..52830961023 100644 --- a/mail/evolution/buildlink3.mk +++ b/mail/evolution/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/06/14 22:58:04 joerg Exp $ BUILDLINK_TREE+= evolution @@ -9,15 +9,6 @@ BUILDLINK_API_DEPENDS.evolution+= evolution>=2.8.0 BUILDLINK_ABI_DEPENDS.evolution?= evolution>=2.22.3.1nb1 BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution -PRINT_PLIST_AWK+= /^@dirrm lib\/evolution\/2.10$$/ \ - { print "@comment in evolution: " $$0; next } -PRINT_PLIST_AWK+= /^@dirrm lib\/evolution$$/ \ - { print "@comment in evolution: " $$0; next } -PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution\/2.10$$/ \ - { print "@comment in evolution: " $$0; next } -PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution$$/ \ - { print "@comment in evolution: " $$0; next } - .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index eb359500992..5bcbc2a1f41 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/03/04 17:57:18 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:04 joerg Exp $ # DISTNAME= MailScanner-4.30.3-2 @@ -140,10 +140,5 @@ post-install: | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g" \ >> ${PLIST_SRC} .endfor -.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR} - ${FIND} ${DESTDIR}${_dir_} -type d -print \ - | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g" \ - >> ${PLIST_SRC} -.endfor .include "../../mk/bsd.pkg.mk" diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 1811be42bba..ea513c19ebe 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:22 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2009/06/14 22:58:04 joerg Exp $ DISTNAME= Mail-SpamAssassin-3.2.5 PKGNAME= spamassassin-3.2.5 @@ -166,9 +166,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} - set -e ; { for d in ${SA_INSTALLDIRS}; do \ - ${ECHO} "@dirrm $$d"; \ - done; } | ${SORT} -r >> ${PLIST_ADD}; # make sure we install the patched version of init.pre but can run the # tests with the original file diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension index 7007e5935a6..2d9743c2786 100644 --- a/math/R/Makefile.extension +++ b/math/R/Makefile.extension @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.extension,v 1.12 2008/10/13 11:08:31 markd Exp $ +# $NetBSD: Makefile.extension,v 1.13 2009/06/14 22:58:04 joerg Exp $ # # This Makefile fragment is included by packages for R library packages. # @@ -31,13 +31,8 @@ R_INST_DIRS?= ${R_PKGNAME} R_HOMEPAGE_BASE= http://cran.r-project.org/web/packages R_PKG_INSTALL_ARGS= -l ${DESTDIR}${PREFIX}/${R_LIB} -R_PACKLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ +GENERATE_PLIST+= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u -R_PACKLIST_DIRS_CMD= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ - ${FIND} ${R_LIB}/$${dir} -type d -print; done ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |" -R_GENERATE_PLIST= ${R_PACKLIST_FILES_CMD}; \ - ${R_PACKLIST_DIRS_CMD}; -GENERATE_PLIST+= ${R_GENERATE_PLIST} INSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl DEINSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl diff --git a/math/scilab/files/update_plist b/math/scilab/files/update_plist index 6ad6218ff8a..6f8daab8b30 100755 --- a/math/scilab/files/update_plist +++ b/math/scilab/files/update_plist @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: update_plist,v 1.1 2007/03/23 22:08:56 dmcmahill Exp $ +# $NetBSD: update_plist,v 1.2 2009/06/14 22:58:04 joerg Exp $ # # The scilab install uses tar which preserves times and makes @@ -13,9 +13,3 @@ grep "^bin" PLIST >> plist.new find /usr/pkg/lib/scilab-4.1 -type f -print | sort | sed 's;/usr/pkg/lib/scilab-4.1;lib/${PKGNAME};g' >> plist.new find /usr/pkg/share/doc/scilab-4.1 -type f -print | sort | sed 's;/usr/pkg/share/doc/scilab-4.1;share/doc/${PKGNAME};g' >> plist.new - -find /usr/pkg/lib/scilab-4.1 -type d -print | sort -r | sed 's;/usr/pkg/lib/scilab-4.1;@dirrm lib/${PKGNAME};g' >> plist.new -echo '@dirrm lib/${PKGNAME}' >> plist.new - -find /usr/pkg/share/doc/scilab-4.1 -type d -print | sort -r | sed 's;/usr/pkg/share/doc/scilab-4.1;@dirrm share/doc/${PKGNAME};g' >> plist.new -echo '@dirrm share/doc/${PKGNAME}' >> plist.new diff --git a/misc/gnome1-dirs/dirs.mk b/misc/gnome1-dirs/dirs.mk index 0306076fee6..b05001a5e8b 100644 --- a/misc/gnome1-dirs/dirs.mk +++ b/misc/gnome1-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $ +# $NetBSD: dirs.mk,v 1.5 2009/06/14 22:58:04 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -14,12 +14,6 @@ GNOME1_DIRS= # none yet .if defined(_USE_GNOME1_DIRS) && !empty(_USE_GNOME1_DIRS) DEPENDS+= gnome1-dirs>=${_USE_GNOME1_DIRS}:../../misc/gnome1-dirs - -. for dir in ${GNOME_DIRS} ${GNOME1_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in gnome1-dirs: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_GNOME1_MK) diff --git a/misc/gnome2-dirs/dirs.mk b/misc/gnome2-dirs/dirs.mk index 3c6657bbfc0..c8fb5606bbb 100644 --- a/misc/gnome2-dirs/dirs.mk +++ b/misc/gnome2-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.5 2006/03/30 21:14:32 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.6 2009/06/14 22:58:04 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -20,12 +20,6 @@ GNOME2_DIRS+= share/gnome/wm-properties .if defined(_USE_GNOME2_DIRS) && !empty(_USE_GNOME2_DIRS) DEPENDS+= gnome2-dirs>=${_USE_GNOME2_DIRS}:../../misc/gnome2-dirs - -. for dir in ${GNOME_DIRS} ${GNOME2_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in gnome2-dirs: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_GNOME2_MK) diff --git a/misc/kde3-dirs/dirs.mk b/misc/kde3-dirs/dirs.mk index f73cf3321d8..d9623c51419 100644 --- a/misc/kde3-dirs/dirs.mk +++ b/misc/kde3-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.1.1.1 2007/01/26 02:30:13 markd Exp $ +# $NetBSD: dirs.mk,v 1.2 2009/06/14 22:58:04 joerg Exp $ # .if !defined(DIRS_KDE3_MK) @@ -142,12 +142,6 @@ KDE3_DIRS+= share/kde/wallpapers .if defined(_USE_KDE3_DIRS) && !empty(_USE_KDE3_DIRS) DEPENDS+= kde3-dirs>=${_USE_KDE3_DIRS}:../../misc/kde3-dirs - -. for dir in ${KDE3_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in kde: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_KDE3_MK) diff --git a/misc/kde4-dirs/dirs.mk b/misc/kde4-dirs/dirs.mk index a86446e42a0..f1fc908d98f 100644 --- a/misc/kde4-dirs/dirs.mk +++ b/misc/kde4-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.3 2008/11/06 11:01:21 markd Exp $ +# $NetBSD: dirs.mk,v 1.4 2009/06/14 22:58:05 joerg Exp $ # .if !defined(DIRS_KDE4_MK) @@ -111,12 +111,6 @@ KDE4_DIRS+= share/kde4/servicetypes .if defined(_USE_KDE4_DIRS) && !empty(_USE_KDE4_DIRS) DEPENDS+= kde4-dirs>=${_USE_KDE4_DIRS}:../../misc/kde4-dirs - -. for dir in ${KDE4_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in kde: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_KDE4_MK) diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 768e0d34103..59438cbe710 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2009/04/16 21:42:43 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2009/06/14 22:58:05 joerg Exp $ # OO_VER= 2.4.2 @@ -177,9 +177,7 @@ do-install: post-install: cd ${DESTDIR}${PREFIX} && \ find lib/${OO_RELEASE} \! -type d -print | \ - sort > ${WRKDIR}/PLIST && \ - find lib/${OO_RELEASE} -type d -print | sort -r | \ - awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST + sort > ${WRKDIR}/PLIST # OS specific Makefile .if exists(Makefile.${OPSYS}) diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 959c69e2750..49406c867c6 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2009/05/10 03:41:22 hira Exp $ +# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:05 joerg Exp $ # OO_VER= 3.1.0 @@ -185,9 +185,7 @@ do-install: post-install: cd ${DESTDIR}${PREFIX} && \ find lib/${OO_RELEASE} \! -type d -print | \ - sort > ${WRKDIR}/PLIST && \ - find lib/${OO_RELEASE} -type d -print | sort -r | \ - awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST + sort > ${WRKDIR}/PLIST # OS specific Makefile .if exists(Makefile.${OPSYS}) diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile index 5f7913cf07f..bf8c6c73299 100644 --- a/misc/rubygems/Makefile +++ b/misc/rubygems/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2009/06/12 23:02:57 minskim Exp $ +# $NetBSD: Makefile,v 1.26 2009/06/14 22:58:05 joerg Exp $ DISTNAME= rubygems-1.3.4 PKGREVISION= 1 @@ -41,11 +41,9 @@ SUBST_MESSAGE.conf= Fixing configuration files. # Generate a dynamic PLIST for the rubygems documentation directory. GENERATE_PLIST+= \ ${ECHO} "@comment The following lines are automatically generated." && \ - ( cd ${DESTDIR}${PREFIX} && \ + cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \ - ${SORT} && \ - ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} -type d -print | \ - ${SORT} -r | ${SED} -e "s,^,@dirrm ," ); + ${SORT} .include "../../lang/ruby/modules.mk" diff --git a/misc/theme-dirs/dirs.mk b/misc/theme-dirs/dirs.mk index 0868626daef..5a717ced16d 100644 --- a/misc/theme-dirs/dirs.mk +++ b/misc/theme-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:40 rillig Exp $ +# $NetBSD: dirs.mk,v 1.6 2009/06/14 22:58:05 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -37,12 +37,6 @@ THEME_DIRS+= share/themes/Traditional .if defined(_USE_THEME_DIRS) && !empty(_USE_THEME_DIRS) DEPENDS+= theme-dirs>=${_USE_THEME_DIRS}:../../misc/theme-dirs - -. for dir in ${THEME_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in theme-dirs: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_THEME_MK) diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk index 84448b2f73d..f822c4c073d 100644 --- a/misc/xdg-dirs/dirs.mk +++ b/misc/xdg-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.7 2006/09/08 16:27:34 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.8 2009/06/14 22:58:05 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -20,12 +20,6 @@ XDG_DIRS+= share/themes .if defined(_USE_XDG_DIRS) && !empty(_USE_XDG_DIRS) DEPENDS+= xdg-dirs>=${_USE_XDG_DIRS}:../../misc/xdg-dirs - -. for dir in ${XDG_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in xdg-dirs: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_XDG_MK) diff --git a/misc/xdg-x11-dirs/dirs.mk b/misc/xdg-x11-dirs/dirs.mk index 2cb79162c8f..4f3054466b4 100644 --- a/misc/xdg-x11-dirs/dirs.mk +++ b/misc/xdg-x11-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.7 2006/09/08 16:27:34 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.8 2009/06/14 22:58:05 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -22,9 +22,7 @@ XDG_X11_DIRS+= share/themes DEPENDS+= xdg-x11-dirs>=${_USE_XDG_X11_DIRS}:../../misc/xdg-x11-dirs . for dir in ${XDG_X11_DIRS} -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ - { print "@comment in xdg-x11-dirs: " $$0; next; } +PRINT_PLIST_AWK+= /^@pkgdir ${dir:S|/|\\/|g}$$/ { next; } . endfor .endif diff --git a/mk/alternatives.mk b/mk/alternatives.mk index 0f8213c4adb..47c1b05a258 100644 --- a/mk/alternatives.mk +++ b/mk/alternatives.mk @@ -1,4 +1,4 @@ -# $NetBSD: alternatives.mk,v 1.10 2007/09/29 15:56:04 rillig Exp $ +# $NetBSD: alternatives.mk,v 1.11 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment handles the alternatives system, registering a # package in the database. @@ -61,7 +61,6 @@ ${WRKDIR}/.altdeinstall: ${ALTERNATIVES_SRC} } >${WRKDIR}/.altdeinstall PRINT_PLIST_AWK+= /^libdata\/alternatives\// { next; } -PRINT_PLIST_AWK+= /^@dirrm libdata\/alternatives/ { next; } EVAL_PREFIX+= PREFIX.pkg_alternatives=pkg_alternatives PREFIX.alternatives_DEFAULT= ${LOCALBASE} diff --git a/mk/java-env.mk b/mk/java-env.mk index b752d81e180..b23fa9ff129 100644 --- a/mk/java-env.mk +++ b/mk/java-env.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-env.mk,v 1.11 2007/11/09 00:49:54 joerg Exp $ +# $NetBSD: java-env.mk,v 1.12 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment handles Java wrappers and is meant to be included # by packages that provide a Java build-time and/or run-time environment. @@ -92,7 +92,6 @@ install-java-wrapper-${w}: # Handle the ${PREFIX}/java shared directory automatically. REQD_DIRS+= ${PREFIX}/java -PRINT_PLIST_AWK+= /^@dirrm java$$/ { next; } PLIST_SUBST+= JAVA_HOME=${JAVA_HOME:Q} FILES_SUBST+= JAVA_HOME=${JAVA_HOME:Q} diff --git a/mk/omf-scrollkeeper.mk b/mk/omf-scrollkeeper.mk index e1d7c9a19ae..2248c2eb681 100644 --- a/mk/omf-scrollkeeper.mk +++ b/mk/omf-scrollkeeper.mk @@ -1,4 +1,4 @@ -# $NetBSD: omf-scrollkeeper.mk,v 1.1 2007/11/12 20:45:52 drochner Exp $ +# $NetBSD: omf-scrollkeeper.mk,v 1.2 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # OMF files. It redirects callers to compatibility scripts provided @@ -31,10 +31,6 @@ FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q} FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q} FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q} -PRINT_PLIST_AWK+= /^@dirrm share\/omf$$/ \ - { print "@comment in rarian: " $$0; \ - next; } - .include "../../textproc/rarian/buildlink3.mk" .endif # SCROLLKEEPER_OMF_MK diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk index 1f4d943af47..237f194f32a 100644 --- a/mk/plist/plist-info.awk +++ b/mk/plist/plist-info.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-info.awk,v 1.15 2006/06/01 07:11:09 rillig Exp $ +# $NetBSD: plist-info.awk,v 1.16 2009/06/14 22:58:05 joerg Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -78,9 +78,6 @@ BEGIN { sub("^" PKGINFODIR "/", "info/") } ($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \ -($0 ~ "^@dirrm " PKGINFODIR "$") { - sub(PKGINFODIR "$", "info") -} ### ### Canonicalize info page entries by stripping any ".gz" suffixes. diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk index f3caba80947..a9ef60bd190 100644 --- a/mk/plist/plist-man.awk +++ b/mk/plist/plist-man.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-man.awk,v 1.5 2006/02/07 18:43:02 jlam Exp $ +# $NetBSD: plist-man.awk,v 1.6 2009/06/14 22:58:05 joerg Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -142,6 +142,3 @@ BEGIN { /^man\/([^\/]*\/)?(man[1-9ln]\/[^\/]*\.[1-9ln]|cat[1-9ln]\/[^\/]*\.[0-9])/ { sub("^man/", PKGMANDIR "/") } -/^@dirrm man\/([^\/]*\/)?(man[1-9ln]|cat[1-9ln])/ { - sub("^@dirrm man/", "@dirrm " PKGMANDIR "/") -} diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk index daa241bac45..491c0efeeb1 100644 --- a/multimedia/gstreamer0.10/buildlink3.mk +++ b/multimedia/gstreamer0.10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:06 joerg Exp $ BUILDLINK_TREE+= gstreamer0.10 @@ -9,9 +9,6 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.1 BUILDLINK_ABI_DEPENDS.gstreamer0.10?= gstreamer0.10>=0.10.2nb1 BUILDLINK_PKGSRCDIR.gstreamer0.10?= ../../multimedia/gstreamer0.10 -PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \ - { print "@comment in gstreamer0.10: " $$0; next; } - pkgbase := gstreamer0.10 .include "../../mk/pkg-build-options.mk" diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 69d925a6e04..673ed86a5c1 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2009/06/03 12:40:32 obache Exp $ +# $NetBSD: Makefile,v 1.70 2009/06/14 22:58:06 joerg Exp $ # DISTNAME= ORBit2-2.14.17 @@ -44,10 +44,6 @@ PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in CPPFLAGS.Darwin+= -DBIND_8_COMPAT -PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ - { print "@unexec $${RMDIR} %D/" $$2 \ - " 2>/dev/null || $${TRUE}"; next; } - # Workaround for Upstream Bug#562310. # for more detail, see also PR#41475. TOOLS_NOOP+= gtkdoc-rebase diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk index eaaaa99c9af..9ad8b7a150e 100644 --- a/net/ORBit2/buildlink3.mk +++ b/net/ORBit2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:07 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/06/14 22:58:06 joerg Exp $ BUILDLINK_TREE+= ORBit2 @@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.ORBit2+= ORBit2>=2.12.0 BUILDLINK_ABI_DEPENDS.ORBit2?= ORBit2>=2.12.4nb1 BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2 -PRINT_PLIST_AWK+= /^@dirrm lib\/orbit-2.0$$/ \ - { print "@comment in ORBit2: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ - { print "@comment in ORBit2: " $$0; next; } - .include "../../devel/glib2/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .endif # ORBIT2_BUILDLINK3_MK diff --git a/net/bind9/Makefile b/net/bind9/Makefile index eb8f95c30ca..93dfa98b800 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.106 2009/03/23 14:43:13 tron Exp $ +# $NetBSD: Makefile,v 1.107 2009/06/14 22:58:06 joerg Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P2/pl2/} @@ -71,11 +71,7 @@ post-install: ${CHMOD} -x ${DESTDIR}${PREFIX}/share/doc/bind9/arm/Bv9ARM.pdf ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/bind9 -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/bind9 -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} include/bind -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} include/bind -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/pthread.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/bind95/Makefile b/net/bind95/Makefile index 6e767e8a865..bbc3271e859 100644 --- a/net/bind95/Makefile +++ b/net/bind95/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/03/23 14:43:13 tron Exp $ +# $NetBSD: Makefile,v 1.9 2009/06/14 22:58:06 joerg Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P2/pl2/} @@ -71,11 +71,7 @@ post-install: ${CHMOD} -x ${DESTDIR}${PREFIX}/share/doc/bind9/arm/Bv9ARM.pdf ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/bind9 -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/bind9 -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} include/bind -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} include/bind -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/pthread.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile index 264b1084537..d56184a92f7 100644 --- a/net/mldonkey-gui/Makefile +++ b/net/mldonkey-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2009/02/16 13:11:41 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2009/06/14 22:58:06 joerg Exp $ # .include "../../net/mldonkey/Makefile.common" @@ -10,9 +10,6 @@ DEPENDS+= mldonkey-[0-9]*:../../net/mldonkey USE_TOOLS+= pkg-config -PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \ - { print "@comment in mldonkey: " $$0; next } - INSTALLATION_DIRS= bin .include "options.mk" diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common index 55a70b0a2e5..0daddca3bfc 100644 --- a/net/mldonkey/Makefile.common +++ b/net/mldonkey/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2009/02/25 23:39:36 wiz Exp $ +# $NetBSD: Makefile.common,v 1.37 2009/06/14 22:58:06 joerg Exp $ # # used by net/mldonkey/Makefile # used by net/mldonkey-gui/Makefile @@ -30,10 +30,6 @@ CONFIGURE_ARGS+= --enable-pthread-lib UNLIMIT_RESOURCES= stacksize -PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \ - { print "@unexec $${RMDIR} %D/libexec/mldonkey"\ - " >/dev/null 2>&1 || $${TRUE}"; next } - # needs 3.10.1 or newer to work correctly on NetBSD/amd64 BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10.1 diff --git a/net/mrt/Makefile b/net/mrt/Makefile index bf8bdb3dea2..50107d0def6 100644 --- a/net/mrt/Makefile +++ b/net/mrt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/08/12 14:39:12 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:07 joerg Exp $ # DISTNAME= mrt-2.2.2a-Aug11 @@ -28,7 +28,5 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/mrt (cd ${DESTDIR}${PREFIX}; ${FIND} share/examples/mrt -type f -print \ >> ${PLIST_SRC}) - (cd ${DESTDIR}${PREFIX}; ${FIND} share/examples/mrt -type d -print | \ - ${SORT} -r | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) .include "../../mk/bsd.pkg.mk" diff --git a/net/netcat/Makefile b/net/netcat/Makefile index 5df022e7d7f..47ed7715a62 100644 --- a/net/netcat/Makefile +++ b/net/netcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/06/12 22:17:28 zafer Exp $ +# $NetBSD: Makefile,v 1.34 2009/06/14 22:58:07 joerg Exp $ DISTNAME= nc110 PKGNAME= netcat-1.10 @@ -54,7 +54,6 @@ do-install: ${INSTALL_DATA} $$i ${DESTDIR:Q}${PREFIX:Q}/${EXAMPLE_DIR}; \ ${ECHO} ${EXAMPLE_DIR}/$$i >> PLIST.data; \ done; \ - ${ECHO} "@dirrm ${EXAMPLE_DIR}" >> PLIST.data; \ ) ${INSTALL_MAN} ${FILESDIR}/nc.1 \ ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/nc.1 diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile index 94fbd5b80aa..565040d8689 100644 --- a/net/py-twisted-docs/Makefile +++ b/net/py-twisted-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/08/22 21:49:08 epg Exp $ +# $NetBSD: Makefile,v 1.10 2009/06/14 22:58:07 joerg Exp $ PKGNAME= py-twisted-docs-${TWISTED_VERSION} COMMENT= Framework for writing networked applications @@ -17,7 +17,5 @@ INSTALLATION_DIRS= ${HTMLDIR} do-install: cd ${DOC_SRCDIR} && pax -rw -pe * ${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/net/quagga-devel/Makefile b/net/quagga-devel/Makefile index 0404294130f..2777f545648 100644 --- a/net/quagga-devel/Makefile +++ b/net/quagga-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/05/20 00:58:25 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2009/06/14 22:58:07 joerg Exp $ # DISTNAME= quagga-0.99.12 @@ -60,7 +60,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/mpls/* ${PREFIX}/share/doc/quagga/mpls ${CAT} ${PLIST_CAT} > ${PLIST_SRC} (cd ${PREFIX}; ${FIND} share/doc/quagga -type f -print ) >> ${PLIST_SRC} - (cd ${PREFIX}; ${FIND} share/doc/quagga -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/net/quagga/Makefile b/net/quagga/Makefile index a7a0b9c8b4d..834f59eb281 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2009/05/20 00:58:25 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:07 joerg Exp $ # DISTNAME= quagga-0.98.6 @@ -60,7 +60,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/mpls/* ${PREFIX}/share/doc/quagga/mpls ${CAT} ${PLIST_CAT} > ${PLIST_SRC} (cd ${PREFIX}; ${FIND} share/doc/quagga -type f -print ) >> ${PLIST_SRC} - (cd ${PREFIX}; ${FIND} share/doc/quagga -type d -print ) | \ - ${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/net/teamspeak-client/Makefile b/net/teamspeak-client/Makefile index c5f775a7d3c..bfdd27b0f28 100644 --- a/net/teamspeak-client/Makefile +++ b/net/teamspeak-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:28 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2009/06/14 22:58:07 joerg Exp $ PKGNAME= teamspeak-client-2.0.32.60 DISTNAME= ts2_client_rc2_2032 @@ -43,7 +43,6 @@ do-install: ${INSTALL_DATA} -m 644 ${WRKSRC}/manual/* ${DESTDIR}${DOC_DIR} ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} lib/teamspeak-client share/doc/teamspeak-client -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} lib/teamspeak-client share/doc/teamspeak-client -type d -print ) | ${SED} 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile index d55684994b3..d61daa0d884 100644 --- a/net/teamspeak-server/Makefile +++ b/net/teamspeak-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:28 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2009/06/14 22:58:07 joerg Exp $ PKGNAME= teamspeak-server-2.0.24.01 DISTNAME= ts2_server_rc2_202319 @@ -83,6 +83,5 @@ do-install: ${INSTALL_DATA} -m 644 ${WRKSRC}/INSTALL.mysql ${DESTDIR}${DOC_DIR} ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} (cd ${DESTDIR}${PREFIX}; ${FIND} lib/teamspeak-server share/doc/teamspeak-server share/teamspeak-server -type f -print ) >> ${PLIST_SRC} - (cd ${DESTDIR}${PREFIX}; ${FIND} lib/teamspeak-server share/doc/teamspeak-server share/teamspeak-server -type d -print ) | ${SED} 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index e46263542c6..5e8929f3da9 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2009/06/14 22:58:07 joerg Exp $ # DISTNAME= xipdump-1.5.4 @@ -24,9 +24,6 @@ post-build: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @(cd ${WRKSRC}/data; ${FIND} pkc pkt ! -type d -print | \ ${SED} -e 's|^|share/xipdump/|' >> ${PLIST_SRC}) - @${ECHO} "@dirrm share/xipdump/pkt" >> ${PLIST_SRC} - @${ECHO} "@dirrm share/xipdump/pkc" >> ${PLIST_SRC} - @${ECHO} "@dirrm share/xipdump" >> ${PLIST_SRC} post-install: ${FIND} ${PREFIX}/share/xipdump -name *.pkc | \ diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 54b4e396adc..1285dd6680b 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2009/05/19 08:59:29 wiz Exp $ +# $NetBSD: Makefile,v 1.103 2009/06/14 22:58:08 joerg Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, @@ -83,10 +83,6 @@ do-build: >> ${PLIST_SRC.files}; \ fi; \ done - ${RM} -f ${PLIST_SRC.dirs} - { cd ${WRKSRC}; ${FIND} ${X11_LINKS_SUBDIR} -type d -print | \ - ${SORT} -ur | ${SED} -e "s|^|@dirrm |"; \ - } > ${PLIST_SRC.dirs} do-install: ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q} diff --git a/print/foomatic-ppds/Makefile b/print/foomatic-ppds/Makefile index b156863f1a9..836760dc829 100644 --- a/print/foomatic-ppds/Makefile +++ b/print/foomatic-ppds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/10/25 21:04:23 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2009/06/14 22:58:08 joerg Exp $ .include "Makefile.common" @@ -26,10 +26,7 @@ CHECK_PORTABILITY_SKIP= install GENERATE_PLIST+= \ ( cd ${WRKSRC}/share; \ ${FIND} ppd -type f -print | ${SORT} -u | \ - ${SED} -e "s|^|share/foomatic/|"; \ - ${FIND} ppd -type d -print | ${SORT} -ur | \ - ${SED} -e "s|^|@dirrm share/foomatic/|"; \ - ${ECHO} "@dirrm share/foomatic" ); + ${SED} -e "s|^|share/foomatic/|" ) do-build: # nothing diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index c01293f2e5b..959f7309440 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2009/02/27 10:00:29 tron Exp $ +# $NetBSD: Makefile,v 1.54 2009/06/14 22:58:08 joerg Exp $ DISTNAME= magicfilter-1.2 PKGREVISION= 7 @@ -44,11 +44,10 @@ SUBST_SED.gs= -e 's,${PREFIX}/bin/gs,${SETENV} TEMP=$${TMPDIR:-/tmp} &,' INSTALLATION_DIRS+= bin ${FILTER_DIR} ${PKGMANDIR}/man8 GENERATE_PLIST+= \ - (cd ${WRKSRC}/filters; \ + cd ${WRKSRC}/filters && \ for f in *-filter; do \ ${ECHO} ${FILTER_DIR}/"$$f"; \ - done; \ - ${ECHO} "@dirrm ${FILTER_DIR}"); + done \ post-install: set -e; \ diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 05938ccf642..2bba2a9bd7b 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/06/14 22:58:08 joerg Exp $ BUILDLINK_TREE+= poppler @@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.10.0 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler -PRINT_PLIST_AWK+= /^@exec ..MKDIR. %D\/include\/poppler$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm include\/poppler$$/ \ - { print "@comment in poppler: " $$0; next; } - pkgbase := poppler .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms) diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk index 8b5fab47adc..ffdc46bcad9 100644 --- a/print/teTeX/module.mk +++ b/print/teTeX/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.18 2008/12/07 06:41:51 minskim Exp $ +# $NetBSD: module.mk,v 1.19 2009/06/14 22:58:08 joerg Exp $ # # This Makefile fragment is intended to be included by packages that # install TeX packages. It takes care of rebuilding the ls-R database @@ -29,11 +29,11 @@ FILES_SUBST+= TEX_FONTMAPS=${TEX_FONTMAPS:Q} INSTALL_TEMPLATES+= ../../print/teTeX/files/texmf.tmpl DEINSTALL_TEMPLATES+= ../../print/teTeX/files/texmf.tmpl -PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \ +PRINT_PLIST_AWK+= /^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \ { gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); } -PRINT_PLIST_AWK+= /^(@dirrm )?${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/ \ { gsub(/${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/, "$${TEXMFDIST}"); } .include "../../mk/tex.buildlink3.mk" diff --git a/print/texlive/module.mk b/print/texlive/module.mk index ac759970d93..72dcb8a1091 100644 --- a/print/texlive/module.mk +++ b/print/texlive/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.4 2009/04/17 17:41:23 minskim Exp $ +# $NetBSD: module.mk,v 1.5 2009/06/14 22:58:08 joerg Exp $ # # This Makefile fragment is inteded to be included by packages that build # TeX Live packages. @@ -81,6 +81,3 @@ _texlive-install: post-extract: _texlive-set-permission do-install: _texlive-install - -PRINT_PLIST_AWK+= /^@dirrm share\/texmf/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/doc\/texmf/ { next; } diff --git a/print/texmf-dirs/dirs.mk b/print/texmf-dirs/dirs.mk index 6a06d945fd2..41a0366f28e 100644 --- a/print/texmf-dirs/dirs.mk +++ b/print/texmf-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.9 2006/12/05 21:00:12 minskim Exp $ +# $NetBSD: dirs.mk,v 1.10 2009/06/14 22:58:08 joerg Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -48,11 +48,6 @@ TEXMF_DIRS+= web2c .if defined(_USE_TEXMF_DIRS) && !empty(_USE_TEXMF_DIRS) DEPENDS+= texmf-dirs>=${_USE_TEXMF_DIRS}:../../print/texmf-dirs - -. for dir in ${TEXMF_DIRS} -PRINT_PLIST_AWK+= /^@dirrm \$${PKG_LOCALTEXMFPREFIX}\/${dir:S|/|\\/|g}$$/ \ - { print "@comment In texmf-dirs: " $$0; next; } -. endfor .endif .endif # !defined(DIRS_TEXMF_MK) diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index dc780eee66f..fa93b2e42ac 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:30 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2009/06/14 22:58:08 joerg Exp $ .include "Makefile.common" @@ -86,12 +86,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file} \ GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${file} && \ ${ECHO} "${file}"; .endfor -.if !empty(AUTHLIB_PLIST:M${AUTHEXAMPLEDIR}/*) -GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHEXAMPLEDIR}"; -.endif -GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHDOCDIR}"; -GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBEXECDIR}"; -GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBDIR}"; INSTALLATION_DIRS= bin sbin diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 2ef46525c23..ef210e35a93 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2009/05/20 00:58:26 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2009/06/14 22:58:08 joerg Exp $ DISTNAME= heimdal-1.1 PKGREVISION= 3 @@ -71,8 +71,7 @@ INFO_FILES= yes # GENERATE_PLIST+= \ ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ - ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); \ - ${ECHO} "@dirrm include/krb5"; + ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); .include "../../devel/readline/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk index 679a718b3fb..2d3c4a79617 100644 --- a/sysutils/dbus/buildlink3.mk +++ b/sysutils/dbus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:23 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:58:09 joerg Exp $ BUILDLINK_TREE+= dbus @@ -8,14 +8,6 @@ DBUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.dbus+= dbus>=0.91 BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus -PRINT_PLIST_AWK+= /^@dirrm include\/dbus-1.0\/dbus$$/ \ - { print "@comment in dbus: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec ..MKDIR. %D\/share\/dbus-1\/services/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1\/services/ \ - { print "@comment in dbus: " $$0; next } -PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1/ \ - { print "@comment in dbus: " $$0; next } - .include "../../textproc/expat/buildlink3.mk" .endif # DBUS_BUILDLINK3_MK diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index 35a1b950b9a..db17184a43f 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2009/06/10 14:49:44 wiz Exp $ +# $NetBSD: Makefile.common,v 1.19 2009/06/14 22:58:09 joerg Exp $ # # used by audio/gnome-vfs-cdda/Makefile # used by net/gnome-vfs-dns-sd/Makefile @@ -88,12 +88,6 @@ SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome- BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=${GNOME_VFS_VERSION} .include "../../sysutils/gnome-vfs/buildlink3.mk" -PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs: " $$0; next; } - INSTALLATION_DIRS+= lib/gnome-vfs-2.0/modules do-install: diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk index e07c99a8a57..7c8e6e1ff72 100644 --- a/sysutils/gnome-vfs/buildlink3.mk +++ b/sysutils/gnome-vfs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/06/14 22:58:09 joerg Exp $ BUILDLINK_TREE+= gnome-vfs @@ -9,9 +9,6 @@ BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.0 BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.20.1nb1 BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs -PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ - { print "@comment in gnome-vfs: " $$0; next; } - .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index ec4943a4c94..cc701e12683 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2009/05/20 13:19:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2009/06/14 22:58:09 joerg Exp $ BUILDLINK_TREE+= nautilus @@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.12.1nb1 BUILDLINK_ABI_DEPENDS.nautilus?= nautilus>=2.20.0nb2 BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus -PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus$$/ \ - { print "@comment in nautilus: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-2.0$$/ \ - { print "@comment in nautilus: " $$0; next; } - .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/sysutils/strigi/buildlink3.mk b/sysutils/strigi/buildlink3.mk index 048f45e7a40..dd2c5b4fc2c 100644 --- a/sysutils/strigi/buildlink3.mk +++ b/sysutils/strigi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:26 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/06/14 22:58:09 joerg Exp $ BUILDLINK_TREE+= strigi @@ -8,9 +8,6 @@ STRIGI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.strigi+= strigi>=0.6.2 BUILDLINK_PKGSRCDIR.strigi?= ../../sysutils/strigi -PRINT_PLIST_AWK+= /^@dirrm lib\/strigi$$/ \ - { print "@comment in strigi: " $$0; next; } - .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/textproc/docbook-simple/Makefile b/textproc/docbook-simple/Makefile index a242f4698d2..eb298c14983 100644 --- a/textproc/docbook-simple/Makefile +++ b/textproc/docbook-simple/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/03/04 16:44:28 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2009/06/14 22:58:09 joerg Exp $ # DISTNAME= docbook-simple-1.1 @@ -29,11 +29,6 @@ XML_CATALOGS= ${DTDDIR}/catalog.xml XML_ENTRIES= rewriteSystem http://www.oasis-open.org/docbook/xml/simple/1.1 \ ${DTDDIR} -# share/xml/docbook is shared with docbook-xml. -PRINT_PLIST_AWK+= /^@dirrm share\/xml\/docbook$$/ \ - { print "@unexec $${RMDIR} %D/share/xml/docbook" \ - " >/dev/null 2>&1"; next } - do-install: ${INSTALL_DATA_DIR} ${DTDDIR} (cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR}) diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index 01f35b898ab..80806ca7282 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/11/03 19:17:39 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:09 joerg Exp $ # DISTNAME= docbook-xml-4.4 @@ -41,11 +41,6 @@ XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2 XML_ENTRIES+= rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 \ ${DTDDIR}/4.2 -# share/xml/docbook is shared with docbook-simple. -PRINT_PLIST_AWK+= /^@dirrm share\/xml\/docbook$$/ \ - { print "@unexec $${RMDIR} %D/share/xml/docbook" \ - " >/dev/null 2>&1"; next } - pre-install: .for ver in ${VER} ${INSTALL_DATA_DIR} ${DESTDIR}${DTDDIR}/${ver} diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile index b17d133ef0a..61430cb2b1b 100644 --- a/textproc/lout/Makefile +++ b/textproc/lout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:32 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:09 joerg Exp $ # DISTNAME= lout-3.26 @@ -23,8 +23,6 @@ post-install: (cd ${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC}) (cd ${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC}) ${ECHO} "@unexec ${RM} -rf %D/share/doc/lout" >>${PLIST_SRC} - (cd ${PREFIX}; ${FIND} -d share/lout -type d -print | \ - ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index 4dcbc81e45b..748aecd824e 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/11/03 06:56:24 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2009/06/14 22:58:09 joerg Exp $ # DISTNAME= xmlcatmgr-2.2 @@ -25,8 +25,6 @@ CONF_FILES+= ${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog CONF_FILES+= ${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog REQD_DIRS= ${PREFIX}/share/sgml ${PREFIX}/share/xml -PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ { next; } - INSTALLATION_DIRS+= share/examples/xmlcatmgr post-build: diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk index 41f88a5fa1c..405d2819381 100644 --- a/textproc/xmlcatmgr/buildlink3.mk +++ b/textproc/xmlcatmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:09 joerg Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # @@ -34,8 +34,6 @@ SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/sgml/catalog XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog .endif -PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \ - { print "@comment in xmlcatmgr: " $$0; next } .endif # XMLCATMGR_BUILDLINK3_MK BUILDLINK_TREE+= -xmlcatmgr diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index 985a54ca3e7..92a3e5ae43a 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.18 2006/10/12 08:56:56 dsainty Exp $ +# $NetBSD: catalogs.mk,v 1.19 2009/06/14 22:58:09 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -58,8 +58,6 @@ DEINSTALL_TEMPLATES+= ../../textproc/xmlcatmgr/files/deinstall.tmpl PRINT_PLIST_AWK+= /^share\/(sgml|xml)\/catalog$$/ \ { print "@comment in xmlcatmgr: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \ - { print "@comment in xmlcatmgr: " $$0; next; } .include "../../textproc/xmlcatmgr/buildlink3.mk" diff --git a/time/asclock/Makefile b/time/asclock/Makefile index 50d27d2799f..8de4b70400c 100644 --- a/time/asclock/Makefile +++ b/time/asclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/06/20 01:09:38 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2009/06/14 22:58:09 joerg Exp $ DISTNAME= asclock-classic-1.0 PKGNAME= asclock-1.0 @@ -72,9 +72,7 @@ do-install: ${DESTDIR}${PREFIX}/share/asclock-classic/${LANGUAGE} @${ECHO} share/asclock-classic/${LANGUAGE}/month.xpm >> ${PLIST_SRC} @${ECHO} share/asclock-classic/${LANGUAGE}/weekday.xpm >> ${PLIST_SRC} - @${ECHO} @dirrm share/asclock-classic/${LANGUAGE} >> ${PLIST_SRC} .endfor - @${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC} .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile index d500248f768..b5ee0d8bfe9 100644 --- a/wm/wmthemes/Makefile +++ b/wm/wmthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/02/01 22:55:49 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2009/06/14 22:58:09 joerg Exp $ # # There is no distinfo file because users can specify alternate themes @@ -62,7 +62,6 @@ do-install: ${ECHO} "${WM_DATADIR}/Themes/$$DIR/$$FILE" >>${PLIST_SRC}; \ done; \ cd ..; \ - ${ECHO} "@dirrm ${WM_DATADIR}/Themes/$$DIR" >>${PLIST_SRC}; \ fi; \ done diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile index 616811f18a3..d6f64d81053 100644 --- a/www/album_themes/Makefile +++ b/www/album_themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/06/12 02:14:54 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:10 joerg Exp $ # DISTNAME= album_themes @@ -35,10 +35,6 @@ pre-install: @${RM} -f ${PLIST_SRC} @${TAR} -tvzf ${DISTDIR}/${DISTFILES} | \ ${SED} -n -e 's,^-.* ,${A_DATADIR}/,p' >> ${PLIST_SRC} - @${TAR} -tvzf ${DISTDIR}/${DISTFILES} | \ - ${SED} -n -e 's,^d.* ,@dirrm ${A_DATADIR}/,p' | ${SORT} -r >> ${PLIST_SRC} - @${ECHO} "@dirrm ${A_DATADIR}/Themes" >> ${PLIST_SRC} - @${ECHO} "@dirrm ${A_DATADIR}" >> ${PLIST_SRC} do-install: cd ${DESTDIR}${PREFIX}/${A_DATADIR}; \ diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 5cfc9f8c89b..762c33c69e0 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2009/02/09 21:09:23 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2009/06/14 22:58:10 joerg Exp $ # DISTNAME= mod_python-2.7.10 @@ -31,9 +31,6 @@ post-install: cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \ share/doc/html/ap-mod_python \ -type f -print >>${PLIST_SRC} - cd ${PREFIX} && ${FIND} -d ${PYSITELIB}/mod_python \ - share/doc/html/ap-mod_python \ - -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} .include "../../lang/python/extension.mk" .include "../../www/apache/buildlink3.mk" diff --git a/www/geeklog/Makefile.common b/www/geeklog/Makefile.common index 62dad770b1e..5a0e8088fb0 100644 --- a/www/geeklog/Makefile.common +++ b/www/geeklog/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2009/05/26 14:19:29 taca Exp $ +# $NetBSD: Makefile.common,v 1.8 2009/06/14 22:58:10 joerg Exp $ # # used by www/geeklog/Makefile @@ -27,41 +27,39 @@ BUILD_DEFS+= GEEKLOG_BASE GEEKLOG_PUB GEEKLOG_SITEBASE GEEKLOG_SITESUBDIR= /${GEEKLOG_SITEBASE} .endif -PRINT_PLIST_AWK+= /^(@dirrm )?${GL_ADMIN:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GL_ADMIN:S|/|\\/|g}/ \ { gsub(/${GL_ADMIN:S|/|\\/|g}/, "$${GL_ADMIN}"); \ print; next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GL_TMPL:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GL_TMPL:S|/|\\/|g}/ \ { gsub(/${GL_TMPL:S|/|\\/|g}/, "$${GL_TMPL}"); \ print; next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GL_DOC:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GL_DOC:S|/|\\/|g}/ \ { gsub(/${GL_DOC:S|/|\\/|g}/, "$${GL_DOC}"); \ print; next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GL_EG:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GL_EG:S|/|\\/|g}/ \ { gsub(/${GL_EG:S|/|\\/|g}/, "$${GL_EG}"); \ print; next; } -PRINT_PLIST_AWK+= /^@dirrm ${GEEKLOG_BASE:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_BASE:S|/|\\/|g}\/backups/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}\/backups/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_BASE:S|/|\\/|g}\/data/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_BASE:S|/|\\/|g}\/logs/ { next; } +PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}\/data/ { next; } +PRINT_PLIST_AWK+= /^?${GEEKLOG_BASE:S|/|\\/|g}\/logs/ { next; } PRINT_PLIST_AWK+= /${GEEKLOG_BASE:S|/|\\/|g}\/db-config.php/ { next; } PRINT_PLIST_AWK+= /${GEEKLOG_BASE:S|/|\\/|g}\/system\/lib-custom.php/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_BASE:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_BASE:S|/|\\/|g}/ \ { gsub(/${GEEKLOG_BASE:S|/|\\/|g}/, "$${GEEKLOG_BASE}"); \ print; next; } -PRINT_PLIST_AWK+= /^@dirrm ${GEEKLOG_PUB:S|/|\\/|g}$$/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/admin/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/backend/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/images\/articles/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/admin/ { next; } +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/backend/ { next; } +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/articles/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/images\/library/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/library/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/images\/topics/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/topics/ \ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}\/images\/userphotos/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}\/images\/userphotos/ \ { next; } PRINT_PLIST_AWK+= /${GEEKLOG_PUB:S|/|\\/|g}\/siteconfig.php/ { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${GEEKLOG_PUB:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${GEEKLOG_PUB:S|/|\\/|g}/ \ { gsub(/${GEEKLOG_PUB:S|/|\\/|g}/, "$${GEEKLOG_PUB}"); \ print; next; } diff --git a/www/plone/ploneversion.mk b/www/plone/ploneversion.mk index 4bae5c78283..40135d86f0b 100644 --- a/www/plone/ploneversion.mk +++ b/www/plone/ploneversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: ploneversion.mk,v 1.11 2008/11/15 17:24:19 taca Exp $ +# $NetBSD: ploneversion.mk,v 1.12 2009/06/14 22:58:10 joerg Exp $ # .if !defined(_PLONEVERSION_MK) @@ -149,7 +149,7 @@ PLIST_SUBST+= PLONE_VERSION=${PLONE_VERSION} \ # # PLONE_BASE needs to be replaced preceding to ZOPE_BASE # -PRINT_PLIST_AWK+= /^(@dirrm )?${PLONE_BASE:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${PLONE_BASE:S|/|\\/|g}/ \ { gsub(/${PLONE_BASE:S|/|\\/|g}/, "$${PLONE_BASE}"); \ print; next; } diff --git a/www/ramaze/Makefile b/www/ramaze/Makefile index d4a4545f897..f2db365b0f5 100644 --- a/www/ramaze/Makefile +++ b/www/ramaze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:26:03 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2009/06/14 22:58:10 joerg Exp $ DISTNAME= ramaze-0.3.9.1 CATEGORIES= www @@ -16,12 +16,9 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rack>=0.2.0:../../www/ruby-rack # GENERATE_PLIST+= \ ${ECHO} "@comment The following lines are automatically generated." && \ - ( cd ${DESTDIR}${PREFIX} && \ - ${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/rdoc \! -type d -print | \ - ${SORT} && \ - ${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/rdoc -type d -print | \ - ${SORT} -r | ${SED} -e "s,^,@dirrm ," && \ - ${ECHO} "@dirrm "${GEM_LIBDIR:S|${PREFIX}/||:Q} ); + cd ${DESTDIR}${PREFIX} && \ + ${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/rdoc \! -type d -print | \ + ${SORT}; .include "../../misc/rubygems/rubygem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common index 3bd2b1a62f9..717850c14a1 100644 --- a/www/seamonkey-bin/Makefile.common +++ b/www/seamonkey-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2009/01/04 18:48:47 shattered Exp $ +# $NetBSD: Makefile.common,v 1.17 2009/06/14 22:58:10 joerg Exp $ DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} @@ -123,8 +123,6 @@ GENERATE_PLIST+= \ ${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}; \ ${FIND} ${DESTDIR}${MOZILLA_LIB} \( -type f -o -type l \) -print\ | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"; \ - ${FIND} ${DESTDIR}${MOZILLA_LIB} -type d -print \ - | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g"; \ - ${ECHO} "@exec ${MKDIR} %D/lib/mozilla-linux/plugins"; + ${ECHO} "@pkgdir lib/mozilla-linux/plugins"; .include "../../mk/bsd.pkg.mk" diff --git a/www/seamonkey/files/moz-install b/www/seamonkey/files/moz-install index 257ed91f6d2..aae32d9d0af 100755 --- a/www/seamonkey/files/moz-install +++ b/www/seamonkey/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.8 2009/03/18 00:08:40 abs Exp $ +# $NetBSD: moz-install,v 1.9 2009/06/14 22:58:10 joerg Exp $ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA} @@ -16,26 +16,24 @@ trap "${RM} -f ${TMP_PLIST}" 1 2 15 ${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" -e "s/\${JEMALLOC}/${JEMALLOC}/g" < ${PLIST_SRC} > ${TMP_PLIST} -# make directories -for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} ^@dirrm | ${SED} -e 's/^@dirrm//'` ; do - ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$i -done - # install programs for i in `${SED} -n -e '/^@comment begin PROGRAMS$/,/^@comment end PROGRAMS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install scripts for i in `${SED} -n -e '/^@comment begin SCRIPTS$/,/^@comment end SCRIPTS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install DSO for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done @@ -43,30 +41,35 @@ done ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install DATA for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install INCLUDE for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/include@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install INCLUDE-PUBLIC for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE-PUBLIC$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/public@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done # install INCLUDE-SDK for i in `${SED} -n -e '/^@comment begin INCLUDE-SDK$/,/^@comment end INCLUDE-SDK$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/sdk/include@"`; + ${BSD_INSTALL_DATA_DIR} `dirname ${DESTDIR}${PREFIX}/$i` ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i done diff --git a/www/squid/Makefile.squid b/www/squid/Makefile.squid index a3596dbe19b..ffc230f32a0 100644 --- a/www/squid/Makefile.squid +++ b/www/squid/Makefile.squid @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.squid,v 1.7 2009/06/06 22:49:50 tron Exp $ +# $NetBSD: Makefile.squid,v 1.8 2009/06/14 22:58:10 joerg Exp $ # # used by www/squid26/Makefile # used by www/squid27/Makefile @@ -79,14 +79,6 @@ post-install: ${CHMOD} -w ${PREFIX}/libexec/pinger ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} ( \ - cd ${WRKSRC}/errors; \ - for i in *; do \ - ${TEST} -d $$i && \ - (${LS} $$i/ERR_* | \ - ${SED} -e 's@^@share/squid/errors/@'; \ - ${ECHO} "@dirrm share/squid/errors/$$i"); \ - done; \ - ${ECHO} "@dirrm share/squid/errors"; \ cd ${WRKSRC}/icons; \ ${LS} anthony-*.gif | \ ${SED} -e 's@^@share/squid/icons/@'; \ diff --git a/www/typo3/Makefile b/www/typo3/Makefile index e33848bef26..964ca4eefab 100644 --- a/www/typo3/Makefile +++ b/www/typo3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2009/02/10 09:35:40 taca Exp $ +# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:10 joerg Exp $ # DISTNAME= ${TYPO3NAME} @@ -66,16 +66,10 @@ SUBST_STAGE.conf= post-configure PRINT_PLIST_AWK+= /^${EGDIR:S|/|\\/|g}/ \ { gsub(/${EGDIR:S|/|\\/|g}/, "$${EGDIR}") } -PRINT_PLIST_AWK+= /^(@dirrm )?${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \ +PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \ { gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \ "$${TYPO3DIR}/$${TYPO3NAME}") } -PRINT_PLIST_AWK+= /^@dirrm ${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \ - { gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \ - "$${TYPO3DIR}/$${TYPO3NAME}") } -PRINT_PLIST_AWK+= /^(@dirrm )?${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \ - { gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \ - "$${TYPO3DIR}/$${SITEDIR}") } -PRINT_PLIST_AWK+= /^@dirrm ${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \ +PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \ { gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \ "$${TYPO3DIR}/$${SITEDIR}") } diff --git a/www/typolight/Makefile.common b/www/typolight/Makefile.common index 3669c167984..776852332b6 100644 --- a/www/typolight/Makefile.common +++ b/www/typolight/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2009/05/30 16:51:06 taca Exp $ +# $NetBSD: Makefile.common,v 1.13 2009/06/14 22:58:10 joerg Exp $ # # used by www/typolight26/Makefile # used by www/typolight27/Makefile @@ -17,21 +17,13 @@ MESSAGE_SUBST+= TL_VER=${TL_VER} PLIST_SUBST+= TL_DOCDIR=${TL_DOCDIR:Q} TL_EGDIR=${TL_EGDIR:Q} \ TL_WEBDIR=${TL_WEBDIR:Q} -PRINT_PLIST_AWK+= /@dirrm ${TL_WEBDIR:S|/|\\/|g}\/templates$$/ \ - { next; } -PRINT_PLIST_AWK+= /@dirrm ${TL_WEBDIR:S|/|\\/|g}\/system\/(tmp|log)$$/ \ - { next; } -PRINT_PLIST_AWK+= /@dirrm ${TL_WEBDIR:S|/|\\/|g}\/system$$/ \ - { next; } -PRINT_PLIST_AWK+= /@dirrm ${TL_WEBDIR:S|/|\\/|g}$$/ \ - { next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${TL_WEBDIR:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${TL_WEBDIR:S|/|\\/|g}/ \ { gsub(/${TL_WEBDIR:S|/|\\/|g}/, "$${TL_WEBDIR}"); \ print; next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${TL_DOCDIR:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${TL_DOCDIR:S|/|\\/|g}/ \ { gsub(/${TL_DOCDIR:S|/|\\/|g}/, "$${TL_DOCDIR}"); \ print; next; } -PRINT_PLIST_AWK+= /^(@dirrm )?${TL_EGDIR:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${TL_EGDIR:S|/|\\/|g}/ \ { gsub(/${TL_EGDIR:S|/|\\/|g}/, "$${TL_EGDIR}"); \ print; next; } diff --git a/www/zope/zopeversion.mk b/www/zope/zopeversion.mk index ead3a3877e4..f461dc5404c 100644 --- a/www/zope/zopeversion.mk +++ b/www/zope/zopeversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: zopeversion.mk,v 1.10 2009/02/21 15:26:47 taca Exp $ +# $NetBSD: zopeversion.mk,v 1.11 2009/06/14 22:58:11 joerg Exp $ # .if !defined(_ZOPEVERSION_MK) @@ -200,7 +200,7 @@ PLIST_SUBST+= ZOPE_VERSION=${ZOPE_VERSION} \ ZOPE_DOC_BASE=${ZOPE_DOC_BASE} \ ZOPE_PRODUCTS_BASE=${ZOPE_PRODUCTS_BASE} -PRINT_PLIST_AWK+= /^(@dirrm )?${ZOPE_BASE:S|/|\\/|g}/ \ +PRINT_PLIST_AWK+= /^${ZOPE_BASE:S|/|\\/|g}/ \ { gsub(/${ZOPE_BASE:S|/|\\/|g}/, "$${ZOPE_BASE}"); \ print; next; } diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk index a9ee7fed11e..047eb290851 100644 --- a/x11/gnustep-back/buildlink3.mk +++ b/x11/gnustep-back/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/04/13 12:21:37 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2009/06/14 22:58:11 joerg Exp $ BUILDLINK_TREE+= gnustep-back @@ -9,19 +9,6 @@ BUILDLINK_API_DEPENDS.gnustep-back+= gnustep-back>=0.9.2 BUILDLINK_ABI_DEPENDS.gnustep-back+= gnustep-back>=0.12.0nb1 BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Fonts$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { print "@comment in x11/gnustep-back: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { next; } - .include "../../x11/gnustep-gui/buildlink3.mk" .endif # GNUSTEP_BACK_BUILDLINK3_MK diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk index 33c6d1e5862..a7e694e3d24 100644 --- a/x11/gnustep-gui/buildlink3.mk +++ b/x11/gnustep-gui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/04/13 12:19:14 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/06/14 22:58:11 joerg Exp $ BUILDLINK_TREE+= gnustep-gui @@ -9,95 +9,6 @@ BUILDLINK_API_DEPENDS.gnustep-gui+= gnustep-gui>=0.16.0 BUILDLINK_ABI_DEPENDS.gnustep-gui+= gnustep-gui>=0.16.0 BUILDLINK_PKGSRCDIR.gnustep-gui?= ../../x11/gnustep-gui -PRINT_PLIST_AWK+= /^@dirrm include\/AppKit$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/Cocoa$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/GNUstepGUI$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm include\/gnustep\/gui$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/GSPrinting$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/TextConverters$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgmodel.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Bundles\/libgmodel.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/NamedPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/NamedPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/French.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/Swedish.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/WheelPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/ColorPickers\/WheelPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Images$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/KeyBindings$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSDataLinkPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPageLayout.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPrintPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSSpellPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Esperanto.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/German.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Italian.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Lojban.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/PostScript$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/PostScript\/PPD$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/PostScript\/PPD\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Services$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Services\/GSspell.service$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Services\/GSspell.service\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/AppKit$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/Cocoa$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/GNUstepGUI$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/include\/gnustep\/gui$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgmodel.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgmodel.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/NamedPicker.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/NamedPicker.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/French.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/Swedish.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/WheelPicker.bundle$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/WheelPicker.bundle\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Images$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/KeyBindings$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSDataLinkPanel.gorm$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPageLayout.gorm$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPrintPanel.gorm$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSSpellPanel.gorm$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Esperanto.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/German.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Italian.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Lojban.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript\/PPD$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript\/PPD\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services\/GSspell.service$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services\/GSspell.service\/Resources$$/ { next; } - .include "../../devel/gnustep-base/buildlink3.mk" .endif # GNUSTEP_GUI_BUILDLINK3_MK diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk index 2f483ff2545..4c8752332e7 100644 --- a/x11/gnustep-preferences/buildlink3.mk +++ b/x11/gnustep-preferences/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/04/19 09:29:57 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $ BUILDLINK_TREE+= gnustep-preferences @@ -12,33 +12,6 @@ BUILDLINK_INCDIRS.gnustep-preferences+= lib/GNUstep/Frameworks/PrefsModule.frame BUILDLINK_FILES.gnustep-preferences+= lib/GNUstep/Frameworks/PrefsModule.framework/Headers/*.h BUILDLINK_FILES.gnustep-preferences+= include/PrefsModule/PrefsModule.h -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { next; } -PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { next; } - #.include "../../x11/gnustep-back/buildlink3.mk" .endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK diff --git a/x11/gtk-sharp/buildlink3.mk b/x11/gtk-sharp/buildlink3.mk index 28092ee0b8c..96fc4a3a79d 100644 --- a/x11/gtk-sharp/buildlink3.mk +++ b/x11/gtk-sharp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/06/14 22:58:11 joerg Exp $ BUILDLINK_TREE+= gtk-sharp @@ -7,13 +7,6 @@ GTK_SHARP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtk-sharp+= gtk-sharp>=2.12.1 BUILDLINK_PKGSRCDIR.gtk-sharp?= ../../x11/gtk-sharp - -PRINT_PLIST_AWK+= /^@dirrm share\/gapi-2.0$$/ \ - { print "@comment in gtk-sharp: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/mono\/gtk-sharp-2.0$$/ \ - { print "@comment in gtk-sharp: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-sharp-2.0$$/ \ - { print "@comment in gtk-sharp: " $$0; next; } .endif # GTK_SHARP_BUILDLINK3_MK BUILDLINK_TREE+= -gtk-sharp diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index 2d75994aa87..75351cdb0bd 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.41 2009/06/14 22:58:11 joerg Exp $ BUILDLINK_TREE+= gtk2 @@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0 BUILDLINK_ABI_DEPENDS.gtk2+= gtk2+>=2.8.17nb1 BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2 -PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/(engines|filesystems|immodules|loaders|modules)$$/ \ - { print "@comment in gtk2: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|loaders|modules|printbackends)$$/ \ - { print "@comment in gtk2: " $$0; next; } - .include "../../mk/bsd.fast.prefs.mk" pkgbase := gtk2 diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk index 6208121d614..56270e9a26a 100644 --- a/x11/gtk2/modules.mk +++ b/x11/gtk2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.14 2006/06/15 22:13:59 jlam Exp $ +# $NetBSD: modules.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # GTK2 modules. It takes care of rebuilding the corresponding databases at @@ -38,7 +38,6 @@ DEINSTALL_TEMPLATES+= ../../x11/gtk2/files/loaders.tmpl .endif PRINT_PLIST_AWK+= /^libdata\/gtk-2.0/ { next; } -PRINT_PLIST_AWK+= /^@dirrm libdata\/gtk-2.0/ { next; } .if !defined(_BUILDING_GTK2) . include "../../x11/gtk2/buildlink3.mk" |