 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../databases/postgresql81/Makefile.common"
 USE_TOOLS+=		gzip tar
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-zlib
 @@ -63,30 +63,30 @@ USE_GNU_READLINE=	yes
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # On Solaris, avoid conflicts between "${SSLBASE}/include/openssl/des.h"
 # and "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 .if ${OPSYS} == "SunOS"
 post-wrapper:
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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
 post-install:
 	cd ${WRKSRC}/doc; for file in					\
 		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
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 .include "../../databases/postgresql81/Makefile.common"
 # Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
 USE_LIBTOOL=		yes
 @@ -74,23 +74,23 @@ RCD_SCRIPTS=		pgsql
 .include "../../databases/postgresql81-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # Avoid conflict between "${SSLBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 post-wrapper:
 .if ${OPSYS} == "SunOS"
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../databases/postgresql82/Makefile.common"
 USE_TOOLS+=		gzip tar
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-zlib
 @@ -65,29 +65,29 @@ USE_GNU_READLINE=	yes
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # On Solaris, avoid conflicts between "${SSLBASE}/include/openssl/des.h"
 # and "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 .if ${OPSYS} == "SunOS"
 post-wrapper:
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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
 post-install:
 	cd ${WRKSRC}/doc; for file in					\
 		FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO		\
 		bug.template;						\
 	do								\
 		${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

 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 .include "../../databases/postgresql82/Makefile.common"
 # Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
 USE_LIBTOOL=		yes
 @@ -74,23 +74,23 @@ RCD_SCRIPTS=		pgsql
 .include "../../databases/postgresql82-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # Avoid conflict between "${SSLBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 post-wrapper:
 .if ${OPSYS} == "SunOS"
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../databases/postgresql83/Makefile.common"
 USE_TOOLS+=		gzip tar
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-zlib
 @@ -62,29 +62,29 @@ USE_GNU_READLINE=	yes
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # On Solaris, avoid conflicts between "${SSLBASE}/include/openssl/des.h"
 # and "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 .if ${OPSYS} == "SunOS"
 post-wrapper:
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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
 post-install:
 	cd ${WRKSRC}/doc; for file in					\
 		FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO		\
 		bug.template;						\
 	do								\
 		${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

 @@ -1,14 +1,14 @@
-# $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
 PKG_DESTDIR_SUPPORT=	user-destdir
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 .include "../../databases/postgresql83/Makefile.common"
 # Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
 USE_LIBTOOL=		yes
 @@ -75,23 +75,23 @@ RCD_SCRIPTS=		pgsql
 .include "../../databases/postgresql83-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # Avoid conflict between "${SSLBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
+#
 post-wrapper:
 .if ${OPSYS} == "SunOS"
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .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}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,31 +1,31 @@
-# $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
 .if !defined(SHARED_MIME_INFO_BUILDLINK3_MK)
 SHARED_MIME_INFO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
 BUILDLINK_ABI_DEPENDS.shared-mime-info+=	shared-mime-info>=0.16nb2
 BUILDLINK_PKGSRCDIR.shared-mime-info?=	../../databases/shared-mime-info
 BUILDLINK_TARGETS+=	shared-mime-info-buildlink-fake
 _SMI_FAKE_UPDATEDB=	${BUILDLINK_DIR}/bin/update-mime-database
 .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};			\
 		${ECHO} "#!/bin/sh" > ${_SMI_FAKE_UPDATEDB};		\
 		${ECHO} 'if [ "$$1" = "-v" ]; then' ${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database "-v; fi" >> ${_SMI_FAKE_UPDATEDB};		\
 		${ECHO} "echo '[pkgsrc] Doing nothing for update-mime-database' \$$*" >> ${_SMI_FAKE_UPDATEDB};		\
 		${CHMOD} +x ${_SMI_FAKE_UPDATEDB};			\
 	fi
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # SHARED_MIME_INFO_BUILDLINK3_MK

 @@ -1,34 +1,34 @@
-# $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
 .if !defined(GCONF_BUILDLINK3_MK)
 GCONF_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.8.0.1
 BUILDLINK_ABI_DEPENDS.GConf?=	GConf>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
 BUILDLINK_TARGETS+=	GConf-buildlink-fake
 _GCONF_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
 .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};				\
 		${ECHO} "#!${SH}" > ${_GCONF_FAKE};			\
 		${CHMOD} +x ${_GCONF_FAKE};				\
 	fi
 .endif # GCONF_BUILDLINK3_MK
 BUILDLINK_TREE+=	-GConf

 @@ -1,32 +1,32 @@
-# $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
 # build and install the full "libltdl.la".
 LIBLTDL_CONVENIENCE_SUBDIR?=	libltdl
 .include "../../mk/bsd.prefs.mk"
 post-patch: fix-libltdlc
 .PHONY: fix-libltdlc
 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";	\
 	  ${ECHO} "all install clean check:";				\
 	} > Makefile.in;						\
 	cp Makefile.in Makefile;					\
 	${LN} -s ${BUILDLINK_DIR}/include/ltdl.h ltdl.h;		\
 	${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
 .endfor
 .include "../../devel/libltdl/buildlink3.mk"

 @@ -1,36 +1,36 @@
-# $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
 CATEGORIES=		editors
 MASTER_SITES=		http://freehackers.org/~tnagy/kdissert/
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://freehackers.org/~tnagy/kdissert/
 COMMENT=		Mindmapping-like tool to generate text templates
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		msgfmt
 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
 .include "../../lang/python/application.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 PKGREVISION=	5
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=corefonts/}
 DISTFILES=	andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
 		verdan32.exe comic32.exe arialb32.exe impact32.exe \
 		arial32.exe times32.exe courie32.exe
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://corefonts.sourceforge.net/
 COMMENT=	TrueType fonts from Microsoft
 @@ -29,25 +29,25 @@ NO_BUILD=	yes
 USE_X11BASE=	yes
 DIST_SUBDIR=	ms-ttf
 EVAL_PREFIX+=	CABEXTRACT_PREFIX=cabextract
 CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
 EXTRACT_CMD=	${CABEXTRACT_PREFIX}/bin/cabextract -q $${extract_file}
 FONTDIR=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/ms-ttf
 FONTS_DIRS.ttf=	${FONTDIR}
 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
 do-install:
 	cd ${WRKSRC} && for f in *.ttf ; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f; \
 	done
 	${INSTALL_DATA} ${.CURDIR}/../../licenses/${LICENSE} ${DESTDIR}${DOCDIR}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 .if !defined(HICOLOR_ICON_THEME_BUILDLINK3_MK)
 HICOLOR_ICON_THEME_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.4
 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.9nb1
 BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
 .include "../../mk/bsd.fast.prefs.mk"
 dirs!=	${GREP} "^@dirrm" ${.CURDIR}/../../graphics/hicolor-icon-theme/PLIST | \
 @@ -28,24 +28,24 @@ INSTALL_TEMPLATES+=	../../graphics/hicol
 DEINSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
 # The icon-theme cache file generated by gtk-update-icon-cache should
 # never be in any PLIST.
+#
 PRINT_PLIST_AWK+=	/^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
 CHECK_FILES_SKIP+=	${PREFIX}/share/icons/hicolor/icon-theme.cache
 BUILDLINK_TARGETS+=	guic-buildlink-fake
 _GUIC_FAKE=		${BUILDLINK_DIR}/bin/gtk-update-icon-cache
 .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};				\
 	fi
 .endif	# HICOLOR_ICON_THEME_DEPEND_ONLY
 .endif # HICOLOR_ICON_THEME_BUILDLINK3_MK
 BUILDLINK_TREE+=	-hicolor-icon-theme

 @@ -1,37 +1,37 @@
-# $NetBSD: Makefile,v 1.17 2008/01/18 05:06:41 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/16 07:22:03 rillig Exp $
+#
 DISTNAME=	kphotools-0.2.1
 PKGREVISION=	11
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kphotools/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://kphotools.sourceforge.net/
 COMMENT=	KDE app which helps you creating fast online photo galleries in HTML
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 SUBST_CLASSES+=		kphotools
 SUBST_MESSAGE.kphotools=	Fixing /usr/share path.
 SUBST_FILES.kphotools=	src/GalleryThrd.cpp src/LogoWid.cpp src/LogoWid.ui src/StyleWid.ui.h
 SUBST_SED.kphotools=	-e 's|@kphotoolsdir@|${KDEDIR}/share/kde/apps/kphotools|'
 SUBST_STAGE.kphotools=	post-patch
 post-configure:
-	${_PKG_DEBUG}${_PKG_SILENT}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/
+	${RUN}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,45 +1,45 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/05/16 07:22:03 rillig Exp $
 BUILDLINK_TREE+=	ocaml
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.09.1nb2
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=	build
 .  include "../../mk/bsd.fast.prefs.mk"
 .  if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=		yes
 .  endif
 PRINT_PLIST_AWK+=	/^@dirrm lib\/ocaml$$/ \
 				{ print "@comment in ocaml: " $$0; next }
 BUILDLINK_TARGETS+=	ocaml-wrappers
 OCAML_WRAPPERS=		ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
 			ocamlopt ocamlopt.opt
 OCAMLBIN_WRAPPERS=	ocaml
 .PHONY: ocaml-wrappers
 ocaml-wrappers:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for w in ${OCAML_WRAPPERS}; do					\
 		${SED}	-e 's|@SH@|'${SH:Q}'|g'				\
 			-e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
 			-e 's|@CFLAGS@|'${CFLAGS:Q}'|g'			\
 			-e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g'		\
 			< ${.CURDIR}/../../lang/ocaml/files/wrapper.sh	\
 			> ${BUILDLINK_DIR}/bin/"$$w";			\
 		${CHMOD} +x ${BUILDLINK_DIR}/bin/"$$w";			\
 	done
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for w in ${OCAMLBIN_WRAPPERS}; do				\
 		${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w"		\
 		         ${BUILDLINK_DIR}/bin/"$$w";			\
 	done
 .endif # OCAML_BUILDLINK3_MK
 BUILDLINK_TREE+=	-ocaml

 @@ -1,14 +1,14 @@
-# $NetBSD: module.mk,v 1.58 2009/03/21 23:11:29 sno Exp $
+# $NetBSD: module.mk,v 1.59 2009/05/16 07:22:04 rillig Exp $
+#
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
+#
 # The following targets are provided by this file:
+#
 # perl5-configure	runs the standard perl configuration in
 #			each of the directories specified in
 #			${PERL5_CONFIGURE_DIRS}.
+#
 # do-configure		runs the perl5-configure target; if PERL5_CONFIGURE
 #			is set to "YES", then this target overrides the
 #			default do-configure provided by bsd.pkg.mk.
 @@ -83,39 +83,39 @@ PERL5_CONFIGURE_DIRS?=	${CONFIGURE_DIRS}
 MAKE_ENV+=	LC_ALL=C
 # All pkgsrc-installed Perl modules are installed into the "vendor"
 # directories.
+#
 MAKE_PARAMS.makemaker+=	INSTALLDIRS=vendor
 MAKE_PARAMS.modbuild+=	installdirs=vendor
 MAKE_PARAMS+=	${MAKE_PARAMS.${_PERL5_MODTYPE}}
 .PHONY: do-makemaker-configure
 do-makemaker-configure:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for dir in ${PERL5_CONFIGURE_DIRS}; do				\
 		cd ${WRKSRC};						\
 		if ${TEST} -f "$$dir"/Makefile.PL; then			\
 			cd "$$dir";					\
 			${SETENV} ${MAKE_ENV}				\
 				${BUILDLINK_PREFIX.perl}/bin/perl Makefile.PL ${MAKE_PARAMS};	\
 		fi;							\
 	done
 .PHONY: do-modbuild-configure
 do-modbuild-configure:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for dir in ${PERL5_CONFIGURE_DIRS}; do				\
 		cd ${WRKSRC};						\
 		if ${TEST} -f "$$dir"/Build.PL; then			\
 			cd "$$dir";					\
 			${SETENV} ${MAKE_ENV}				\
 				${BUILDLINK_PREFIX.perl}/bin/perl Build.PL ${MAKE_PARAMS};	\
 		fi;							\
 	done
 .PHONY: perl5-configure
 perl5-configure: do-${_PERL5_MODTYPE}-configure
 .if !empty(PERL5_CONFIGURE:M[yY][eE][sS])

 @@ -1,14 +1,14 @@
-# $NetBSD: packlist.mk,v 1.12 2007/01/15 05:36:04 rillig Exp $
+# $NetBSD: packlist.mk,v 1.13 2009/05/16 07:22:04 rillig Exp $
+#
 # This Makefile fragment is intended to be included by packages that
 # create packlist files.  This file is automatically included by
 # perl5/module.mk, so it is typically not necessary to include this
 # file.
+#
 # The following variables should be set prior to including this file:
+#
 # PERL5_USE_PACKLIST
 #	When set to "yes" (the default), automatically generates the
 #	PLIST for the pkgsrc package from the Perl packlist.
+#
 # PERL5_PACKLIST_DIR	"install*arch" directory under which packlist
 @@ -104,27 +104,27 @@ _PERL5_PACKLIST_AWK_STRIP_MANZ=						\
 	/${_PERL5_PACKLIST_MANPAGE_RE}\.gz/				\
 		{ $$1 = substr($$1, 1, length($$1) - 3); }
 _PERL5_PACKLIST_AWK_ADD_MANZ.no=	# empty
 _PERL5_PACKLIST_AWK_ADD_MANZ.yes=					\
 	/${_PERL5_PACKLIST_MANPAGE_RE}/	{ $$1 = $$1 ".gz"; }
 .if defined(_PERL5_PACKLIST)
 post-install: perl-packlist
 .endif
 .PHONY: perl-packlist
 perl-packlist:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	${TEST} -n ${_PERL5_PACKLIST:Q}"" || exit 0;			\
 	for file in ${_PERL5_PACKLIST}; do				\
 		if ${TEST} ! -f "$$file"; then				\
 			${ECHO} 1>&2 "Perl packlist $$file is missing."; \
 			exit 1;						\
 		fi;							\
 		${AWK} '${_PERL5_PACKLIST_AWK_STRIP_DESTDIR}		\
 			${_PERL5_PACKLIST_AWK_STRIP_MANZ}		\
 			${_PERL5_PACKLIST_AWK_ADD_MANZ.${_MANZ}}	\
 			{ print $$0 }'					\
 			$$file > $$file.new;				\
 		${MV} -f $$file.new $$file;				\
 	done

 @@ -1,14 +1,14 @@
-# $NetBSD: modules.mk,v 1.25 2009/02/15 03:20:03 taca Exp $
+# $NetBSD: modules.mk,v 1.26 2009/05/16 07:22:04 rillig Exp $
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
 .include "../../lang/ruby/rubyversion.mk"
 .if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
 DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
 .else
 .include "../../lang/ruby/buildlink3.mk"
 .endif
 CONFIGURE_ENV+=		RUBY=${RUBY:Q} RDOC=${RDOC:Q}
 @@ -29,115 +29,115 @@ CONFIGURE_ENV+=		RUBY=${RUBY:Q} RDOC=${R
 RUBY_EXTCONF?=		extconf.rb
 INSTALL_TARGET?=	site-install
 CONFIGURE_ARGS+=	${RUBY_EXTCONF_ARGS}
 RUBY_EXTCONF_ARGS?=	--with-opt-dir=${PREFIX:Q} --vendor
 RUBY_EXTCONF_CHECK?=	yes
 RUBY_EXTCONF_MAKEFILE?=	Makefile
 do-configure:	ruby-extconf-configure
 .if defined(RUBY_EXTCONF_SUBDIRS)
 ruby-extconf-configure:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .if empty(RUBY_EXTCONF_CHECK:M[nN][oO])
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 		${TEST} -f ${RUBY_EXTCONF_MAKEFILE}
 .endif
 .endfor
 .if !target(do-build)
 do-build:	ruby-extconf-build
 ruby-extconf-build:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Building ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${BUILD_TARGET}
+	${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${BUILD_TARGET}
 .endfor
 .endif
 .if !target(do-install)
 do-install:	ruby-extconf-install
 ruby-extconf-install:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Installing ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+	${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 .endfor
 .endif
 .else
 ruby-extconf-configure:
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .if empty(RUBY_EXTCONF_CHECK:M[nN][oO])
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 		${TEST} -f ${RUBY_EXTCONF_MAKEFILE}
 .endif
 .endif
+#
 # setup.rb support
+#
 # USE_RUBY_SETUP	Uset setup script.
 # USE_RUBY_SETUP_PKG	Use pkgsrc's ruby-setup package.
+#
 # RUBY_SETUP		specify setup script name (default: setup.rb).
+#
 .elif defined(USE_RUBY_SETUP) && empty(USE_RUBY_SETUP:M[nN][oO])
 RUBY_SETUP?=		setup.rb
 .if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO])
 BUILD_DEPENDS+=		${RUBY_PKGPREFIX}-setup>=3.4.0:../../devel/ruby-setup
 .endif
 .if !target(do-configure)
 do-configure:	ruby-setup-configure
 ruby-setup-configure:
 .if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO])
 	@${ECHO_MSG} "===>  Use pkgsrc's ruby-setup"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 		${CP} ${PREFIX}/${RUBY_VENDORLIB}/setup.rb ${RUBY_SETUP}
 .endif
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_SETUP} config ${CONFIGURE_ARGS}
 .endif
 .if !target(do-build)
 do-build:	ruby-setup-build
 ruby-setup-build:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to build"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup
 .endif
 .if !target(do-install)
 do-install:	ruby-setup-install
 _RUBY_SETUP_INSTALLARGS=   ${INSTALL_TARGET}
 .if ${_USE_DESTDIR} != "no"
 _RUBY_SETUP_INSTALLARGS+=   --prefix=${DESTDIR:Q}
 .endif
 ruby-setup-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to ${INSTALL_TARGET}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS}
 .endif
