Thu Feb 11 22:37:50 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.25 -r1.26 pkgsrc/net/radiusd-cistron/Makefile
diff -r1.8 -r1.9 pkgsrc/net/radiusd-cistron/distinfo
diff -r1.4 -r1.5 pkgsrc/net/radiusd-cistron/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/net/radiusd-cistron/patches/patch-ab
cvs diff -r1.25 -r1.26 pkgsrc/net/radiusd-cistron/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/radiusd-cistron/Attic/Makefile 2007/12/22 12:39:57 1.25
+++ pkgsrc/net/radiusd-cistron/Attic/Makefile 2010/02/11 22:37:49 1.26
@@ -1,57 +1,59 @@ @@ -1,57 +1,59 @@
1# $NetBSD: Makefile,v 1.25 2007/12/22 12:39:57 obache Exp $ 1# $NetBSD: Makefile,v 1.26 2010/02/11 22:37:49 joerg Exp $
2 2
3DISTNAME= radiusd-cistron-1.6.8 3DISTNAME= radiusd-cistron-1.6.8
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ 5MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.radius.cistron.nl/ 8HOMEPAGE= http://www.radius.cistron.nl/
9COMMENT= RADIUS-compliant remote authentication and accounting server 9COMMENT= RADIUS-compliant remote authentication and accounting server
10 10
 11PKG_DESTDIR_SUPPORT= user-destdir
 12
