summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2009-06-16 15:25:31 +0000
committerjoerg <joerg>2009-06-16 15:25:31 +0000
commit5ea2c5115d859c1c50c0a1db519128d4b2502715 (patch)
treefa0e1fe1cf96775d246aae52ce1c39c507d32764
parent80d88b71d6bb6fa921f38f45fe12fde2623e285d (diff)
downloadpkgsrc-5ea2c5115d859c1c50c0a1db519128d4b2502715.tar.gz
Fix a number of GENERATE_PLIST entries to always have a terminating ;
-rw-r--r--databases/freetds/Makefile7
-rw-r--r--devel/ruby-log4r/Makefile4
-rw-r--r--fonts/adobe-cidfonts/Makefile4
-rw-r--r--lang/gcc3-c/Makefile4
-rw-r--r--lang/gcc34/Makefile4
-rw-r--r--math/R/Makefile.extension4
-rw-r--r--misc/rubygems/Makefile4
-rw-r--r--print/foomatic-ppds/Makefile4
-rw-r--r--print/magicfilter/Makefile4
9 files changed, 18 insertions, 21 deletions
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index e8ac1cdc423..6f8bc118b08 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/06/14 22:57:58 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/06/16 15:25:31 joerg Exp $
DISTNAME= freetds-0.82
PKGREVISION= 2
@@ -52,10 +52,7 @@ GENERATE_PLIST+= \
( cd ${WRKSRC}/doc/doc/${DISTNAME} && \
${FIND} reference userguide \! -type d -print && \
cd ${WRKSRC}/doc && ${FIND} images -name "*.gif" -print ) | \
- ${SED} -e "s,^,"${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT} && \
- ( cd ${WRKSRC}/doc/doc/${DISTNAME} && \
- ${FIND} reference userguide -type d -print && \
- cd ${WRKSRC}/doc && ${FIND} images -type d -print ) | \
+ ${SED} -e "s,^,"${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT};
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/devel/ruby-log4r/Makefile b/devel/ruby-log4r/Makefile
index fb076de590f..9be9e7bbe44 100644
--- a/devel/ruby-log4r/Makefile
+++ b/devel/ruby-log4r/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/14 22:58:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/16 15:25:31 joerg Exp $
DISTNAME= log4r-1.0.5
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ GENERATE_PLIST+= \
${ECHO} "@comment The following lines are automatically generated." && \
cd ${DESTDIR}${PREFIX} && \
${FIND} ${GEM_LIBDIR:S|${PREFIX}/||}/doc \! -type d -print | \
- ${SORT}
+ ${SORT};
.include "../../misc/rubygems/rubygem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/adobe-cidfonts/Makefile b/fonts/adobe-cidfonts/Makefile
index 2c5b03c7e4d..95be53489bf 100644
--- a/fonts/adobe-cidfonts/Makefile
+++ b/fonts/adobe-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/06/14 22:58:00 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/16 15:25:31 joerg Exp $
DISTNAME= adobe-cidfonts-20000901
CATEGORIES= fonts
@@ -38,7 +38,7 @@ RESOURCEDIR= ${PREFIX}/${RESOURCESUBDIR}
GENERATE_PLIST= \
for f in ${DISTFILES:O:u}; do \
${ECHO} ${RESOURCESUBDIR}/CIDFont/$$f; \
- done
+ done;
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CIDFont
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index b4cd7576620..f73dc6747ff 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/06/14 22:58:01 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/06/16 15:25:31 joerg Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
PKGREVISION= 1
@@ -28,7 +28,7 @@ post-build:
GENERATE_PLIST+= \
${FIND} ${DESTDIR:Q}${GCC_PREFIX} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"
+ | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g";
post-install:
.if ${OPSYS} == "SunOS"
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index bf728e0a36d..973f84db657 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2009/06/14 22:58:02 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2009/06/16 15:25:31 joerg Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -239,7 +239,7 @@ do-install:
GENERATE_PLIST+= \
${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"
+ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g";
.include "../../mk/bsd.prefs.mk"
.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index 2d9743c2786..954d72b9411 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.13 2009/06/14 22:58:04 joerg Exp $
+# $NetBSD: Makefile.extension,v 1.14 2009/06/16 15:25:31 joerg Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -32,7 +32,7 @@ R_HOMEPAGE_BASE= http://cran.r-project.org/web/packages
R_PKG_INSTALL_ARGS= -l ${DESTDIR}${PREFIX}/${R_LIB}
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
+ ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u;
INSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl
DEINSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index bf8c6c73299..5eaba533115 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/06/14 22:58:05 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/06/16 15:25:31 joerg Exp $
DISTNAME= rubygems-1.3.4
PKGREVISION= 1
@@ -43,7 +43,7 @@ GENERATE_PLIST+= \
${ECHO} "@comment The following lines are automatically generated." && \
cd ${DESTDIR}${PREFIX} && \
${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \
- ${SORT}
+ ${SORT};
.include "../../lang/ruby/modules.mk"
diff --git a/print/foomatic-ppds/Makefile b/print/foomatic-ppds/Makefile
index 836760dc829..eaea1df029b 100644
--- a/print/foomatic-ppds/Makefile
+++ b/print/foomatic-ppds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/14 22:58:08 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/16 15:25:32 joerg Exp $
.include "Makefile.common"
@@ -26,7 +26,7 @@ CHECK_PORTABILITY_SKIP= install
GENERATE_PLIST+= \
( cd ${WRKSRC}/share; \
${FIND} ppd -type f -print | ${SORT} -u | \
- ${SED} -e "s|^|share/foomatic/|" )
+ ${SED} -e "s|^|share/foomatic/|" );
do-build: # nothing
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 959f7309440..c8f1aacc8b4 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2009/06/14 22:58:08 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2009/06/16 15:25:32 joerg Exp $
DISTNAME= magicfilter-1.2
PKGREVISION= 7
@@ -47,7 +47,7 @@ GENERATE_PLIST+= \
cd ${WRKSRC}/filters && \
for f in *-filter; do \
${ECHO} ${FILTER_DIR}/"$$f"; \
- done \
+ done;
post-install:
set -e; \