From 74b6d2031ac9071fbeba5d089ec4ba5c6192c35a Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 12 Oct 2003 10:47:56 +0000
Subject: - use DOCSDIR and PORTDOC - optimize install

---
 net/radiusd-cistron/Makefile  | 20 +++++++++-----------
 net/radiusd-cistron/pkg-plist | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 3ef2a9cfd395..5c1a1509d79a 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A RADIUS-compliant remote authentication and accouting server
 
+CONFLICTS?=	freeradius-0.* gnu-radius-1.* openradius-0.*
 MAKEFILE=	Makefile.BSD
 RADIUS_DIR=	${PREFIX}/etc/raddb
 MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}"
@@ -24,6 +25,10 @@ MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
 MAN5=		clients.5rad naslist.5rad
 MAN8=		radiusd.8 radrelay.8 radwatch.8
 
+DOCFILES=	COPYRIGHT INSTALL doc/ChangeLog doc/README doc/README.Y2K \
+		doc/README.cisco doc/README.pam doc/README.proxy \
+		doc/README.simul doc/README.usersfile
+
 do-build:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE}
 
@@ -44,17 +49,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.pam ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.proxy ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.simul ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-cistron
+	${MKDIR} ${DOCSDIR}
+.for i in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index fb1ef334a895..529997dc8983 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -28,18 +28,18 @@ share/radius/dictionary.standard
 share/radius/dictionary.tunnel
 share/radius/dictionary.usr
 share/radius/dictionary.versanet
-share/doc/radiusd-cistron/COPYRIGHT
-share/doc/radiusd-cistron/ChangeLog
-share/doc/radiusd-cistron/INSTALL
-share/doc/radiusd-cistron/README
-share/doc/radiusd-cistron/README.Y2K
-share/doc/radiusd-cistron/README.cisco
-share/doc/radiusd-cistron/README.pam
-share/doc/radiusd-cistron/README.proxy
-share/doc/radiusd-cistron/README.simul
-share/doc/radiusd-cistron/README.usersfile
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.Y2K
+%%PORTDOCS%%%%DOCSDIR%%/README.cisco
+%%PORTDOCS%%%%DOCSDIR%%/README.pam
+%%PORTDOCS%%%%DOCSDIR%%/README.proxy
+%%PORTDOCS%%%%DOCSDIR%%/README.simul
+%%PORTDOCS%%%%DOCSDIR%%/README.usersfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/raddb
-@dirrm share/doc/radiusd-cistron
 @dirrm share/radius
 @unexec rm -f /var/log/radius.log
 @unexec rm -f /var/run/radiusd.pid
-- 
cgit v1.2.3