11CONFLICTS+= freeradius-[0-9]* 13CONFLICTS+= freeradius-[0-9]*
12 14
13USE_TOOLS+= perl:run 15USE_TOOLS+= perl:run
14 16
15REPLACE_PERL= src/checkrad.pl 17REPLACE_PERL= src/checkrad.pl
16 18
17MAKE_FILE= Makefile.BSD 19MAKE_FILE= Makefile.BSD
18BUILD_DIRS= src 20BUILD_DIRS= src
19INSTALL_DIRS= src 21INSTALL_DIRS= src
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ 22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
21 ${PKGMANDIR}/man8 sbin share/examples/raddb \ 23 ${PKGMANDIR}/man8 sbin share/examples/raddb \
22 share/doc/radiusd-cistron 24 share/doc/radiusd-cistron
23 25
24RCD_SCRIPTS= radiusd 26RCD_SCRIPTS= radiusd
25 27
26OWN_DIRS_PERMS= /var/log/radacct ${ROOT_USER} ${ROOT_GROUP} 700 28OWN_DIRS_PERMS= /var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
27 29
28PKG_SYSCONFSUBDIR= raddb 30PKG_SYSCONFSUBDIR= raddb
29EGDIR= ${PREFIX}/share/examples/raddb 31EGDIR= ${PREFIX}/share/examples/raddb
30CONF_FILES= 32CONF_FILES=
31.for cfile in clients.sample dictionary dictionary.ascend dictionary.bay \ 33.for cfile in clients.sample dictionary dictionary.ascend dictionary.bay \
32 dictionary.cisco dictionary.cistron dictionary.compat \ 34 dictionary.cisco dictionary.cistron dictionary.compat \
33 dictionary.erx dictionary.livingston dictionary.redback \ 35 dictionary.erx dictionary.livingston dictionary.redback \
34 dictionary.shiva dictionary.tunnel dictionary.usr \ 36 dictionary.shiva dictionary.tunnel dictionary.usr \
35 dictionary.versanet hints.sample huntgroups.sample \ 37 dictionary.versanet hints.sample huntgroups.sample \
36 naslist.sample naspasswd.sample realms.sample users.sample 38 naslist.sample naspasswd.sample realms.sample users.sample
37CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//} 39CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
38.endfor 40.endfor
39 41
40post-install: 42post-install:
41 ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron/ 43 ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
42.for i in ChangeLog README README.CVX README.Y2K README.cisco \ 44.for i in ChangeLog README README.CVX README.Y2K README.cisco \
43 README.pam README.proxy README.radrelay README.simul \ 45 README.pam README.proxy README.radrelay README.simul \
44 README.tunnel README.usersfile 46 README.tunnel README.usersfile
45 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/ 47 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
46.endfor 48.endfor
47.for i in radclient.1 radlast.1 radtest.1 radwho.1 radzap.1 49.for i in radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
48 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/ 50 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
49.endfor 51.endfor
50.for i in clients.5rad naslist.5rad 52.for i in clients.5rad naslist.5rad
51 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/ 53 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
52.endfor 54.endfor
53.for i in radiusd.8 radrelay.8 radwatch.8 55.for i in radiusd.8 radrelay.8 radwatch.8
54 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/ 56 ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
55.endfor 57.endfor
56 58
57.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/net/radiusd-cistron/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/radiusd-cistron/Attic/distinfo 2007/12/22 12:39:57 1.8
+++ pkgsrc/net/radiusd-cistron/Attic/distinfo 2010/02/11 22:37:49 1.9
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.8 2007/12/22 12:39:57 obache Exp $ 1$NetBSD: distinfo,v 1.9 2010/02/11 22:37:49 joerg Exp $
2 2
3SHA1 (radiusd-cistron-1.6.8.tar.gz) = 7938d5acbb994174baf662a4b4641367c4e1fd95 3SHA1 (radiusd-cistron-1.6.8.tar.gz) = 7938d5acbb994174baf662a4b4641367c4e1fd95
4RMD160 (radiusd-cistron-1.6.8.tar.gz) = 06de37ca5e8a8354aaa7387255929388b49edb61 4RMD160 (radiusd-cistron-1.6.8.tar.gz) = 06de37ca5e8a8354aaa7387255929388b49edb61
5Size (radiusd-cistron-1.6.8.tar.gz) = 199459 bytes 5Size (radiusd-cistron-1.6.8.tar.gz) = 199459 bytes
6SHA1 (patch-aa) = 53f331bde823f23a869c779df92a6e400a204746 6SHA1 (patch-aa) = 7661709e49bf6797cfbbc86e45daf7be0f723d9a
7SHA1 (patch-ab) = a877e273f3d12228d4d0d6064115c5f55c044ad3 7SHA1 (patch-ab) = e04249a8953a473577c4467788726c2db1de89d3
8SHA1 (patch-ac) = 95053cdb7cc8a1672d32a953147074ea948e535b 8SHA1 (patch-ac) = 95053cdb7cc8a1672d32a953147074ea948e535b
9SHA1 (patch-ad) = 1220fdb3141391f6c15b7bfba014baf1a372f3b6 9SHA1 (patch-ad) = 1220fdb3141391f6c15b7bfba014baf1a372f3b6
10SHA1 (patch-ae) = 2049cfa99b6392ed178e11e283b2749df819a35c 10SHA1 (patch-ae) = 2049cfa99b6392ed178e11e283b2749df819a35c
11SHA1 (patch-af) = 7d2973054817eb8eae320a8a1a026f658e1cc70f 11SHA1 (patch-af) = 7d2973054817eb8eae320a8a1a026f658e1cc70f
12SHA1 (patch-ag) = b1fa6b062bb3134ddc02c98b4522c2efe20ba4f3 12SHA1 (patch-ag) = b1fa6b062bb3134ddc02c98b4522c2efe20ba4f3
cvs diff -r1.4 -r1.5 pkgsrc/net/radiusd-cistron/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/radiusd-cistron/patches/Attic/patch-aa 2003/12/16 19:19:41 1.4
+++ pkgsrc/net/radiusd-cistron/patches/Attic/patch-aa 2010/02/11 22:37:49 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $ 1$NetBSD: patch-aa,v 1.5 2010/02/11 22:37:49 joerg Exp $
2 2
3--- src/Makefile.BSD.orig Thu Apr 10 13:38:23 2003 3--- src/Makefile.BSD.orig Thu Apr 10 13:38:23 2003
4+++ src/Makefile.BSD Tue Dec 16 20:15:35 2003 4+++ src/Makefile.BSD Tue Dec 16 20:15:35 2003
5@@ -3,9 +3,8 @@ 5@@ -3,9 +3,8 @@
6 # 6 #
7 # 7 #
8  8
9-CC = gcc 9-CC = gcc
10-CFLAGS = -Wall -g -DNOSHADOW 10-CFLAGS = -Wall -g -DNOSHADOW
11-LDFLAGS = # -s 11-LDFLAGS = # -s
12+CFLAGS = -DNOSHADOW -DPREFIX=\"$(PREFIX)\" -DPKG_SYSCONFDIR=\"$(PKG_SYSCONFDIR)\" 12+CFLAGS = -DNOSHADOW -DPREFIX=\"$(PREFIX)\" -DPKG_SYSCONFDIR=\"$(PKG_SYSCONFDIR)\"
13+LDFLAGS = -s 13+LDFLAGS = -s
14 LIBS = 14 LIBS =
@@ -17,19 +17,19 @@ $NetBSD: patch-aa,v 1.4 2003/12/16 19:19 @@ -17,19 +17,19 @@ $NetBSD: patch-aa,v 1.4 2003/12/16 19:19
17@@ -16,12 +15,12 @@ 17@@ -16,12 +15,12 @@
18 #PAM = -DPAM 18 #PAM = -DPAM
19 #PAMLIB = -lpam 19 #PAMLIB = -lpam
20  20
21-INSTALL = install 21-INSTALL = install
22-DINSTALL = mkdir -p 22-DINSTALL = mkdir -p
23+INSTALL = install -c 23+INSTALL = install -c
24+DINSTALL= install -d 24+DINSTALL= install -d
25  25
26-BINDIR = /usr/local/bin 26-BINDIR = /usr/local/bin
27-SBINDIR = /usr/local/sbin 27-SBINDIR = /usr/local/sbin
28-MANDIR = /usr/local/man 28-MANDIR = /usr/local/man
29-SHAREDIR = /usr/local/share/radius 29-SHAREDIR = /usr/local/share/radius
30+BINDIR = $(PREFIX)/bin 30+BINDIR = ${DESTDIR}$(PREFIX)/bin
31+SBINDIR = $(PREFIX)/sbin 31+SBINDIR = ${DESTDIR}$(PREFIX)/sbin
32+MANDIR = $(PREFIX)/man 32+MANDIR = ${DESTDIR}$(PREFIX)/man
33+SHAREDIR = $(PREFIX)/share/examples/raddb 33+SHAREDIR = ${DESTDIR}$(PREFIX)/share/examples/raddb
34  34
35 .include "Make.inc" 35 .include "Make.inc"
cvs diff -r1.4 -r1.5 pkgsrc/net/radiusd-cistron/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/radiusd-cistron/patches/Attic/patch-ab 2003/12/16 19:19:41 1.4
+++ pkgsrc/net/radiusd-cistron/patches/Attic/patch-ab 2010/02/11 22:37:49 1.5
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $ 1$NetBSD: patch-ab,v 1.5 2010/02/11 22:37:49 joerg Exp $
2 2
3--- src/Make.inc.orig Thu Apr 10 13:51:47 2003 3--- src/Make.inc.orig Thu Apr 10 13:51:47 2003
4+++ src/Make.inc Tue Dec 16 20:10:28 2003 4+++ src/Make.inc Tue Dec 16 20:10:28 2003
5@@ -4,7 +4,7 @@ 5@@ -4,7 +4,7 @@
6 # 6 #
7 # 7 #
8  8
9-RADIUS_DIR = /etc/raddb 9-RADIUS_DIR = /etc/raddb
10+RADIUS_DIR = ${PREFIX}/share/examples/raddb 10+RADIUS_DIR = ${DESTDIR}${PREFIX}/share/examples/raddb
11  11
12 SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \ 12 SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \
13 exec.o auth.o timestr.o cache.o readusers.o 13 exec.o auth.o timestr.o cache.o readusers.o
14@@ -115,8 +115,6 @@ 14@@ -115,8 +115,6 @@
15  15
16 install: 16 install:
17 # Install the binaries 17 # Install the binaries
18- $(DINSTALL) $(SBINDIR) 18- $(DINSTALL) $(SBINDIR)
19- $(DINSTALL) $(BINDIR) 19- $(DINSTALL) $(BINDIR)
20 $(DINSTALL) $(RADIUS_DIR) 20 $(DINSTALL) $(RADIUS_DIR)
21 $(INSTALL) -m 755 -s radiusd $(SBINDIR)/radiusd 21 $(INSTALL) -m 755 -s radiusd $(SBINDIR)/radiusd
22 $(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay 22 $(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay
23@@ -127,23 +125,11 @@ 23@@ -127,23 +125,11 @@