pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Move code that generates a dynamic PLIST from the {pre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6eef61040843
branches:  trunk
changeset: 534528:6eef61040843
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Oct 25 21:04:21 2007 +0000

description:
Move code that generates a dynamic PLIST from the {pre,do,post}-install
targets and into a GENERATE_PLIST variable definition.  Remove some
unnecessary empty PLISTs as a result of properly setting GENERATE_PLIST.

diffstat:

 fonts/adobe-cidfonts/Makefile      |  20 +++++++++-----------
 lang/gcc3-c/Makefile               |  16 +++++++---------
 lang/gcc34/Makefile                |  16 ++++++----------
 lang/ruby/Makefile                 |  19 ++++++++++++-------
 mail/thunderbird-bin-nightly/PLIST |   2 --
 print/foomatic-ppds/Makefile       |  21 ++++++++++-----------
 www/firefox-bin-nightly/PLIST      |   2 --
 www/firefox-bin/PLIST              |   2 --
 www/firefox15-bin/PLIST            |   2 --
 www/seamonkey-bin-nightly/PLIST    |   2 --
 www/seamonkey-bin/Makefile.common  |  20 +++++++++-----------
 www/seamonkey-bin/PLIST            |   2 --
 x11/kdelibdocs3/Makefile           |  14 +++++++-------
 13 files changed, 60 insertions(+), 78 deletions(-)

diffs (truncated from 310 to 300 lines):

diff -r a65cfca307ba -r 6eef61040843 fonts/adobe-cidfonts/Makefile
--- a/fonts/adobe-cidfonts/Makefile     Thu Oct 25 20:20:59 2007 +0000
+++ b/fonts/adobe-cidfonts/Makefile     Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/10/25 21:04:21 jlam Exp $
 
 DISTNAME=      adobe-cidfonts-20000901
 CATEGORIES=    fonts
@@ -30,9 +30,15 @@
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
-RESOURCEDIR=   ${PREFIX}/share/Adobe/Resource
+RESOURCESUBDIR=        share/Adobe/Resource
+RESOURCEDIR=   ${PREFIX}/${RESOURCESUBDIR}
 
-PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
+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}";
 
 do-install:
        ${INSTALL_DATA_DIR} ${RESOURCEDIR}/CIDFont
@@ -40,13 +46,5 @@
                ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file}      \
                        ${RESOURCEDIR}/CIDFont;                         \
        done
