pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc cleanup: replaced _PKG_SILENT and _PKG_DEBUG with RUN.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c2c61f4ca8f
branches:  trunk
changeset: 393021:7c2c61f4ca8f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat May 16 07:22:01 2009 +0000

description:
cleanup: replaced _PKG_SILENT and _PKG_DEBUG with RUN.

diffstat:

 databases/postgresql81-client/Makefile    |   8 ++++----
 databases/postgresql81-server/Makefile    |   8 ++++----
 databases/postgresql82-client/Makefile    |   6 +++---
 databases/postgresql82-server/Makefile    |   8 ++++----
 databases/postgresql83-client/Makefile    |   6 +++---
 databases/postgresql83-server/Makefile    |   8 ++++----
 databases/shared-mime-info/buildlink3.mk  |   4 ++--
 devel/GConf/buildlink3.mk                 |   4 ++--
 devel/guile-fcgi/Makefile                 |   6 +++---
 devel/libltdl/convenience.mk              |   6 +++---
 editors/kdissert/Makefile                 |   8 ++++----
 fonts/ms-ttf/Makefile                     |   4 ++--
 graphics/hicolor-icon-theme/buildlink3.mk |   6 +++---
 graphics/kphotools/Makefile               |   4 ++--
 graphics/lcms/buildlink3.mk               |   6 +++---
 lang/ocaml/buildlink3.mk                  |   6 +++---
 lang/perl5/module.mk                      |   6 +++---
 lang/perl5/packlist.mk                    |   4 ++--
 lang/ruby/buildlink3.mk                   |  12 ++++++------
 lang/ruby/modules.mk                      |  24 ++++++++++++------------
 20 files changed, 72 insertions(+), 72 deletions(-)

diffs (truncated from 534 to 300 lines):

diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql81-client/Makefile
--- a/databases/postgresql81-client/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql81-client/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/06/20 08:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=       postgresql81-client-${BASE_VERS}
 COMMENT=       PostgreSQL database client programs
@@ -73,9 +73,9 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
 
@@ -84,7 +84,7 @@
                FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO          \
                bug.template;                                           \
        do                                                              \
-               ${INSTALL_DATA} $$file ${DESTDIR}${PG_DOC_DIR}/$$file;          \
+               ${INSTALL_DATA} $$file ${DESTDIR}${PG_DOC_DIR}/$$file;  \
         done
        cp -R ${WRKSRC}/doc/TODO.detail ${DESTDIR}${PG_DOC_DIR}
        chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PG_DOC_DIR}/TODO.detail
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql81-server/Makefile
--- a/databases/postgresql81-server/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql81-server/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/20 08:27:58 adam Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=       postgresql81-server-${BASE_VERS}
 COMMENT=       PostgreSQL database server programs
@@ -84,12 +84,12 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/port &&                                        \
                env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql82-client/Makefile
--- a/databases/postgresql82-client/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql82-client/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/20 19:43:56 sketch Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=       postgresql82-client-${BASE_VERS}
 COMMENT=       PostgreSQL database client programs
@@ -75,9 +75,9 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
 
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql82-server/Makefile
--- a/databases/postgresql82-server/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql82-server/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/04/05 16:40:08 adam Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=       postgresql82-server-${BASE_VERS}
 COMMENT=       PostgreSQL database server programs
@@ -84,12 +84,12 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/port &&                                        \
                env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql83-client/Makefile
--- a/databases/postgresql83-client/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql83-client/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/01/20 19:43:56 sketch Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/16 07:22:02 rillig Exp $
 
 PKGNAME=       postgresql83-client-${BASE_VERS}
 COMMENT=       PostgreSQL database client programs
@@ -72,9 +72,9 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
 
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/postgresql83-server/Makefile
--- a/databases/postgresql83-server/Makefile    Sat May 16 07:21:05 2009 +0000
+++ b/databases/postgresql83-server/Makefile    Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/07 17:55:42 adam Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/16 07:22:02 rillig Exp $
 
 PKGNAME=       postgresql83-server-${BASE_VERS}
 COMMENT=       PostgreSQL database server programs
@@ -85,12 +85,12 @@
 .endif
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD}                                           \
        cd ${WRKSRC}/src/backend &&                                     \
-       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}     \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}             \
                ../../src/include/parser/parse.h                        \
                ../../src/include/utils/fmgroids.h
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN}${_ULIMIT_CMD}                                            \
        cd ${WRKSRC}/src/port &&                                        \
                env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff -r 931e1293e33d -r 7c2c61f4ca8f databases/shared-mime-info/buildlink3.mk
--- a/databases/shared-mime-info/buildlink3.mk  Sat May 16 07:21:05 2009 +0000
+++ b/databases/shared-mime-info/buildlink3.mk  Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/05/16 07:22:02 rillig Exp $
 
 BUILDLINK_TREE+=       shared-mime-info
 
@@ -15,7 +15,7 @@
 
 .PHONY: shared-mime-info-buildlink-fake
 shared-mime-info-buildlink-fake:
-       ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
+       ${RUN} \
        if [ ! -f ${_SMI_FAKE_UPDATEDB:Q} ]; then                       \
                ${ECHO_BUILDLINK_MSG} "Creating "${_SMI_FAKE_UPDATEDB:Q}; \
                ${MKDIR} ${_SMI_FAKE_UPDATEDB:H};                       \