+#
 # install.rb support
+#
 # USE_RUBY_INSTALL	use simple install.rb script to install
 #			(default: undefined)
 # RUBY_SIMPLE_INSTALL	name of simple install.rb script (default: install.rb)
+#
 .elif defined(USE_RUBY_INSTALL) && empty(USE_RUBY_INSTALL:M[nN][oO])
 RUBY_SIMPLE_INSTALL?=	install.rb
 @@ -147,27 +147,27 @@ SUBST_CLASSES+=		rinstall
 SUBST_STAGE.rinstall=	pre-install
 SUBST_FILES.rinstall=	${RUBY_SIMPLE_INSTALL}
 SUBST_SED.rinstall=	-e "s|'sitedir'|'vendordir'|g"
 SUBST_SED.rinstall+=	-e "s|'sitelibdir'|'vendorlibdir'|g"
 SUBST_SED.rinstall+=	-e 's|"sitelibdir"|"vendorlibdir"|g'
 SUBST_SED.rinstall+=	-e 's|/site_ruby/|/vendor_ruby/|g'
 SUBST_MESSAGE.rinstall=	Fixing ${RUBY_SIMPLE_INSTALL} files.
 .if !target(do-install)
 do-install:	ruby-simple-install
 ruby-simple-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET}
 .endif
 .endif # USE_RUBY_INSTALL
 .include "replace.mk"
 PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITEARCHLIB:S|/|\\/|g}$$/ \
 			{ next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITELIB:S|/|\\/|g}$$/ \
 			{ next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_VENDORARCHLIB:S|/|\\/|g}$$/ \
 			{ next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_VENDORLIB:S|/|\\/|g}$$/ \

 @@ -1,25 +1,25 @@
