pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc USE_PKGINSTALL isn't needed here to make these packags...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6b0159f5b118
branches: trunk
changeset: 509816:6b0159f5b118
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Mar 14 20:43:23 2006 +0000
description:
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.
diffstat:
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(-)
diffs (227 lines):
diff -r 9abd68ba3b9c -r 6b0159f5b118 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/comms/asterisk/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
.include "options.mk"
-USE_PKGINSTALL= yes
RCD_SCRIPTS= asterisk
OWN_DIRS+= ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR}
OWN_DIRS+= ${ASTLOGDIR}/cdr-csv
diff -r 9abd68ba3b9c -r 6b0159f5b118 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/devel/libtool-base/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
.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 -r 9abd68ba3b9c -r 6b0159f5b118 lang/gcc3-c++/Makefile
--- a/lang/gcc3-c++/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/lang/gcc3-c++/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
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 -r 9abd68ba3b9c -r 6b0159f5b118 mail/msmtp/Makefile
--- a/mail/msmtp/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/mail/msmtp/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
COMMENT= SMTP plugin for MUAs
GNU_CONFIGURE= yes
-USE_PKGINSTALL= yes
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff -r 9abd68ba3b9c -r 6b0159f5b118 mail/perdition/Makefile
--- a/mail/perdition/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/mail/perdition/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
.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 -r 9abd68ba3b9c -r 6b0159f5b118 net/aiccu/Makefile
--- a/net/aiccu/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/net/aiccu/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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_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 -r 9abd68ba3b9c -r 6b0159f5b118 net/nagios-base/Makefile.common
--- a/net/nagios-base/Makefile.common Tue Mar 14 20:30:00 2006 +0000
+++ b/net/nagios-base/Makefile.common Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
USE_X11= YES
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
-USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR= nagios
diff -r 9abd68ba3b9c -r 6b0159f5b118 net/nagios-nsca/Makefile.common
--- a/net/nagios-nsca/Makefile.common Tue Mar 14 20:30:00 2006 +0000
+++ b/net/nagios-nsca/Makefile.common Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
USE_X11= YES
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
-USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR= nagios
diff -r 9abd68ba3b9c -r 6b0159f5b118 net/vpnc/Makefile
--- a/net/vpnc/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/net/vpnc/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
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 -r 9abd68ba3b9c -r 6b0159f5b118 security/base/Makefile
--- a/security/base/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/security/base/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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_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 -r 9abd68ba3b9c -r 6b0159f5b118 www/drupal/Makefile
--- a/www/drupal/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/www/drupal/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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+= 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 -r 9abd68ba3b9c -r 6b0159f5b118 x11/matchbox-desktop/Makefile
--- a/x11/matchbox-desktop/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/x11/matchbox-desktop/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
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 -r 9abd68ba3b9c -r 6b0159f5b118 x11/xorg-clients/Makefile
--- a/x11/xorg-clients/Makefile Tue Mar 14 20:30:00 2006 +0000
+++ b/x11/xorg-clients/Makefile Tue Mar 14 20:43:23 2006 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index