- /etc -> SYSCONFDIR

- don't change SYSCONFDIR
This commit is contained in:
sturm 2003-05-12 21:16:42 +00:00
parent 13fad453ba
commit 9044ff3b89
8 changed files with 36 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2003/03/20 19:11:19 lebel Exp $
# $OpenBSD: Makefile,v 1.22 2003/05/12 21:16:42 sturm Exp $
COMMENT= "tty-based e-mail client, development version"
@ -30,12 +30,13 @@ FLAVOR?=
PATCH_LIST= gcc-* patch-*
.endif
SYSCONFDIR= /etc/mutt
CONFDIR= ${SYSCONFDIR}/mutt
CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \
--enable-flock --disable-fcntl \
--enable-external_dotlock \
--enable-imap --enable-pop --with-ssl
--enable-imap --enable-pop --with-ssl \
--sysconfdir=${CONFDIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ISPELL="${LOCALBASE}/bin/ispell"
@ -53,10 +54,10 @@ CONFIGURE_ARGS+= --with-curses
PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0
PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+= --enable-compressed
CONFIGURE_STYLE= automake
CONFIGURE_STYLE= automake old
.else
SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu old
.endif
.if ${FLAVOR:L:Mmixmaster}
@ -73,6 +74,7 @@ CONFIGURE_ARGS+= --with-domain="${DOMAIN}"
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/i$//}
SUBST_VARS= CONFDIR
post-install:
@strip ${PREFIX}/bin/mutt

View File

@ -1,12 +1,12 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/08/20 19:51:53 lebel Exp $
# $OpenBSD: DEINSTALL,v 1.2 2003/05/12 21:16:42 sturm Exp $
#
# mutt de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}
CONFIG_DIR=${CONFDIR}
if [ -d $CONFIG_DIR ]; then
echo

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1.1.1 2001/08/20 19:51:53 lebel Exp $
# $OpenBSD: INSTALL,v 1.2 2003/05/12 21:16:42 sturm Exp $
#
# Pre/post-installation setup of mutt
@ -8,7 +8,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}
CONFIG_DIR=${CONFDIR}
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/mutt
do_notice()

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2003/03/20 19:11:19 lebel Exp $
# $OpenBSD: Makefile,v 1.14 2003/05/12 21:16:42 sturm Exp $
COMMENT= "tty-based e-mail client"
@ -30,12 +30,12 @@ FLAVOR?=
PATCH_LIST= gcc-* patch-*
.endif
SYSCONFDIR= /etc/mutt
CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \
--enable-flock --disable-fcntl \
--enable-external_dotlock \
--enable-imap --enable-pop --with-ssl
--enable-imap --enable-pop --with-ssl \
--sysconfdir=${CONFDIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ISPELL="${LOCALBASE}/bin/ispell"
@ -53,10 +53,10 @@ CONFIGURE_ARGS+= --with-curses
PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0
PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+= --enable-compressed
CONFIGURE_STYLE= automake
CONFIGURE_STYLE= automake old
.else
SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu old
.endif
.if ${FLAVOR:L:Mmixmaster}
@ -73,6 +73,8 @@ CONFIGURE_ARGS+= --with-domain="${DOMAIN}"
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/i$//}
CONFDIR= ${SYSCONFDIR}/mutt
SUBST_VARS= CONFDIR
post-install:
@strip ${PREFIX}/bin/mutt

View File

@ -1,12 +1,12 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $
# $OpenBSD: DEINSTALL,v 1.2 2003/05/12 21:16:42 sturm Exp $
#
# mutt de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}
CONFIG_DIR=${CONFDIR}
if [ -d $CONFIG_DIR ]; then
echo

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $
# $OpenBSD: INSTALL,v 1.2 2003/05/12 21:16:42 sturm Exp $
#
# Pre/post-installation setup of mutt
@ -8,7 +8,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}
CONFIG_DIR=${CONFDIR}
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/mutt
do_notice()

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2003/05/09 22:50:15 avsm Exp $
# $OpenBSD: Makefile,v 1.24 2003/05/12 21:16:42 sturm Exp $
COMMENT= "enhanced printer spooler"
@ -22,8 +22,8 @@ LIB_DEPENDS= gdbm.2::databases/gdbm
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \
--with-filterdir=${PREFIX}/libexec/filters \
--with-lpd_conf_path=${SYSCONFDIR}/LPRng/lpd.conf \
--with-lpd_perms_path=${SYSCONFDIR}/LPRng/lpd.perms \
--with-lpd_conf_path=${CONFDIR}/lpd.conf \
--with-lpd_perms_path=${CONFDIR}/lpd.perms \
--with-printcap_path=${SYSCONFDIR}/printcap \
--with-cppopts=-I${LOCALBASE}/include \
--with-ldopts=-L${LOCALBASE}/lib \
@ -32,21 +32,24 @@ CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \
FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \
FILTER_DIR=${TRUEPREFIX}/libexec/filters \
LPD_PERMS_PATH=${TRUEPREFIX}/etc/LPRng/lpd.perms \
LPD_CONF_PATH=${TRUEPREFIX}/etc/LPRng/lpd.conf \
PRINTCAP_PATH=${TRUEPREFIX}/etc/LPRng/printcap
LPD_PERMS_PATH=${TRUEPREFIX}${CONFDIR}/lpd.perms \
LPD_CONF_PATH=${TRUEPREFIX}${CONFDIR}/lpd.conf \
PRINTCAP_PATH=${TRUEPREFIX}${CONFDIR}/printcap
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
patch-*
CONFDIR= ${SYSCONFDIR}/LPRng
HTMLFILES= LPRng-HOWTO.html
SUBST_VARS= CONFDIR
# we don't trust LPRng's (pre|post)install scripts
pre-fake:
mkdir -p ${WRKINST}/etc && mkdir -p ${WRKINST}/etc/LPRng; \
cp ${WRKSRC}/lpd.conf ${WRKSRC}/lpd.perms ${WRKINST}/etc/LPRng; \
cp ${WRKSRC}/printcap ${WRKINST}/etc/LPRng/printcap
mkdir -p ${WRKINST}${CONFDIR}
cp ${WRKSRC}/lpd.conf ${WRKSRC}/lpd.perms ${WRKSRC}/printcap \
${WRKINST}${CONFDIR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng
@ -54,7 +57,7 @@ post-install:
cd ${WRKSRC}/HOWTO && ${INSTALL_DATA} ${HTMLFILES} \
${PREFIX}/share/doc/LPRng
.for i in lpd.conf lpd.perms printcap
${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/LPRng/$i ${PREFIX}/share/examples/LPRng
${INSTALL_DATA} ${WRKINST}${CONFDIR}/$i ${PREFIX}/share/examples/LPRng
.endfor
.include <bsd.port.mk>

View File

@ -2,7 +2,7 @@
To activate the new printing system do the following:
- Copy these config files from ${PREFIX}/share/examples/LPRng
to your /etc/LPRng/ directory: lpd.conf, lpd.perms and printcap
to your ${CONFDIR} directory: lpd.conf, lpd.perms and printcap
- set `lpd_enable=NO' in /etc/rc.conf