DESTDIR support

4 files changed, 19 insertions, 17 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index a3bf93395bf..7651d03d3ce 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/12/22 12:39:57 obache Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/11 22:37:49 joerg Exp $
 
 DISTNAME=	radiusd-cistron-1.6.8
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.radius.cistron.nl/
 COMMENT=	RADIUS-compliant remote authentication and accounting server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	freeradius-[0-9]*
 
 USE_TOOLS+=	perl:run
@@ -23,7 +25,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
 
 RCD_SCRIPTS=	radiusd
 
-OWN_DIRS_PERMS=	/var/log/radacct ${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS=	/var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
 
 PKG_SYSCONFSUBDIR=	raddb
 EGDIR=		${PREFIX}/share/examples/raddb
@@ -38,20 +40,20 @@ CONF_FILES+=	${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron/
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
 .for i in	ChangeLog README README.CVX README.Y2K README.cisco	\
 		README.pam README.proxy README.radrelay README.simul	\
 		README.tunnel README.usersfile
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
 .endfor
 .for i in	radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 .endfor
 .for i in	clients.5rad naslist.5rad
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
 .endfor
 .for i in	radiusd.8 radrelay.8 radwatch.8
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index 448625a2d36..ce0a3ad5438 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2007/12/22 12:39:57 obache Exp $
+$NetBSD: distinfo,v 1.9 2010/02/11 22:37:49 joerg Exp $
 
 SHA1 (radiusd-cistron-1.6.8.tar.gz) = 7938d5acbb994174baf662a4b4641367c4e1fd95
 RMD160 (radiusd-cistron-1.6.8.tar.gz) = 06de37ca5e8a8354aaa7387255929388b49edb61
 Size (radiusd-cistron-1.6.8.tar.gz) = 199459 bytes
-SHA1 (patch-aa) = 53f331bde823f23a869c779df92a6e400a204746
-SHA1 (patch-ab) = a877e273f3d12228d4d0d6064115c5f55c044ad3
+SHA1 (patch-aa) = 7661709e49bf6797cfbbc86e45daf7be0f723d9a
+SHA1 (patch-ab) = e04249a8953a473577c4467788726c2db1de89d3
 SHA1 (patch-ac) = 95053cdb7cc8a1672d32a953147074ea948e535b
 SHA1 (patch-ad) = 1220fdb3141391f6c15b7bfba014baf1a372f3b6
 SHA1 (patch-ae) = 2049cfa99b6392ed178e11e283b2749df819a35c
diff --git a/net/radiusd-cistron/patches/patch-aa b/net/radiusd-cistron/patches/patch-aa
index caf4d62b3c6..9c583c1ddcb 100644
--- a/net/radiusd-cistron/patches/patch-aa
+++ b/net/radiusd-cistron/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/11 22:37:49 joerg Exp $
 
 --- src/Makefile.BSD.orig	Thu Apr 10 13:38:23 2003
 +++ src/Makefile.BSD	Tue Dec 16 20:15:35 2003
@@ -27,9 +27,9 @@ $NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $
 -SBINDIR = /usr/local/sbin
 -MANDIR  = /usr/local/man
 -SHAREDIR = /usr/local/share/radius
-+BINDIR  = $(PREFIX)/bin
-+SBINDIR = $(PREFIX)/sbin
-+MANDIR  = $(PREFIX)/man
-+SHAREDIR = $(PREFIX)/share/examples/raddb
++BINDIR  = ${DESTDIR}$(PREFIX)/bin
++SBINDIR = ${DESTDIR}$(PREFIX)/sbin
++MANDIR  = ${DESTDIR}$(PREFIX)/man
++SHAREDIR = ${DESTDIR}$(PREFIX)/share/examples/raddb
  
  .include "Make.inc"
diff --git a/net/radiusd-cistron/patches/patch-ab b/net/radiusd-cistron/patches/patch-ab
index 84b53cfcae7..6b4e512088a 100644
--- a/net/radiusd-cistron/patches/patch-ab
+++ b/net/radiusd-cistron/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $
+$NetBSD: patch-ab,v 1.5 2010/02/11 22:37:49 joerg Exp $
 
 --- src/Make.inc.orig	Thu Apr 10 13:51:47 2003
 +++ src/Make.inc	Tue Dec 16 20:10:28 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $
  #
  
 -RADIUS_DIR    = /etc/raddb
-+RADIUS_DIR    = ${PREFIX}/share/examples/raddb
++RADIUS_DIR    = ${DESTDIR}${PREFIX}/share/examples/raddb
  
  SERVER_OBJS   = radiusd.o files.o acct.o pam.o version.o proxy.o \
  			exec.o auth.o timestr.o cache.o readusers.o