diff options
| author | darcy <darcy@pkgsrc.org> | 2003-02-27 11:30:00 +0000 |
|---|---|---|
| committer | darcy <darcy@pkgsrc.org> | 2003-02-27 11:30:00 +0000 |
| commit | 721e50af1b941faa7c4702ba89f43cea56690bfa (patch) | |
| tree | 20039e0c7fdabd8ef41d7c1cb809fe834e6bfe23 /net | |
| parent | ed245c0c860fdf4254b8992782112a4c1f19adb5 (diff) | |
| download | pkgsrc-721e50af1b941faa7c4702ba89f43cea56690bfa.tar.gz | |
Replace some absolute paths (including one that was a typo anyway) with
variables.
Added CONLICTS line to show conflict with radius-cistern. I will also add
a CONFLICTS line to radius-cistern although I will send a PR to have this
situation fixed so that both can coexist.
Diffstat (limited to 'net')
| -rw-r--r-- | net/freeradius/Makefile | 6 | ||||
| -rw-r--r-- | net/freeradius/distinfo | 4 | ||||
| -rwxr-xr-x | net/freeradius/files/radiusd | 4 | ||||
| -rw-r--r-- | net/freeradius/patches/patch-ab | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 8d817386b41..8f2c329b3d0 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2003/02/27 08:51:00 darcy Exp $ +# $NetBSD: Makefile,v 1.2 2003/02/27 11:30:00 darcy Exp $ DISTNAME= freeradius-0.7 CATEGORIES= net @@ -9,6 +9,7 @@ MAINTAINER= david@netbsd-fr.org HOMEPAGE= http://www.freeradius.org/ COMMENT= Free RADIUS server implementation +CONFLICTS+= radiusd-cistron* USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --quiet --with-logdir=/var/log @@ -31,7 +32,8 @@ post-install: .for db in ${RADDB} ${INSTALL_DATA} ${WRKSRC}/raddb/${db} ${PREFIX}/etc/raddb/${db}.sample .endfor - ${INSTALL_SCRIPT} ${FILESDIR}/radiusd ${PREFIX}/etc/rc.d/radiusd + @${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd \ + > ${PREFIX}/etc/rc.d/radiusd .include "../../databases/gdbm/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo index 17c884f39bd..88d9d93a6df 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2003/02/27 08:51:00 darcy Exp $ +$NetBSD: distinfo,v 1.2 2003/02/27 11:30:00 darcy Exp $ SHA1 (freeradius-0.7.tar.gz) = 8f44f1f9fedf69b71aa4aed9c0b7222d012ee8d6 Size (freeradius-0.7.tar.gz) = 1659035 bytes SHA1 (patch-aa) = dc2c8c62ed2d11ebf682f7d9fcbaf7a410cbce0d -SHA1 (patch-ab) = 0715679a341dae04184b761a9133b5c7f84fedea +SHA1 (patch-ab) = 26092b974a27151d69ab87ae7ba42e67aeef448b diff --git a/net/freeradius/files/radiusd b/net/freeradius/files/radiusd index f88ef3f0e86..d6022c0e551 100755 --- a/net/freeradius/files/radiusd +++ b/net/freeradius/files/radiusd @@ -4,8 +4,8 @@ # REQUIRE: network name="radiusd" -command="/usr/pkg/sbin/radiusd" -pidfile="/ust/pkg/var/run/radiusd/radiusd.pid" +command="!!PREFIX!!/sbin/radiusd" +pidfile="!!PREFIX!!/var/run/radiusd/radiusd.pid" if [ ! -d /etc/rc.d ] then diff --git a/net/freeradius/patches/patch-ab b/net/freeradius/patches/patch-ab index bc4ec4bacaa..1b7ca3a2a91 100644 --- a/net/freeradius/patches/patch-ab +++ b/net/freeradius/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2003/02/27 08:51:01 darcy Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/27 11:30:00 darcy Exp $ --- src/modules/rlm_dbm/Makefile.in.orig 2003-02-26 03:34:42.000000000 +0100 +++ src/modules/rlm_dbm/Makefile.in 2003-02-26 03:34:49.000000000 +0100 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2003/02/27 08:51:01 darcy Exp $ RLM_UTILS = @dbm_utils@ RLM_CFLAGS = @dbm_cflags@ -RLM_LIBS = @dbm_ldflags@ -+RLM_LIBS = @dbm_ldflags@ -L/usr/pkg/lib ++RLM_LIBS = @dbm_ldflags@ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib RLM_INSTALL = @dbm_install@ include ../rules.mak |