svn commit: r369212 - in head/net/radiusd-cistron: . files

[Antoine Brodin]

Author: antoine
Date: Wed Sep 24 22:39:03 2014
New Revision: 369212
URL: http://svnweb.freebsd.org/changeset/ports/369212
QAT: https://qat.redports.org/buildarchive/r369212/

Log:
  - Do not violate stagedir
  - Shebangfix
  - Simplify a bit
  - Mark jobs unsafe

Modified:
  head/net/radiusd-cistron/Makefile
  head/net/radiusd-cistron/files/patch-Make.inc
  head/net/radiusd-cistron/pkg-plist

Modified: head/net/radiusd-cistron/Makefile
==============================================================================
--- head/net/radiusd-cistron/Makefile	Wed Sep 24 22:09:40 2014	(r369211)
+++ head/net/radiusd-cistron/Makefile	Wed Sep 24 22:39:03 2014	(r369212)
@@ -3,7 +3,7 @@
 
 PORTNAME=	radiusd-cistron
 PORTVERSION=	1.6.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.radius.cistron.nl/pub/radius/
 
@@ -12,10 +12,15 @@ COMMENT=	RADIUS-compliant remote authent
 
 CONFLICTS?=	freeradius-0.* gnu-radius-1.* openradius-0.*
 
+USES=		shebangfix
+SHEBANG_FILES=	src/checkrad.pl
 MAKEFILE=	Makefile.BSD
 RADIUS_DIR=	${PREFIX}/etc/raddb
 MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}" DESTROOT="${STAGEDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+BUILD_WRKSRC=	${WRKSRC}/src
+INSTALL_WRKSRC=	${WRKSRC}/src
+MAKE_JOBS_UNSAFE=	yes
 
 USE_RC_SUBR=	radiusd-cistron radrelay-cistron
 DOCFILES=	COPYRIGHT INSTALL doc/ChangeLog doc/README doc/README.Y2K \
@@ -26,19 +31,9 @@ OPTIONS_DEFINE=	PAM DOCS
 OPTIONS_DEFAULT=PAM
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-PLIST_SUB+=	PAMBASE="/usr/local/etc"
-
-do-build:
-	${DO_MAKE_BUILD} -C ${WRKSRC}/src
-
-do-install:
-.if ${PORT_OPTIONS:MPAM}
-	${MKDIR} ${STAGEDIR}/etc/pam.d
-.endif
-	${DO_MAKE_BUILD} -C ${WRKSRC}/src install
+post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/var/log/radacct
 
 .include <bsd.port.mk>

Modified: head/net/radiusd-cistron/files/patch-Make.inc
==============================================================================
--- head/net/radiusd-cistron/files/patch-Make.inc	Wed Sep 24 22:09:40 2014	(r369211)
+++ head/net/radiusd-cistron/files/patch-Make.inc	Wed Sep 24 22:39:03 2014	(r369212)
@@ -1,5 +1,5 @@
---- src/Make.inc.orig	2003-04-10 12:51:47.000000000 +0200
-+++ src/Make.inc	2013-11-17 09:08:44.000000000 +0100
+--- src/Make.inc.orig	2003-04-10 10:51:47 UTC
++++ src/Make.inc
 @@ -4,7 +4,7 @@
  #
  #
@@ -39,7 +39,8 @@
 +	$(INSTALL) -m 755    radtest $(DESTROOT)$(BINDIR)
  	# Install the man pages
  	@for section in 1 5 8; do \
- 		$(DINSTALL) $(MANDIR)/man$$section; \
+-		$(DINSTALL) $(MANDIR)/man$$section; \
++		$(DINSTALL) $(DESTROOT)$(MANDIR)/man$$section; \
  		for manfile in ../doc/*.$$section*; do \
 -		    echo $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \
 -		    $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \

Modified: head/net/radiusd-cistron/pkg-plist
==============================================================================
--- head/net/radiusd-cistron/pkg-plist	Wed Sep 24 22:09:40 2014	(r369211)
+++ head/net/radiusd-cistron/pkg-plist	Wed Sep 24 22:39:03 2014	(r369212)
@@ -48,9 +48,5 @@ share/radius/dictionary.versanet
 %%PORTDOCS%%%%DOCSDIR%%/README.proxy
 %%PORTDOCS%%%%DOCSDIR%%/README.simul
 %%PORTDOCS%%%%DOCSDIR%%/README.usersfile
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm etc/raddb
- at dirrm share/radius
- at exec mkdir -m 700 /var/log/radacct || true
- at unexec rmdir /var/log/radacct || true
+ at dir(,,700) /var/log/radacct
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."