From 49e80a5157d2887d6cea9ccca887d3a15da5de6e Mon Sep 17 00:00:00 2001
From: kolla <kolla>
Date: Wed, 4 Jun 2008 00:29:38 +0000
Subject: =?UTF-8?q?NetBSD-fikser:=20*=20Bruker=20do-patch=20med=20sed=20fo?=
 =?UTF-8?q?r=20=C3=A5=20endre=20default=20konfigfil=20fra=20=20=20/etc/rad?=
 =?UTF-8?q?secproxy.conf=20til=20/usr/pkg/etc/radsecproxy.conf=20*=20Endre?=
 =?UTF-8?q?t=20i=20rc.d-script=20til=20=C3=A5=20droppe=20"-c=20/usr/pkg/et?=
 =?UTF-8?q?c/radsecproxy.conf"=20=20=20siden=20det=20n=C3=A5=20er=20defaul?=
 =?UTF-8?q?t.=20*=20Kompil=C3=A9r=20og=20install=C3=A9r=20catgconf=20som?=
 =?UTF-8?q?=20radsecproxy-catgconf,=20=20=20catgconf=20h=C3=B8res=20ut=20s?=
 =?UTF-8?q?om=20det=20har=20noe=20med=20GNOME=20gconf=20=C3=A5=20gj=C3=B8r?=
 =?UTF-8?q?e=20*=20distinfo=20for=20trunk=20er=20meningsl=C3=B8s=20likevel?=
 =?UTF-8?q?,=20man=20f=C3=A5r=20heller=20kj=C3=B8re=20=20=20"make=20makesu?=
 =?UTF-8?q?m"=20manuelt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/branches/release-1.1@278 e88ac4ed-0b26-0410-9574-a7f39faa03bf
---
 packaging/pkgsrc/net/radsecproxy/Makefile             | 10 ++++++++--
 packaging/pkgsrc/net/radsecproxy/files/radsecproxy.sh |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'packaging/pkgsrc/net')

diff --git a/packaging/pkgsrc/net/radsecproxy/Makefile b/packaging/pkgsrc/net/radsecproxy/Makefile
index 716f316..8f1884a 100644
--- a/packaging/pkgsrc/net/radsecproxy/Makefile
+++ b/packaging/pkgsrc/net/radsecproxy/Makefile
@@ -8,8 +8,6 @@ MAINTAINER=	netbsd@kolla.no
 HOMEPAGE=	http://software.uninett.no/radsecproxy/
 COMMENT=	RADIUS proxy that also supports RadSec
 
-# WRKSRC=		${WRKDIR}/radsecproxy-1.0p1
-
 EGDIR=		${PREFIX}/share/examples/radsecproxy
 CONF_FILES=     ${EGDIR}/radsecproxy.conf ${PKG_SYSCONFDIR}/radsecproxy.conf
 
@@ -19,10 +17,18 @@ RCD_SCRIPTS=	radsecproxy
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR}
 
+do-patch:
+	${SED} 's%\(^all: .*\)%& catgconf%1' ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.tmp
+	mv ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile
+	for f in ${WRKSRC}/* ; do \
+		${SED} 's%\(/etc/radsecproxy.conf\)%/usr/pkg&%g' < $${f} > $${f}.tmp ; mv $${f}.tmp $${f} ; \
+	done
+
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/radsecproxy.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/radsecproxy.conf.5 ${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_PROGRAM} ${WRKSRC}/radsecproxy ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/catgconf ${PREFIX}/sbin/radsecproxy-catgconf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radsecproxy
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/radsecproxy
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/radsecproxy
diff --git a/packaging/pkgsrc/net/radsecproxy/files/radsecproxy.sh b/packaging/pkgsrc/net/radsecproxy/files/radsecproxy.sh
index 8f394f6..2639b33 100755
--- a/packaging/pkgsrc/net/radsecproxy/files/radsecproxy.sh
+++ b/packaging/pkgsrc/net/radsecproxy/files/radsecproxy.sh
@@ -12,7 +12,7 @@ fi
 name="radsecproxy"
 rcvar=${name}
 command="/usr/pkg/sbin/${name}"
-command_args="-c /usr/pkg/etc/${name}.conf"
+command_args=""
 
 restart_precmd="${command} -p ${command_args}"
 
-- 
cgit v1.1