diff options
| author | taca <taca> | 2001-12-19 04:11:07 +0000 |
|---|---|---|
| committer | taca <taca> | 2001-12-19 04:11:07 +0000 |
| commit | 4659ee131e817bd537f97ff4e11e1a144c55cb4f (patch) | |
| tree | e75a23189d6c6ea19312e27b3d32ca1b168534fc /mail/yatsvrs | |
| parent | 6415d8e975d4b71f0cb4cbbfb20c6eb62b2c074e (diff) | |
| download | pkgsrc-4659ee131e817bd537f97ff4e11e1a144c55cb4f.tar.gz | |
o Use PKG_SYSCONFSUBDIR.
o Utilize PKG_SYSCONFDIR and nuke own CONFDIR variable.
Suggested by private mail from Johnny Lam <jlam@jgrind.org>.
Thanks jlam!
Diffstat (limited to 'mail/yatsvrs')
| -rw-r--r-- | mail/yatsvrs/DEINSTALL | 4 | ||||
| -rw-r--r-- | mail/yatsvrs/INSTALL | 4 | ||||
| -rw-r--r-- | mail/yatsvrs/MESSAGE | 2 | ||||
| -rw-r--r-- | mail/yatsvrs/Makefile | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/mail/yatsvrs/DEINSTALL b/mail/yatsvrs/DEINSTALL index 994a981c1d2..2ca814e9042 100644 --- a/mail/yatsvrs/DEINSTALL +++ b/mail/yatsvrs/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: DEINSTALL,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +# $Id: DEINSTALL,v 1.2 2001/12/19 04:11:07 taca Exp $ AWK="@AWK@" CAT="@CAT@" @@ -7,7 +7,7 @@ CMP="@CMP@" RM="@RM@" RMDIR="@RMDIR@" -YAT_CONF_DIR="@CONFDIR@" +YAT_CONF_DIR="@PKG_SYSCONFDIR@" YAT_EXAMPLES_DIR="@EXAMPLESDIR@" EXAMPLES="@EXAMPLES@" MIN="@YATSVR_MINGID@" diff --git a/mail/yatsvrs/INSTALL b/mail/yatsvrs/INSTALL index cedf50277bb..300d8acf12d 100644 --- a/mail/yatsvrs/INSTALL +++ b/mail/yatsvrs/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: INSTALL,v 1.1.1.1 2001/11/15 23:21:30 taca Exp $ +# $Id: INSTALL,v 1.2 2001/12/19 04:11:08 taca Exp $ PKGNAME=$1 STAGE=$2 @@ -9,7 +9,7 @@ CHMOD="@CHMOD@" MKDIR="@MKDIR@" INSTALL_DATA="@YATSVR_INSTALL_DATA@" -YAT_CONF_DIR="@CONFDIR@" +YAT_CONF_DIR="@PKG_SYSCONFDIR@" YAT_EXAMPLES_DIR="@EXAMPLESDIR@" DEFAULT_ADMIN="@DEFAULT_ADMIN@" EXAMPLES="@EXAMPLES@" diff --git a/mail/yatsvrs/MESSAGE b/mail/yatsvrs/MESSAGE index 30e4ddcca7c..3b11028a7b9 100644 --- a/mail/yatsvrs/MESSAGE +++ b/mail/yatsvrs/MESSAGE @@ -14,4 +14,4 @@ ascy stream tcp nowait root ${LOCALBASE}/libexec/ascyd ascyd You should add appropriate options. -3. Edit yatsvrrc and yatrc2 in ${CONFDIR}. +3. Edit yatsvrrc and yatrc2 in ${PKG_SYSCONFDIR}. diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile index aac0993de32..b0e1a1a03df 100644 --- a/mail/yatsvrs/Makefile +++ b/mail/yatsvrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/12/19 03:20:29 taca Exp $ +# $NetBSD: Makefile,v 1.3 2001/12/19 04:11:08 taca Exp $ # DISTNAME= yatsvrs-5.00p4 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes YATSVR_LOGFAC?= LOG_LOCAL4 YATSVR_MINGID?= 1001 YATSVR_MAXGID?= 64999 -CONFDIR= ${PKG_SYSCONFDIR}/yatsvr5 +PKG_SYSCONFSUBDIR= yatsvr5 OLDCONFDIR= ${PREFIX}/etc/yat DOCS= IMPORTANT README UPDATE doc/YATCONF doc/YATEXT4 DOCDIR= ${PREFIX}/share/doc/yatsvr5 @@ -26,7 +26,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/yatsvr5 CONFIGURE_ARGS+= --enable-popper-xmit CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC} -CONFIGURE_ARGS+= --with-yat-sys-dir=${CONFDIR} +CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR} DEINSTALL_FILE= ${WRKDIR}/DEINSTALL @@ -41,7 +41,7 @@ FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= CONFDIR=${CONFDIR} +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_ADMIN} FILES_SUBST+= EXAMPLESDIR=${EXAMPLESDIR} FILES_SUBST+= EXAMPLES=${EXAMPLES:Q} @@ -50,14 +50,14 @@ FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID} FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} -MESSAGE_SUBST+= CONFDIR=${CONFDIR} +MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} post-build: ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} post-install: - ${INSTALL_DATA_DIR} ${CONFDIR} + ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR} ${INSTALL_DATA_DIR} ${DOCDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR} |