From cd22b025136b2359118090ff0b74268354104abc Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 2 Aug 2002 16:22:39 +0000 Subject: [PATCH] /etc -> ${SYSCONFDIR} --- net/ipcad/Makefile | 15 ++++++++------- net/ipcad/patches/patch-ipcad_conf_5 | 6 +++--- net/ipcad/pkg/DEINSTALL | 4 ++-- net/ipcad/pkg/INSTALL | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile index 6845a8d0ff9..d31707142b4 100644 --- a/net/ipcad/Makefile +++ b/net/ipcad/Makefile @@ -1,22 +1,21 @@ -# $OpenBSD: Makefile,v 1.5 2002/05/08 17:25:42 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/08/02 16:22:39 naddy Exp $ # $RuOBSD: Makefile,v 1.1.1.1 2002/04/08 02:46:36 form Exp $ COMMENT= "IP accounting daemon simulating Cisco ip accounting" DISTNAME= ipcad-2.6.2 CATEGORIES= net +HOMEPAGE= http://www.spelio.net.ru/soft/ + +MAINTAINER= Oleg Safiullin , \ + Alexander Yurchenko PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://www.spelio.net.ru/soft/ - -HOMEPAGE= http://www.spelio.net.ru/soft/ - -MAINTAINER= Oleg Safiullin , \ - Alexander Yurchenko +MASTER_SITES= ${HOMEPAGE} CONFIGURE_STYLE= gnu @@ -24,6 +23,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/ipcad ${PREFIX}/sbin ${INSTALL_MAN} ${WRKBUILD}/ipcad.8 ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKBUILD}/ipcad.conf.5 ${PREFIX}/man/man5 + perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:' \ + ${PREFIX}/man/man5/ipcad.conf.5 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipcad ${INSTALL_DATA} ${WRKDIST}/ipcad.conf \ ${PREFIX}/share/examples/ipcad/ipcad.conf.sample diff --git a/net/ipcad/patches/patch-ipcad_conf_5 b/net/ipcad/patches/patch-ipcad_conf_5 index d16f918f9e3..8def533c782 100644 --- a/net/ipcad/patches/patch-ipcad_conf_5 +++ b/net/ipcad/patches/patch-ipcad_conf_5 @@ -1,4 +1,4 @@ -$OpenBSD: patch-ipcad_conf_5,v 1.1.1.1 2002/04/29 02:45:16 form Exp $ +$OpenBSD: patch-ipcad_conf_5,v 1.2 2002/08/02 16:22:39 naddy Exp $ --- ipcad.conf.5.orig Thu Apr 25 16:10:21 2002 +++ ipcad.conf.5 Thu Apr 25 16:10:33 2002 @@ -4,11 +4,11 @@ @@ -6,12 +6,12 @@ $OpenBSD: patch-ipcad_conf_5,v 1.1.1.1 2002/04/29 02:45:16 form Exp $ .Nd ipcad configuration file .Sh SYNOPSIS -.Pa /usr/local/etc/ipcad.conf -+.Pa /etc/ipcad.conf ++.Pa %%SYSCONFDIR%%/ipcad.conf .Sh DESCRIPTION .Pp The file -.Nm /usr/local/etc/ipcad.conf -+.Nm /etc/ipcad.conf ++.Nm %%SYSCONFDIR%%/ipcad.conf contains configuration information for the .Xr ipcad 8 daemon. diff --git a/net/ipcad/pkg/DEINSTALL b/net/ipcad/pkg/DEINSTALL index 84fbdbe874a..d7b5f480f54 100644 --- a/net/ipcad/pkg/DEINSTALL +++ b/net/ipcad/pkg/DEINSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.2 2002/04/29 04:30:16 form Exp $ +# $OpenBSD: DEINSTALL,v 1.3 2002/08/02 16:22:39 naddy Exp $ # $RuOBSD: DEINSTALL,v 1.2 2002/04/08 02:48:06 form Exp $ # # ipcad de-installation @@ -7,7 +7,7 @@ set -e PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=/etc/ipcad.conf +CONFIG_FILE=${SYSCONFDIR}/ipcad.conf DUMP_DIR=/var/ipcad if [ -f ${CONFIG_FILE} ]; then diff --git a/net/ipcad/pkg/INSTALL b/net/ipcad/pkg/INSTALL index 4baec34af21..5629244ce28 100644 --- a/net/ipcad/pkg/INSTALL +++ b/net/ipcad/pkg/INSTALL @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.2 2002/04/29 04:30:16 form Exp $ +# $OpenBSD: INSTALL,v 1.3 2002/08/02 16:22:39 naddy Exp $ # $RuOBSD: INSTALL,v 1.2 2002/04/08 02:48:06 form Exp $ # # Pre/post-installation setup of ipcad @@ -9,7 +9,7 @@ set -e PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=/etc/ipcad.conf +CONFIG_FILE=${SYSCONFDIR}/ipcad.conf SAMPLE_CONFIG_FILE=${PREFIX}/share/examples/ipcad/ipcad.conf.sample DUMP_DIR=/var/ipcad