summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/album_themes/Makefile6
-rw-r--r--www/ap-python/Makefile5
-rw-r--r--www/geeklog/Makefile.common34
-rw-r--r--www/plone/ploneversion.mk4
-rw-r--r--www/ramaze/Makefile11
-rw-r--r--www/seamonkey-bin/Makefile.common6
-rwxr-xr-xwww/seamonkey/files/moz-install15
-rw-r--r--www/squid/Makefile.squid10
-rw-r--r--www/typo3/Makefile12
-rw-r--r--www/typolight/Makefile.common16
-rw-r--r--www/zope/zopeversion.mk4
11 files changed, 45 insertions, 78 deletions
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; }