pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SU...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5da27aff5f98
branches: trunk
changeset: 498317:5da27aff5f98
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 19 18:12:36 2005 +0000
description:
Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
diffstat:
audio/oss/Makefile | 6 +-
audio/xmcd/Makefile | 8 ++--
chat/gale/Makefile | 6 +-
chat/i2cbd/Makefile | 7 +--
chat/ircd-hybrid/Makefile | 10 +++---
chat/jabberd/Makefile | 4 +-
chat/jabberd2/Makefile | 4 +-
comms/asterisk/Makefile | 4 +-
converters/libiconv/Makefile | 4 +-
games/nethack-lib/Makefile | 6 +-
games/xbill/Makefile | 4 +-
games/xpat2/Makefile | 4 +-
games/xsoldier/Makefile | 4 +-
lang/blackdown-jre13/Makefile | 6 +-
lang/jdk/Makefile | 6 +-
lang/kaffe/Makefile | 4 +-
lang/sun-jre13/Makefile | 6 +-
lang/sun-jre14/Makefile | 6 +-
lang/sun-jre15/Makefile | 8 ++--
mail/elm-me/Makefile | 4 +-
mail/imp/Makefile | 20 ++++++------
mail/imp4/Makefile | 18 +++++-----
mail/mess822/Makefile | 4 +-
mail/mutt-devel/Makefile | 4 +-
mail/mutt/Makefile | 4 +-
mail/turba/Makefile | 8 ++--
mk/install/bsd.pkginstall.mk | 51 +++-----------------------------
net/djbdns/Makefile | 4 +-
net/flow-tools/Makefile | 6 +--
net/ja-samba/Makefile | 8 ++--
net/samba/Makefile | 6 +-
net/snort/Makefile.common | 12 +++---
print/cups/Makefile | 10 +++---
security/fprot-workstation-bin/Makefile | 8 ++--
security/openssh+gssapi/Makefile | 11 +-----
security/openssh/Makefile | 11 +-----
security/uvscan/Makefile | 8 ++--
sysutils/apcupsd/Makefile | 6 +-
sysutils/tob/Makefile | 6 +-
sysutils/xcdroast/Makefile | 4 +-
sysutils/xentools20/Makefile | 8 ++--
textproc/icu/Makefile | 4 +-
textproc/xmlcatmgr/Makefile | 6 +-
wm/pwm/Makefile | 18 +++++-----
www/ap-ssl/Makefile | 10 +++---
www/apache/Makefile | 6 +-
www/apache2/Makefile | 8 ++--
www/horde/Makefile | 16 +++++-----
www/horde3/Makefile | 16 +++++-----
www/iasp/Makefile | 20 ++++++------
www/sarg/Makefile | 6 +-
www/surfraw/Makefile | 4 +-
x11/gdm/Makefile | 8 ++--
53 files changed, 199 insertions(+), 251 deletions(-)
diffs (truncated from 1353 to 300 lines):
diff -r 3467d8d94dd1 -r 5da27aff5f98 audio/oss/Makefile
--- a/audio/oss/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/audio/oss/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/19 18:12:36 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -47,9 +47,9 @@
SFILES= drums.o3 drums.sb oss.conf std.o3 std.sb
FILES_SUBST+= SFILES=${SFILES:Q}
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${OSSLIBDIR}/${FILE} /etc/${FILE}
+CONF_FILES+= ${OSSLIBDIR}/${FILE} /etc/${FILE}
.endfor
-SUPPORT_FILES+= ${OSSLIBDIR}/license.asc.eval ${OSSLIBDIR}/license.asc
+CONF_FILES+= ${OSSLIBDIR}/license.asc.eval ${OSSLIBDIR}/license.asc
RCD_SCRIPTS= oss
INSTALLATION_DIRS= bin sbin
diff -r 3467d8d94dd1 -r 5da27aff5f98 audio/xmcd/Makefile
--- a/audio/xmcd/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/audio/xmcd/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/19 18:12:36 jlam Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 4
@@ -34,9 +34,9 @@
SPECIAL_PERMS= ${ARCHBIN}/cda ${_SETUID_ROOT}
SPECIAL_PERMS+= ${ARCHBIN}/xmcd ${_SETUID_ROOT}
-SFILES= common.cfg device.cfg wwwwarp.cfg
-.for FILE in ${SFILES}
-SUPPORT_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
+CFILES= common.cfg device.cfg wwwwarp.cfg
+.for FILE in ${CFILES}
+CONF_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
.endfor
MAKE_DIRS= ${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog
diff -r 3467d8d94dd1 -r 5da27aff5f98 chat/gale/Makefile
--- a/chat/gale/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/chat/gale/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:36 jlam Exp $
#
DISTNAME= gale-0.99a
@@ -28,8 +28,8 @@
PKG_GROUPS= gale
PKG_USERS= gale:gale
-SUPPORT_FILES= ${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
-SUPPORT_FILES+= ${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
+CONF_FILES= ${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
+CONF_FILES+= ${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
OWN_DIRS= ${PKG_SYSCONFDIR}
OWN_DIRS+= ${PKG_SYSCONFDIR}/auth
OWN_DIRS+= ${PKG_SYSCONFDIR}/auth/private
diff -r 3467d8d94dd1 -r 5da27aff5f98 chat/i2cbd/Makefile
--- a/chat/i2cbd/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/chat/i2cbd/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/23 09:03:12 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/19 18:12:36 jlam Exp $
#
DISTNAME= i2cbd-2.0_BETA1
@@ -21,14 +21,13 @@
PKG_SYSCONFSUBDIR= icbd
EGDIR= ${PREFIX}/share/examples/i2cbd
EGFILES= motd icbd_help icbd.deny news.1
-CONF_FILES_PERMS=
+CONF_FILES_PERMS= # empty
.for f in ${EGFILES}
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${ICBD_OWNER} ${ROOT_GROUP} 644
.endfor
.undef f
-
-SUPPORT_FILES_PERMS= /dev/null /var/log/icbd.log \
+CONF_FILES_PERMS+= /dev/null /var/log/icbd.log \
${ICBD_OWNER} ${ROOT_GROUP} 644
post-extract:
diff -r 3467d8d94dd1 -r 5da27aff5f98 chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/chat/ircd-hybrid/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/12 04:15:50 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:36 jlam Exp $
#
DISTNAME= ircd-hybrid-6.2
@@ -110,14 +110,14 @@
PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\\ User::${NOLOGIN}
PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP}
-SUPPORT_FILES= ${PREFIX}/share/examples/ircd-hybrid/opers.txt \
+CONF_FILES= ${PREFIX}/share/examples/ircd-hybrid/opers.txt \
${IRCD_HYBRID_DPATH}/opers.txt
-SUPPORT_FILES_PERMS= /dev/null ${IRCD_HYBRID_FNAME_OPERLOG} \
+CONF_FILES_PERMS= /dev/null ${IRCD_HYBRID_FNAME_OPERLOG} \
${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
-SUPPORT_FILES_PERMS+= /dev/null ${IRCD_HYBRID_FNAME_USERLOG} \
+CONF_FILES_PERMS+= /dev/null ${IRCD_HYBRID_FNAME_USERLOG} \
${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
.if ${IRCD_HYBRID_USE_LOGFILE} == "YES"
-SUPPORT_FILES_PERMS+= /dev/null ${IRCD_HYBRID_LPATH} \
+CONF_FILES_PERMS+= /dev/null ${IRCD_HYBRID_LPATH} \
${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
.endif
diff -r 3467d8d94dd1 -r 5da27aff5f98 chat/jabberd/Makefile
--- a/chat/jabberd/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/chat/jabberd/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= jabber-1.4.2
@@ -52,7 +52,7 @@
.undef f
CONF_FILES= ${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml
-SUPPORT_FILES= ${EGDIR}/platform-settings \
+CONF_FILES+= ${EGDIR}/platform-settings \
${PKG_SYSCONFDIR}/platform-settings
INSTALLATION_DIRS= sbin
diff -r 3467d8d94dd1 -r 5da27aff5f98 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/chat/jabberd2/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/03 22:21:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= jabberd-2.0s9
@@ -51,7 +51,7 @@
BINDIR= ${PREFIX}/bin
EGDIR= ${PREFIX}/share/examples/jabberd
-SUPPORT_FILES= ${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
+CONF_FILES= ${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
FILES= c2s.xml resolver.xml router.xml \
router-users.xml s2s.xml sm.xml
diff -r 3467d8d94dd1 -r 5da27aff5f98 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/comms/asterisk/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= asterisk-1.0.7
@@ -79,7 +79,7 @@
res_config_odbc.conf res_odbc.conf rpt.conf rtp.conf sip.conf \
skinny.conf voicemail.conf vpb.conf zapata.conf asterisk.adsi \
telcordia-1.adsi
-SUPPORT_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
+CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
.endfor
.undef _file_
diff -r 3467d8d94dd1 -r 5da27aff5f98 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/converters/libiconv/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/28 15:15:17 adam Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:37 jlam Exp $
DISTNAME= libiconv-1.10
CATEGORIES= converters
@@ -17,7 +17,7 @@
TEST_TARGET= check
EGDIR= ${PREFIX}/share/examples/libiconv
-SUPPORT_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
+CONF_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
MAKE_ENV+= PAX="${PAX}"
diff -r 3467d8d94dd1 -r 5da27aff5f98 games/nethack-lib/Makefile
--- a/games/nethack-lib/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/games/nethack-lib/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -14,9 +14,9 @@
USE_PKGINSTALL= yes
-SUPPORT_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/record \
+CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/record \
${ROOT_USER} games 664
-SUPPORT_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/logfile \
+CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/logfile \
${ROOT_USER} games 664
MAKE_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR} \
diff -r 3467d8d94dd1 -r 5da27aff5f98 games/xbill/Makefile
--- a/games/xbill/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/games/xbill/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/14 17:23:24 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= xbill-2.0
@@ -21,7 +21,7 @@
PKG_GROUPS= ${GAMEGRP}
MAKE_DIRS_PERMS+= ${VARBASE}/games ${BINOWN} ${GAMEGRP} 0775
MAKE_ENV+= GAMEGRP=${GAMEGRP} GAMEMODE=${GAMEMODE}
-SUPPORT_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
post-install:
${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff -r 3467d8d94dd1 -r 5da27aff5f98 games/xpat2/Makefile
--- a/games/xpat2/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/games/xpat2/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/16 18:18:13 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/19 18:12:37 jlam Exp $
DISTNAME= xpat2-1.07
CATEGORIES= games
@@ -16,7 +16,7 @@
MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.xpm:Q} XMKMF=${XMKMF_CMD:Q}
-SUPPORT_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE}
+CONF_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE}
MAKE_DIRS= /var/games
post-install:
diff -r 3467d8d94dd1 -r 5da27aff5f98 games/xsoldier/Makefile
--- a/games/xsoldier/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/games/xsoldier/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= xsoldier-0.96
@@ -15,7 +15,7 @@
MAKE_ENV+= BINOWN=${BINOWN}
-SUPPORT_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
+CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
/var/games/xsoldier \
games games 0664
diff -r 3467d8d94dd1 -r 5da27aff5f98 lang/blackdown-jre13/Makefile
--- a/lang/blackdown-jre13/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/lang/blackdown-jre13/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/15 11:53:20 veego Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $
#
BD_BASENAME= j2re
@@ -36,9 +36,9 @@
SFILES+= font.properties.zh jvm.cfg
SFILES+= images/cursors/cursors.properties psfont.properties.ja
SFILES+= psfontj2d.properties security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
+CONF_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
.endfor
do-configure:
diff -r 3467d8d94dd1 -r 5da27aff5f98 lang/jdk/Makefile
--- a/lang/jdk/Makefile Fri Aug 19 17:32:13 2005 +0000
+++ b/lang/jdk/Makefile Fri Aug 19 18:12:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/19 18:12:37 jlam Exp $
#
VERSION= 1.1.8
@@ -57,9 +57,9 @@
SFILES+= font.properties.zh_TW_Big5 font.properties.zh_TW_EUC_TW
SFILES+= psfont.properties.ja serialver.properties
SFILES+= security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
Home |
Main Index |
Thread Index |
Old Index