Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Oct 2013 16:38:05 +0000 (UTC)
From:      Joe Marcus Clarke <marcus@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330138 - head/net/tac_plus4
Message-ID:  <201310121638.r9CGc5Cc020980@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcus
Date: Sat Oct 12 16:38:05 2013
New Revision: 330138
URL: http://svnweb.freebsd.org/changeset/ports/330138

Log:
  * Add STAGE support
  * Use the USERS/GROUPS framework to create the tacacs user
  * Apparently, MAKE_JOB_UNSAFE is needed on i386 as well as amd64
  
  PR:		182616
  Submitted by:	ohauer

Deleted:
  head/net/tac_plus4/pkg-install
Modified:
  head/net/tac_plus4/Makefile
  head/net/tac_plus4/pkg-plist

Modified: head/net/tac_plus4/Makefile
==============================================================================
--- head/net/tac_plus4/Makefile	Sat Oct 12 16:33:59 2013	(r330137)
+++ head/net/tac_plus4/Makefile	Sat Oct 12 16:38:05 2013	(r330138)
@@ -18,17 +18,11 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-groupid=$$(/usr/bin/id -g tacacs 2>/dev/null || echo '559') \
 		--with-userid=$$(/usr/bin/id -u tacacs 2>/dev/null || echo '559')
 
-MAN5=		tac_plus.conf.5
-MAN8=		tac_plus.8 tac_pwd.8
+USERS=		tacacs
+GROUPS=		tacacs
 
 CONFLICTS=	ru-tac+ia-[0-9]* tac_plus-libradius-[0-9]*
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
 MAKE_JOBS_UNSAFE=	yes
-.endif
 
 # check expiration dates against 'expire' field of master.passwd file
 .if defined(TAC_EXPIRE_MASTER_PASSWD)
@@ -51,14 +45,9 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${PREFIX}/etc
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/tac_plus
-	${INSTALL_DATA} ${WRKSRC}/users_guide ${PREFIX}/share/doc/tac_plus
-	${INSTALL_SCRIPT} ${WRKSRC}/tac_convert ${PREFIX}/share/doc/tac_plus
-.endif
+	${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/tac_plus
+	${INSTALL_DATA} ${WRKSRC}/users_guide ${STAGEDIR}${PREFIX}/share/doc/tac_plus
+	${INSTALL_SCRIPT} ${WRKSRC}/tac_convert ${STAGEDIR}${PREFIX}/share/doc/tac_plus
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/tac_plus4/pkg-plist
==============================================================================
--- head/net/tac_plus4/pkg-plist	Sat Oct 12 16:33:59 2013	(r330137)
+++ head/net/tac_plus4/pkg-plist	Sat Oct 12 16:38:05 2013	(r330138)
@@ -6,6 +6,9 @@ lib/libtacacs.a
 lib/libtacacs.la
 lib/libtacacs.so
 lib/libtacacs.so.1
+man/man5/tac_plus.conf.5.gz
+man/man8/tac_plus.8.gz
+man/man8/tac_pwd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/tac_convert
 %%PORTDOCS%%%%DOCSDIR%%/users_guide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310121638.r9CGc5Cc020980>