-       ${CAT} ${.CURDIR}/PLIST > ${PLIST_SRC}
-       ( for file in ${DISTFILES}; do                                  \
-               ${ECHO} ${RESOURCEDIR:S/^${PREFIX}\///}/CIDFont/$${file}; \
-         done;                                                         \
-       ) | ${SORT} -u >> ${PLIST_SRC}
-       ( ${ECHO} "@dirrm ${RESOURCEDIR:S/^${PREFIX}\///}/CIDFont";     \
-         ${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCEDIR:S/^${PREFIX}\///} 2>/dev/null || ${TRUE}";      \
-       ) >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff -r a65cfca307ba -r 6eef61040843 lang/gcc3-c/Makefile
--- a/lang/gcc3-c/Makefile      Thu Oct 25 20:20:59 2007 +0000
+++ b/lang/gcc3-c/Makefile      Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/10/13 15:06:29 heinz Exp $
+# $NetBSD: Makefile,v 1.23 2007/10/25 21:04:22 jlam Exp $
 
 PKGNAME=       gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 COMMENT=       GNU Compiler Collection, v3 - C compiler
@@ -11,7 +11,6 @@
 
 # The "gcc" frontend knows all languages (by patch)
 CONFIGURE_ARGS+=       --enable-languages=c
-PLIST_SRC=             ${WRKDIR}/PLIST_DYNAMIC
 
 MAKE_ENV+=     ALL_GCC=${ALL_GCC:Q}
 MAKE_ENV+=     ALL_GCC_C=${ALL_GCC_C:Q}
@@ -26,6 +25,12 @@
 post-build:
        ${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
 
+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";
+
 post-install:
 .if ${OPSYS} == "SunOS"
        cd ${DESTDIR:Q}${GCC_ARCHDIR}/include && ${RM} -f fixed
@@ -39,12 +44,5 @@
        ${INSTALL_DATA_DIR} ${DESTDIR:Q}${GCC_PREFIX}/mk
        ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${DESTDIR:Q}${GCC_PREFIX}/mk/c.mk
        ${LN} -f ${DESTDIR:Q}${GCC_PREFIX}/bin/gcc ${DESTDIR:Q}${GCC_PREFIX}/bin/cc
-       ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-       ${FIND} ${DESTDIR:Q}${GCC_PREFIX} \( -type f -o -type l \) -print \
-               | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"       \
-               >> ${PLIST_SRC}
-       ${FIND} ${DESTDIR:Q}${GCC_PREFIX} -type d -print                \
-               | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g" \
-               >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff -r a65cfca307ba -r 6eef61040843 lang/gcc34/Makefile
--- a/lang/gcc34/Makefile       Thu Oct 25 20:20:59 2007 +0000
+++ b/lang/gcc34/Makefile       Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/04/07 22:23:01 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.40 2007/10/25 21:04:22 jlam Exp $
 #
 
 DISTNAME=      gcc-${GCC_VERSION}
@@ -115,7 +115,6 @@
 HAS_CONFIGURE=         YES # no GNU_CONFIGURE!
 CONFIG_SHELL?=         ${SH}
 CONFIGURE_ENV+=                CONFIG_SHELL=${CONFIG_SHELL:Q}
-PLIST_SRC=             ${WRKDIR}/PLIST_DYNAMIC
 
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
 
@@ -226,14 +225,11 @@
                done )
 .endif
 
-post-install:
-       ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-       ${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}
+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";
 
 .include "../../mk/bsd.prefs.mk"
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
diff -r a65cfca307ba -r 6eef61040843 lang/ruby/Makefile
--- a/lang/ruby/Makefile        Thu Oct 25 20:20:59 2007 +0000
+++ b/lang/ruby/Makefile        Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/09/09 14:20:26 taca Exp $
+# $NetBSD: Makefile,v 1.45 2007/10/25 21:04:22 jlam Exp $
 
 DISTNAME=      # empty
 PKGNAME=       ruby-${RUBY_VERSION_SUFFIX}
@@ -14,7 +14,6 @@
 NO_CHECKSUM=   yes
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
-PLIST_SRC=     ${WRKDIR}/PLIST
 
 .include "../../lang/ruby/rubyversion.mk"
 
@@ -27,15 +26,21 @@
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
+.if ${RUBY_NAME} == "ruby"
+GENERATE_PLIST+=       ${ECHO} "@comment This plist intentionally left empty";
+.else
+.  for f in ${RUBY_COMMANDS}
+GENERATE_PLIST+=       ${ECHO} bin/${f};
+.  endfor
+GENERATE_PLIST+=       ${ECHO} man/man1/ruby.1;
+.endif
+
 do-install:
-       ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 .if ${RUBY_NAME} != "ruby"
-.for f in ${RUBY_COMMANDS}
+.  for f in ${RUBY_COMMANDS}
        ${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f}
-       ${ECHO} bin/${f} >> ${PLIST_SRC}
-.endfor
+.  endfor
        ${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/${PKGMANDIR}/man1/ruby.1
-       ${ECHO} man/man1/ruby.1 >> ${PLIST_SRC}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r a65cfca307ba -r 6eef61040843 mail/thunderbird-bin-nightly/PLIST
--- a/mail/thunderbird-bin-nightly/PLIST        Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:01 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 print/foomatic-ppds/Makefile
--- a/print/foomatic-ppds/Makefile      Thu Oct 25 20:20:59 2007 +0000
+++ b/print/foomatic-ppds/Makefile      Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/03/14 12:12:57 markd Exp $
+# $NetBSD: Makefile,v 1.6 2007/10/25 21:04:23 jlam Exp $
 
 .include "Makefile.common"
 
@@ -20,19 +20,18 @@
 DEPENDS=       foomatic-filters>=3.0.2:../../print/foomatic-filters
 
 REQD_DIRS=     share/foomatic
-PLIST_SRC=     ${WRKDIR}/PLIST_SRC
 
 CHECK_PORTABILITY_SKIP=                install
 
-do-build:
-       ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
-       cd ${WRKSRC}/share;                                             \
-       ${FIND} ppd -type f -print | ${SORT} -u |                       \
-       ${SED} -e "s|^|share/foomatic/|" >> ${PLIST_SRC}
-       cd ${WRKSRC}/share;                                             \
-       ${FIND} ppd -type d -print | ${SORT} -ur |                      \
-       ${SED} -e "s|^|@dirrm share/foomatic/|" >> ${PLIST_SRC}
-       ${ECHO} "@dirrm share/foomatic" >> ${PLIST_SRC}
+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" );
+
+do-build:      # nothing
 
 do-install:
        ${CP} -R ${WRKSRC}/share/ppd ${PREFIX}/share/foomatic/ppd
diff -r a65cfca307ba -r 6eef61040843 www/firefox-bin-nightly/PLIST
--- a/www/firefox-bin-nightly/PLIST     Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 www/firefox-bin/PLIST
--- a/www/firefox-bin/PLIST     Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 www/firefox15-bin/PLIST
--- a/www/firefox15-bin/PLIST   Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 www/seamonkey-bin-nightly/PLIST
--- a/www/seamonkey-bin-nightly/PLIST   Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:03 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 www/seamonkey-bin/Makefile.common
--- a/www/seamonkey-bin/Makefile.common Thu Oct 25 20:20:59 2007 +0000
+++ b/www/seamonkey-bin/Makefile.common Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2007/10/19 10:53:00 ghen Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/10/25 21:04:25 jlam Exp $
 
 DISTNAME=              ${MOZILLA}${MOX_EXTRA}-bin      # overridden below
 PKGNAME=               ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -61,7 +61,6 @@
 FILES_SUBST+=  MOZILLA=${MOZILLA:Q}
 FILES_SUBST+=  MOZ_EXTRA=${MOZ_EXTRA:Q}
 FILES_SUBST+=  MOZ_PLATFORM=${MOZ_PLATFORM:Q}
-PLIST_SRC=     ${WRKDIR}/PLIST_DYNAMIC
 
 INSTALLATION_DIRS=     bin
 
@@ -130,14 +129,13 @@
 .  endif
 .endif
        @${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins
-       @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-       @${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
-       @${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print         \
-               | ${SORT} | ${SED} -e "s,${PREFIX}/,,g"                 \
-               >> ${PLIST_SRC}
-       @${FIND} ${MOZILLA_LIB} -type d -print                          \
-               | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"       \
-               >> ${PLIST_SRC}
-       @${ECHO} @exec ${MKDIR} %D/lib/mozilla-linux/plugins >> ${PLIST_SRC}
+
+GENERATE_PLIST+=                                                       \
+       ${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM};             \
+       ${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print          \
+               | ${SORT} | ${SED} -e "s,${PREFIX}/,,g";                \
+       ${FIND} ${MOZILLA_LIB} -type d -print                           \
+               | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g";      \
+       ${ECHO} "@exec ${MKDIR} %D/lib/mozilla-linux/plugins";
 
 .include "../../mk/bsd.pkg.mk"
diff -r a65cfca307ba -r 6eef61040843 www/seamonkey-bin/PLIST
--- a/www/seamonkey-bin/PLIST   Thu Oct 25 20:20:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:03 jlam Exp $
-@comment this plist intentionally left empty
diff -r a65cfca307ba -r 6eef61040843 x11/kdelibdocs3/Makefile
--- a/x11/kdelibdocs3/Makefile  Thu Oct 25 20:20:59 2007 +0000
+++ b/x11/kdelibdocs3/Makefile  Thu Oct 25 21:04:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/10/20 10:37:48 markd Exp $
+# $NetBSD: Makefile,v 1.49 2007/10/25 21:04:25 jlam Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
 PKGNAME=       kdelibdocs-${_KDE_VERSION}
@@ -17,15 +17,15 @@
 
 UNLIMIT_RESOURCES+=    datasize
 SKIP_PORTABILITY_CHECK=        yes
-PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
+
+GENERATE_PLIST+=                                                       \
+       ( cd ${WRKSRC}/apidocs;                                         \
+         ${FIND} . -type f -print | ${GREP} -v "classmap.inc" |        \
+         ${GREP} -v "^./.*/.*/.*\.tag" | ${SORT} |                     \
+         ${SED} 's:^.:share/doc/kde/HTML/en/kdelibs-apidocs:' );
 



Home | Main Index | Thread Index | Old Index