aboutsummaryrefslogtreecommitdiff
path: root/net/radiusd-cistron
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-09-24 22:39:03 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-09-24 22:39:03 +0000
commit38244dff046c603c4ad08ed87d49d7e6a561a75d (patch)
treef1f3cc444ee2e57fe560ccc1b8bad2c63e22f01f /net/radiusd-cistron
parent2936bbc1ce965e70bcd2408d6b36b21426e091dc (diff)
downloadports-38244dff046c603c4ad08ed87d49d7e6a561a75d.tar.gz
ports-38244dff046c603c4ad08ed87d49d7e6a561a75d.zip
- Do not violate stagedir
- Shebangfix - Simplify a bit - Mark jobs unsafe
Notes
Notes: svn path=/head/; revision=369212
Diffstat (limited to 'net/radiusd-cistron')
-rw-r--r--net/radiusd-cistron/Makefile21
-rw-r--r--net/radiusd-cistron/files/patch-Make.inc7
-rw-r--r--net/radiusd-cistron/pkg-plist6
3 files changed, 13 insertions, 21 deletions
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 233456e76e58..81221c10a4bb 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -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 authentication and accounting server
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>
diff --git a/net/radiusd-cistron/files/patch-Make.inc b/net/radiusd-cistron/files/patch-Make.inc
index e6822391efd1..d9122a21b818 100644
--- a/net/radiusd-cistron/files/patch-Make.inc
+++ b/net/radiusd-cistron/files/patch-Make.inc
@@ -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; \
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index fb83f0b328f4..4d8bb945838c 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -48,9 +48,5 @@ share/radius/dictionary.versanet
%%PORTDOCS%%%%DOCSDIR%%/README.proxy
%%PORTDOCS%%%%DOCSDIR%%/README.simul
%%PORTDOCS%%%%DOCSDIR%%/README.usersfile
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/raddb
-@dirrm share/radius
-@exec mkdir -m 700 /var/log/radacct || true
-@unexec rmdir /var/log/radacct || true
+@dir(,,700) /var/log/radacct
@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."