From fe2fe99021135aa7c941001b7ce1f51fa68951ee Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 14 Mar 2006 20:43:23 +0000 Subject: USE_PKGINSTALL isn't needed here to make these packagse use the pkginstall framework. In the case of libtool-base, avoid using FILES_SUBST_SED where it isn't needed. --- comms/asterisk/Makefile | 3 +-- devel/libtool-base/Makefile | 8 ++++---- lang/gcc3-c++/Makefile | 3 +-- mail/msmtp/Makefile | 3 +-- mail/perdition/Makefile | 3 +-- net/aiccu/Makefile | 3 +-- net/nagios-base/Makefile.common | 3 +-- net/nagios-nsca/Makefile.common | 3 +-- net/vpnc/Makefile | 3 +-- security/base/Makefile | 3 +-- www/drupal/Makefile | 3 +-- x11/matchbox-desktop/Makefile | 3 +-- x11/xorg-clients/Makefile | 3 +-- 13 files changed, 16 insertions(+), 28 deletions(-) diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 54c22781a2c..849714485d2 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:27 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/03/14 20:43:23 jlam Exp $ DISTNAME= asterisk-1.2.4 # PKGREVISION= 1 @@ -62,7 +62,6 @@ SUBST_SED.asterisk= \ .include "options.mk" -USE_PKGINSTALL= yes RCD_SCRIPTS= asterisk OWN_DIRS+= ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR} OWN_DIRS+= ${ASTLOGDIR}/cdr-csv diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 4b5e1e3a59f..305c79ad4ee 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2006/02/28 23:34:46 joerg Exp $ +# $NetBSD: Makefile,v 1.77 2006/03/14 20:43:23 jlam Exp $ ########################################################################### ########################################################################### @@ -83,10 +83,10 @@ PLIST_SUBST+= SHLIBTOOL="@comment " .else PLIST_SUBST+= SHLIBTOOL= -USE_PKGINSTALL= YES # for FILES_SUBST defaults - post-build: - @${SED} ${FILES_SUBST_SED} <${FILESDIR}/shlibtool.in >${WRKSRC}/shlibtool + @${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \ + -e "s|@SH@|"${SH:Q}"|g" \ + ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool post-install: ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile index 0ba5f74bd03..0233ffa6d3b 100644 --- a/lang/gcc3-c++/Makefile +++ b/lang/gcc3-c++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:44 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 20:43:23 jlam Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION} PKGREVISION= 1 @@ -12,7 +12,6 @@ INSTLIBS= libstdc++-v3/libsupc++/libsupc++.la \ CONFIGURE_ARGS+= --enable-languages="c++" MAKE_ENV+= ALL_GCC_CXX=${ALL_GCC_CXX:Q} -USE_PKGINSTALL= yes do-build: cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++ diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 1c9055ff1f5..2f9025ed537 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/01/14 20:08:20 ben Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 20:43:23 jlam Exp $ DISTNAME= msmtp-1.4.5 CATEGORIES= mail @@ -10,7 +10,6 @@ HOMEPAGE= http://msmtp.sourceforge.net/ COMMENT= SMTP plugin for MUAs GNU_CONFIGURE= yes -USE_PKGINSTALL= yes USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index 88a31f9a2c0..b556b729641 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 16:06:29 tv Exp $ +# $NetBSD: Makefile,v 1.7 2006/03/14 20:43:23 jlam Exp $ # PKGREVISION= 5 @@ -7,7 +7,6 @@ PERDITION_COMMENT= main program .include "options.mk" -USE_PKGINSTALL= YES OWN_DIRS+= ${PKG_SYSCONFDIR} .for f in Makefile.popmap perdition.conf popmap popmap.re CONF_FILES+= ${EGDIR}/perdition/$f ${PKG_SYSCONFDIR}/${f:.popmap=} diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile index bea05ff4310..c511a1aa0c9 100644 --- a/net/aiccu/Makefile +++ b/net/aiccu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:22 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/03/14 20:43:23 jlam Exp $ DISTNAME= aiccu_2005.01.31 PKGNAME= ${DISTNAME:S/_/-/:S/.//g} @@ -19,7 +19,6 @@ SUBST_STAGE.sysconfdir= post-patch SUBST_FILES.sysconfdir= common/aiccu.h SUBST_SED.sysconfdir= -e 's,/etc/aiccu.conf,${PKG_SYSCONFDIR}/aiccu.conf,' -USE_PKGINSTALL= yes EXAMPLESDIR= ${PREFIX}/share/examples/aiccu DOCDIR= ${PREFIX}/share/doc/aiccu CONF_FILES= ${EXAMPLESDIR}/aiccu.conf ${PKG_SYSCONFDIR}/aiccu.conf diff --git a/net/nagios-base/Makefile.common b/net/nagios-base/Makefile.common index 53b1cf43ffa..d392cbdc193 100644 --- a/net/nagios-base/Makefile.common +++ b/net/nagios-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $ +# $NetBSD: Makefile.common,v 1.2 2006/03/14 20:43:23 jlam Exp $ # NAGIOS_USER?= nagios @@ -10,7 +10,6 @@ NAGIOSADM_GROUP?= ${NAGIOSADM_USER} USE_X11= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_PKGINSTALL= YES PKG_SYSCONFSUBDIR= nagios diff --git a/net/nagios-nsca/Makefile.common b/net/nagios-nsca/Makefile.common index 94ecca9ed5d..fb7a809e1f4 100644 --- a/net/nagios-nsca/Makefile.common +++ b/net/nagios-nsca/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2006/02/18 17:13:45 bouyer Exp $ +# $NetBSD: Makefile.common,v 1.2 2006/03/14 20:43:23 jlam Exp $ # NAGIOS_USER?= nagios @@ -11,7 +11,6 @@ NAGIOSADM_GROUP?= ${NAGIOSADM_USER} USE_X11= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_PKGINSTALL= YES PKG_SYSCONFSUBDIR= nagios diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index fd5c7fde1a9..d4bd3bde306 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:32 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 20:43:23 jlam Exp $ # DISTNAME= vpnc-0.3.3 @@ -16,7 +16,6 @@ USE_TOOLS+= gmake BUILD_TARGET= vpnc INSTALLATION_DIRS= bin man/man8 -USE_PKGINSTALL= yes EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc.conf CONF_FILES+= ${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc-script diff --git a/security/base/Makefile b/security/base/Makefile index 0076d67461b..9591a660a40 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/13 13:11:05 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2006/03/14 20:43:23 jlam Exp $ # DISTNAME= base-1.2.2 @@ -21,7 +21,6 @@ DEPENDS+= pear-Image_Color-[0-9]*:../../graphics/pear-Image_Color DEPENDS+= pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph NO_BUILD= YES -USE_PKGINSTALL= YES DOC_FILES= CHANGELOG CREDITS README README.mssql TODO UPGRADE base_faq.rtf BASE_DIR= ${PREFIX}/share/base diff --git a/www/drupal/Makefile b/www/drupal/Makefile index f6710a7a79e..2d1966eafa3 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/14 16:48:48 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2006/03/14 20:43:23 jlam Exp $ DISTNAME= drupal-4.6.6 CATEGORIES= www @@ -12,7 +12,6 @@ DEPENDS+= ap-php>=4.3.3:../../www/ap-php DEPENDS+= php-gd>=4.3.3:../../graphics/php-gd NO_BUILD= YES -USE_PKGINSTALL= YES DRUPAL= ${PREFIX}/share/drupal PAX_DIRS= database includes misc modules scripts themes diff --git a/x11/matchbox-desktop/Makefile b/x11/matchbox-desktop/Makefile index fa5a8cb3079..5ab935e8107 100644 --- a/x11/matchbox-desktop/Makefile +++ b/x11/matchbox-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/04 21:31:10 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/03/14 20:43:23 jlam Exp $ # DISTNAME= matchbox-desktop-0.9.1 @@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://project.o-hand.com/matchbox/ COMMENT= Desktop manager for Matchbox -USE_PKGINSTALL= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 17fe56eb7e4..73cbaa3f797 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/02/14 16:10:40 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2006/03/14 20:43:24 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -13,7 +13,6 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org client programs and related files -USE_PKGINSTALL= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches -- cgit v1.2.3