summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chat/silc-server/Makefile4
-rw-r--r--databases/postgresql-server/Makefile4
-rw-r--r--mail/courier-auth/Makefile4
-rw-r--r--mail/courier-imap/Makefile3
-rw-r--r--mail/courier-maildirmake/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile5
-rw-r--r--mail/popa3d/Makefile3
-rw-r--r--mail/qmail/Makefile4
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mk/bsd.pkg.install.mk10
-rw-r--r--net/coda5_client/Makefile4
-rw-r--r--net/coda5_server/Makefile4
-rw-r--r--net/ddclient/Makefile3
-rw-r--r--net/ja-samba/Makefile4
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba20/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile5
-rw-r--r--security/openssh/Makefile3
-rw-r--r--security/uvscan/Makefile3
19 files changed, 27 insertions, 52 deletions
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 70ae1f027a1..52e1a0316d9 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/14 02:59:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/18 21:15:07 jlam Exp $
DISTNAME= silc-server-0.9.5
CATEGORIES= chat security
@@ -48,8 +48,6 @@ RCD_SCRIPTS_MODE= 0555
OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
-
CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silcd
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 4eb75307abc..e05e183ca81 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 21:49:37 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2002/09/18 21:15:09 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
COMMENT= PostgreSQL database server programs
@@ -38,8 +38,6 @@ PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
OWN_DIRS_PERMS= ${PGHOME} ${PGUSER} ${PGGROUP} 0755
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
-
do-build:
#
# Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 0920c2cd14a..428cc8d8bb9 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/27 11:20:52 yyamano Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/18 21:15:10 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
PKGREVISION?= 1
@@ -28,8 +28,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \
.endfor
RCD_SCRIPTS= authdaemond
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
do-install:
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 05b2fa962e3..3c92c35d555 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/05/28 15:07:03 yyamano Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/18 21:15:10 jlam Exp $
DISTNAME= courier-imap-1.4.2
PKGREVISION= 1
@@ -35,7 +35,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0600
.endfor
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/../../mail/courier-auth/INSTALL
FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
FILES_SUBST+= SSLCERTS=${SSLCERTS}
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 016cdbda8a4..4df51971c10 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/24 19:45:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:11 jlam Exp $
PKGNAME= courier-maildirmake-${BASE_VERS}
PKGREVISION?= 1
@@ -27,8 +27,6 @@ INSTALL_TARGET= install-strip
CONF_FILES= ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-
pre-configure: configure-init
do-build:
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 9ee4a973c29..205ee09befb 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/07/31 15:48:31 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2002/09/18 21:15:11 jlam Exp $
DISTNAME= cyrus-imapd-2.0.16
PKGREVISION= 1
@@ -70,9 +70,6 @@ CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
RCD_SCRIPTS= cyrus
FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
-
PERL5_PACKLIST= \
${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist \
${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist \
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index ac8964a93f5..10d5ea294be 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/04/23 14:03:43 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/09/18 21:15:12 jlam Exp $
#
DISTNAME= popa3d-0.5.1
@@ -17,7 +17,6 @@ POPA3D_GROUP?= popa3d
PKG_GROUPS= ${POPA3D_GROUP}
PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP}
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
USE_BUILDLINK_ONLY= # defined
FILES_SUBST+= POPA3D_USER=${POPA3D_USER}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index ac8481f4ae9..5fc1abafdc2 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/07/28 01:54:37 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:12 jlam Exp $
#
DISTNAME= qmail-1.03
@@ -37,8 +37,6 @@ RCD_SCRIPTS_EXAMPLEDIR= ${QMAILDIR}/etc/rc.d
NO_MTREE= YES
LOCALBASE= /
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
-
do-configure:
${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 576c762343e..c9a738719e8 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/05/28 15:07:05 yyamano Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:13 jlam Exp $
DISTNAME= sqwebmail-3.3.1
CATEGORIES= www
@@ -62,8 +62,6 @@ CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
MESSAGE_SUBST+= IMAGEDIR=${IMAGEDIR}
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 4c01359c60e..4b66baf4719 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.24 2002/07/24 20:30:06 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.25 2002/09/18 21:15:18 jlam Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -25,10 +25,18 @@ INSTALL_FILE= ${WRKDIR}/.INSTALL
# install/deinstall logic.
#
_HEADER_TMPL?= ${.CURDIR}/../../mk/install/header
+.if !defined(DEINSTALL_EXTRA_TMPL) && exists(${.CURDIR}/DEINSTALL)
+DEINSTALL_EXTRA_TMPL?= ${.CURDIR}/DEINSTALL
+.else
DEINSTALL_EXTRA_TMPL?= # empty
+.endif
DEINSTALL_TMPL?= ${.CURDIR}/../../mk/install/deinstall
INSTALL_TMPL?= ${.CURDIR}/../../mk/install/install
+.if !defined(INSTALL_EXTRA_TMPL) && exists(${.CURDIR}/INSTALL)
+INSTALL_EXTRA_TMPL?= ${.CURDIR}/INSTALL
+.else
INSTALL_EXTRA_TMPL?= # empty
+.endif
_FOOTER_TMPL?= ${.CURDIR}/../../mk/install/footer
# DEINSTALL_TEMPLATES and INSTALL_TEMPLATES are the default list of source
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index f66f02e0576..184fb7a2e0b 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/10 11:02:16 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/09/18 21:15:13 jlam Exp $
PKGNAME= coda-client-${DIST_VERS}
COMMENT= client programs for a replicated high-performance network file system
@@ -7,8 +7,6 @@ COMMENT= client programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= client-install
-INSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
CONF_FILES+= ${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
CONF_FILES+= ${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 5f51eb79fc7..427a68ce29d 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/09/10 11:02:17 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/09/18 21:15:14 jlam Exp $
PKGNAME= coda-server-${DIST_VERS}
COMMENT= server programs for a replicated high-performance network file system
@@ -7,8 +7,6 @@ COMMENT= server programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= server-install
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
CONF_FILES+= ${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index b571df4532b..22d9aa4fbbd 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:14 jlam Exp $
DISTNAME= ddclient-3.6.2
CATEGORIES= net
@@ -16,7 +16,6 @@ RCD_SCRIPTS= ddclient
CONF_FILES_PERMS= ${EGDIR}/sample-etc_ddclient.conf \
${PKG_SYSCONFDIR}/ddclient.conf \
${ROOT_USER} ${ROOT_GROUP} 0600
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
do-configure:
cd ${WRKSRC}; for file in ddclient; do \
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 8fbd2aae667..7896d47d95b 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/07 14:36:40 taca Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/18 21:15:14 jlam Exp $
DISTNAME= samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
PKGNAME= ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
@@ -111,8 +111,6 @@ RCD_SCRIPTS= samba nmbd smbd
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
-INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
-
# Remove irrelevant files for this package.
post-extract:
${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ff7127755e7..5c721c2d3fd 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2002/08/25 21:50:10 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2002/09/18 21:15:15 jlam Exp $
.include "Makefile.common"
@@ -53,8 +53,6 @@ RCD_SCRIPTS= samba nmbd smbd
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
-INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
-
# Remove irrelevant files for this package.
post-extract:
${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index f52d13795ff..70987a6af4f 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:14 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:16 jlam Exp $
DISTNAME= samba-2.0.10
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -66,8 +66,6 @@ RCD_SCRIPTS= samba nmbd smbd
MAKE_DIRS= ${SAMBA_LOCKDIR}
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_PRIVATE}
-INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
-
pre-install:
for script in ${RCD_SCRIPTS}; do \
${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index a4765db0597..f480d74aae9 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/09/07 07:37:37 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2002/09/18 21:15:16 jlam Exp $
DISTNAME= cyrus-sasl-1.5.27
SVR4_PKGNAME= csasl
@@ -76,9 +76,6 @@ PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
RCD_SCRIPTS= sasl_pwcheck saslauthd
OWN_DIRS= ${PREFIX}/lib/sasl
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-
post-extract:
cd ${WRKSRC}; ${RM} -f include/md5.h
${CP} ${FILESDIR}/sasl-config.in ${WRKSRC}/plugins
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index d60c09e6bfa..150b6311494 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2002/08/31 10:09:00 grant Exp $
+# $NetBSD: Makefile,v 1.90 2002/09/18 21:15:17 jlam Exp $
DISTNAME= openssh-3.4p1
PKGNAME= openssh-3.4.0.1
@@ -125,7 +125,6 @@ FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR}
MESSAGE_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER}
MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP}
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
.if defined(UPDATE_INTREE_OPENSSH)
. include "Makefile.intree"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 7e51cc60bb9..401a962d3ab 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/08/07 05:42:13 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:18 jlam Exp $
DISTNAME= vlnx416e
PKGNAME= uvscan-4.16.0
@@ -34,7 +34,6 @@ DATFILES= clean.dat internet.dat names.dat scan.dat readme.txt
FILES_SUBST+= UVSCANDIR=${UVSCANDIR:Q}
FILES_SUBST+= DATFILES=${DATFILES:Q}
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
SUPPORT_FILES= ${DATDIR}/clean.dat ${UVSCANDIR}/clean.dat
SUPPORT_FILES+= ${DATDIR}/names.dat ${UVSCANDIR}/names.dat
SUPPORT_FILES+= ${DATDIR}/scan.dat ${UVSCANDIR}/scan.dat
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 14:54:35 +0000