From owner-svn-ports-head@FreeBSD.ORG Wed Sep 24 22:39:04 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C78A5D6E; Wed, 24 Sep 2014 22:39:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B346A7C9; Wed, 24 Sep 2014 22:39:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8OMd447048211; Wed, 24 Sep 2014 22:39:04 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8OMd4Qe048208; Wed, 24 Sep 2014 22:39:04 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409242239.s8OMd4Qe048208@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 24 Sep 2014 22:39:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369212 - in head/net/radiusd-cistron: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Sep 2014 22:39:05 -0000 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 - -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 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%% -@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."