diff -r 931e1293e33d -r 7c2c61f4ca8f devel/GConf/buildlink3.mk
--- a/devel/GConf/buildlink3.mk Sat May 16 07:21:05 2009 +0000
+++ b/devel/GConf/buildlink3.mk Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/05/16 07:22:02 rillig Exp $
 
 BUILDLINK_TREE+=       GConf
 
@@ -22,7 +22,7 @@
 
 .PHONY: GConf-buildlink-fake
 GConf-buildlink-fake:
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN} \
        if [ ! -f ${_GCONF_FAKE} ]; then                                \
                ${ECHO_BUILDLINK_MSG} "Creating ${_GCONF_FAKE}";        \
                ${MKDIR} ${_GCONF_FAKE:H};                              \
diff -r 931e1293e33d -r 7c2c61f4ca8f devel/guile-fcgi/Makefile
--- a/devel/guile-fcgi/Makefile Sat May 16 07:21:05 2009 +0000
+++ b/devel/guile-fcgi/Makefile Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/07/14 12:56:01 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/16 07:22:02 rillig Exp $
 
 DISTNAME=      guile-fcgi-0.1
 PKGREVISION=   7
@@ -17,8 +17,8 @@
 CONFIGURE_ARGS+=--with-fcgi-lib=${BUILDLINK_PREFIX.fcgi}/lib
 
 do-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} guile-fcgi.x
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+       ${RUN} cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} guile-fcgi.x
+       ${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 
 .include "../../lang/guile/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
diff -r 931e1293e33d -r 7c2c61f4ca8f devel/libltdl/convenience.mk
--- a/devel/libltdl/convenience.mk      Sat May 16 07:21:05 2009 +0000
+++ b/devel/libltdl/convenience.mk      Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: convenience.mk,v 1.9 2006/10/05 12:41:24 rillig Exp $
+# $NetBSD: convenience.mk,v 1.10 2009/05/16 07:22:02 rillig Exp $
 #
 # Override "libltdlc.la" -- the libltdl "convenience" library embedded into
 # programs that ship with libltdl.  Also override packages attempting to
@@ -12,7 +12,7 @@
 fix-libltdlc:
        @${STEP_MSG} 'Fixing libltdl convenience library linkage.'
 .for sd in ${LIBLTDL_CONVENIENCE_SUBDIR}
-       ${_PKG_SILENT}${_PKG_DEBUG} set -e;                             \
+       ${RUN}                                                          \
        cd ${WRKSRC}/${sd};                                             \
        rm -f Makefile Makefile.in Makefile.am configure* ltdl.h *.la;  \
        { ${ECHO} "# Generated by devel/libltdl/convenience.mk";        \
@@ -23,7 +23,7 @@
        ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdl.la;            \
        ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdlc.la
 .  if ${OPSYS} == "Darwin"
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        cd ${WRKSRC}/${sd} &&                                           \
        ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.dylib libltdlc.dylib
 .  endif
diff -r 931e1293e33d -r 7c2c61f4ca8f editors/kdissert/Makefile
--- a/editors/kdissert/Makefile Sat May 16 07:21:05 2009 +0000
+++ b/editors/kdissert/Makefile Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/02/27 19:51:13 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:02 rillig Exp $
 #
 
 DISTNAME=              kdissert-1.0.7
@@ -16,16 +16,16 @@
 PYTHON_FOR_BUILD_ONLY= yes
 
 do-configure:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \
+       ${RUN} ${_ULIMIT_CMD} \
        cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
        ${PYTHONBIN} waf configure --prefix=${PTEFIX}
 
 do-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD} \
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} waf
 
 do-install:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       ${RUN} ${_ULIMIT_CMD} \
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
        ${PYTHONBIN} waf install
 
diff -r 931e1293e33d -r 7c2c61f4ca8f fonts/ms-ttf/Makefile
--- a/fonts/ms-ttf/Makefile     Sat May 16 07:21:05 2009 +0000
+++ b/fonts/ms-ttf/Makefile     Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:03 rillig Exp $
 
 DISTNAME=      # empty
 PKGNAME=       ms-ttf-20020306
@@ -39,7 +39,7 @@
 INSTALLATION_DIRS=     ${FONTDIR} ${DOCDIR}
 
 post-extract:
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        for f in ${WRKSRC}/*.TTF ; do                                   \
                ${MV} $$f `echo $$f | ${SED} 's|TTF$$|ttf|'`;           \
        done
diff -r 931e1293e33d -r 7c2c61f4ca8f graphics/hicolor-icon-theme/buildlink3.mk
--- a/graphics/hicolor-icon-theme/buildlink3.mk Sat May 16 07:21:05 2009 +0000
+++ b/graphics/hicolor-icon-theme/buildlink3.mk Sat May 16 07:22:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/05/16 07:22:03 rillig Exp $
 
 BUILDLINK_TREE+=       hicolor-icon-theme
 
@@ -38,9 +38,9 @@
 
 .PHONY: guic-buildlink-fake
 guic-buildlink-fake:
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        if [ ! -f ${_GUIC_FAKE} ]; then                                 \
-               ${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}"; \
+               ${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}";         \
                ${MKDIR} ${_GUIC_FAKE:H};                               \
                ${ECHO} "#!${SH}" > ${_GUIC_FAKE};                      \
                ${CHMOD} +x ${_GUIC_FAKE};                              \
diff -r 931e1293e33d -r 7c2c61f4ca8f graphics/kphotools/Makefile
--- a/graphics/kphotools/Makefile       Sat May 16 07:21:05 2009 +0000



Home | Main Index | Thread Index | Old Index