-# $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
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# AWOL since 2003
 COMMENT=	Guile interface to FastCGI
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-fcgi-includes=${BUILDLINK_PREFIX.fcgi}/include
 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
+	${RUN} 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} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 .include "../../lang/guile/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,26 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/05/16 07:22:03 rillig Exp $
 BUILDLINK_TREE+=	lcms
 .if !defined(LCMS_BUILDLINK3_MK)
 LCMS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.lcms+=	lcms>=1.06
 BUILDLINK_ABI_DEPENDS.lcms+=	lcms>=1.12nb2
 BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
 BUILDLINK_TARGETS+=	buildlink-include-lcms
 .PHONY: buildlink-include-lcms
 buildlink-include-lcms:
 .for _h_ in lcms.h icc34.h
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then		\
-		${MKDIR} ${BUILDLINK_DIR}/include/lcms;	\
+		${MKDIR} ${BUILDLINK_DIR}/include/lcms;			\
 		${ECHO_BUILDLINK_MSG} "Linking lcms/${_h_} to ${_h_} in ${BUILDLINK_DIR}/include"; \
 		${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \
 	fi
 .endfor
 .endif # LCMS_BUILDLINK3_MK
 BUILDLINK_TREE+=	-lcms

 @@ -1,28 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/05/16 07:22:04 rillig Exp $
 .if !defined(_RUBYVERSION_MK)
 .include "../../lang/ruby/rubyversion.mk"
 .endif
 BUILDLINK_TREE+=	${RUBY_BASE}
 .if !defined(RUBY_BUILDLINK3_MK)
 RUBY_BUILDLINK3_MK:=
 .if !defined(_RUBYVERSION_MK)
 .include "../../lang/ruby/rubyversion.mk"
 .endif
 BUILDLINK_API_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_VERSION}
 BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	../../lang/${RUBY_BASE}
 BUILDLINK_FILES.${RUBY_BASE}+=		lib/libruby${RUBY_VER}.*
 BUILDLINK_FILES.${RUBY_BASE}+=	lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 BUILDLINK_TARGETS+=	buildlink-bin-ruby
 buildlink-bin-ruby:
-	${_PKG_SILENT}${_PKG_DEBUG} \
+	${RUN} \
 	f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_VER}"; \
 	if ${TEST} -f $$f; then \
 		${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
 	fi
 .endif # RUBY_BUILDLINK3_MK
 BUILDLINK_TREE+=	-${RUBY_BASE}