pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Fix a number of GENERATE_PLIST entries to always have ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/65db42e79147
branches:  trunk
changeset: 394845:65db42e79147
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 16 15:25:31 2009 +0000

description:
Fix a number of GENERATE_PLIST entries to always have a terminating ;

diffstat:

 databases/freetds/Makefile    |  7 ++-----
 devel/ruby-log4r/Makefile     |  4 ++--
 fonts/adobe-cidfonts/Makefile |  4 ++--
 lang/gcc3-c/Makefile          |  4 ++--
 lang/gcc34/Makefile           |  4 ++--
 math/R/Makefile.extension     |  4 ++--
 misc/rubygems/Makefile        |  4 ++--
 print/foomatic-ppds/Makefile  |  4 ++--
 print/magicfilter/Makefile    |  4 ++--
 9 files changed, 18 insertions(+), 21 deletions(-)

diffs (165 lines):

diff -r b93a74af662d -r 65db42e79147 databases/freetds/Makefile
--- a/databases/freetds/Makefile        Tue Jun 16 15:11:16 2009 +0000
+++ b/databases/freetds/Makefile        Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
        ( 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 -r b93a74af662d -r 65db42e79147 devel/ruby-log4r/Makefile
--- a/devel/ruby-log4r/Makefile Tue Jun 16 15:11:16 2009 +0000
+++ b/devel/ruby-log4r/Makefile Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
        ${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 -r b93a74af662d -r 65db42e79147 fonts/adobe-cidfonts/Makefile
--- a/fonts/adobe-cidfonts/Makefile     Tue Jun 16 15:11:16 2009 +0000
+++ b/fonts/adobe-cidfonts/Makefile     Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
 GENERATE_PLIST=                                                                \
        for f in ${DISTFILES:O:u}; do                                   \
                ${ECHO} ${RESOURCESUBDIR}/CIDFont/$$f;                  \
-       done
+       done;
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CIDFont
diff -r b93a74af662d -r 65db42e79147 lang/gcc3-c/Makefile
--- a/lang/gcc3-c/Makefile      Tue Jun 16 15:11:16 2009 +0000
+++ b/lang/gcc3-c/Makefile      Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
 
 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 -r b93a74af662d -r 65db42e79147 lang/gcc34/Makefile
--- a/lang/gcc34/Makefile       Tue Jun 16 15:11:16 2009 +0000
+++ b/lang/gcc34/Makefile       Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
 
 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 -r b93a74af662d -r 65db42e79147 math/R/Makefile.extension
--- a/math/R/Makefile.extension Tue Jun 16 15:11:16 2009 +0000
+++ b/math/R/Makefile.extension Tue Jun 16 15:25:31 2009 +0000
@@ -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_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 -r b93a74af662d -r 65db42e79147 misc/rubygems/Makefile
--- a/misc/rubygems/Makefile    Tue Jun 16 15:11:16 2009 +0000
+++ b/misc/rubygems/Makefile    Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
        ${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 -r b93a74af662d -r 65db42e79147 print/foomatic-ppds/Makefile
--- a/print/foomatic-ppds/Makefile      Tue Jun 16 15:11:16 2009 +0000
+++ b/print/foomatic-ppds/Makefile      Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
 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 -r b93a74af662d -r 65db42e79147 print/magicfilter/Makefile
--- a/print/magicfilter/Makefile        Tue Jun 16 15:11:16 2009 +0000
+++ b/print/magicfilter/Makefile        Tue Jun 16 15:25:31 2009 +0000
@@ -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 @@
        cd ${WRKSRC}/filters &&                                         \
        for f in *-filter; do                                           \
          ${ECHO} ${FILTER_DIR}/"$$f";                                  \
-       done                                                            \
+       done;
 
 post-install:
        set -e;                                                         \



Home | Main Index | Thread Index | Old Index