Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Feb 2016 23:28:46 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408277 - in head: . sysutils sysutils/jailadmin
Message-ID:  <201602052328.u15NSkBS000916@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Fri Feb  5 23:28:46 2016
New Revision: 408277
URL: https://svnweb.freebsd.org/changeset/ports/408277

Log:
  Revive and update sysutils/jailadmin port.
  
  Simplify Makefile a bit for new options framework, remove port from MOVED.
  
  PR:		200476
  Submitted by:	Chris Hutchinson

Added:
  head/sysutils/jailadmin/
     - copied from r366979, head/sysutils/jailadmin/
Deleted:
  head/sysutils/jailadmin/pkg-plist
Modified:
  head/MOVED
  head/sysutils/Makefile
  head/sysutils/jailadmin/Makefile
  head/sysutils/jailadmin/distinfo
  head/sysutils/jailadmin/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Feb  5 22:38:15 2016	(r408276)
+++ head/MOVED	Fri Feb  5 23:28:46 2016	(r408277)
@@ -6859,7 +6859,6 @@ sysutils/eroaster||2014-09-01|Not staged
 sysutils/freqsdwn||2014-09-01|Not staged
 sysutils/gnomebaker||2014-09-01|Not staged
 sysutils/ispman||2014-09-01|Not staged
-sysutils/jailadmin||2014-09-01|Not staged
 sysutils/jailuser||2014-09-01|Not staged
 sysutils/linux-afaapps||2014-09-01|Not staged
 sysutils/netident||2014-09-01|Not staged

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Fri Feb  5 22:38:15 2016	(r408276)
+++ head/sysutils/Makefile	Fri Feb  5 23:28:46 2016	(r408277)
@@ -440,6 +440,7 @@
     SUBDIR += jadm
     SUBDIR += jail-primer
     SUBDIR += jail2
+    SUBDIR += jailadmin
     SUBDIR += jailctl
     SUBDIR += jaildaemon
     SUBDIR += jailme

Modified: head/sysutils/jailadmin/Makefile
==============================================================================
--- head/sysutils/jailadmin/Makefile	Tue Sep  2 09:04:44 2014	(r366979)
+++ head/sysutils/jailadmin/Makefile	Fri Feb  5 23:28:46 2016	(r408277)
@@ -2,40 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	jailadmin
-PORTVERSION=	1.8
-PORTREVISION=	5
+PORTVERSION=	1.9
 CATEGORIES=	sysutils
-MASTER_SITES=	http://subwiki.honeypot.net/pub/Freebsd/JailAdmin/
-DISTNAME=	jailadmin-${PORTVERSION}
+MASTER_SITES=	http://BSDforge.com/projects/source/sysutils/jailadmin/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	System for managing a set of named jails
+MAINTAINER=	portmaster@BSDforge.com
+COMMENT=	Jail management system with optional SNMP support
 
-USES=		perl5
+LICENSE=	BSD2CLAUSE
+
+OPTIONS_DEFINE=		SNMP DOCS
+SNMP_DESC=	install the additional SNMP management components
+
+USES=		perl5 shebangfix tar:xz
+SHEBANG_FILES=	jailadmin jail-snmp jail-snmp-persist
 
 PORTDOCS=	INSTALL README
+PLIST_FILES=	etc/jailadmin.conf.sample etc/rc.d/zzz-jail.sh \
+		sbin/jailadmin ${SITE_PERL_REL}/Jail.pm
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_PLIST_FILES=	sbin/jail-snmp sbin/jail-snmp-persist share/snmp/mibs/JAIL-MIB.txt
 
-.if defined(WITH_SNMP)
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-PLIST_SUB+=	SNMP=""
-.else
-INSTALL_TARGET=	installbase
-PLIST_SUB+=	SNMP="@comment "
-.endif
-
-pre-everything::
-	@${ECHO}
-	@${ECHO} "You can build ${PKGNAME} with the following options:"
-	@${ECHO} "WITH_SNMP     install the additional SNMP management components"
-	@${ECHO}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s#^SITEPERLDIR=.*#SITEPERLDIR= ${SITE_PERL}#" ${WRKSRC}/Makefile
-.ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e '/share\/doc/s/^[[:blank:]]/#&/' ${WRKSRC}/Makefile
-.endif
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/jail.sh ${STAGEDIR}${PREFIX}/etc/rc.d/zzz-jail.sh
+	${INSTALL_DATA} ${WRKSRC}/jailadmin.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_SCRIPT} ${WRKSRC}/jailadmin ${STAGEDIR}${PREFIX}/sbin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${CP} ${WRKSRC}/Jail.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+
+do-install-SNMP-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/jail-snmp ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/jail-snmp-persist ${STAGEDIR}${PREFIX}/sbin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/snmp/mibs
+	${INSTALL_DATA} ${WRKSRC}/JAIL-MIB.txt ${STAGEDIR}${PREFIX}/share/snmp/mibs
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/jailadmin/distinfo
==============================================================================
--- head/sysutils/jailadmin/distinfo	Tue Sep  2 09:04:44 2014	(r366979)
+++ head/sysutils/jailadmin/distinfo	Fri Feb  5 23:28:46 2016	(r408277)
@@ -1,2 +1,2 @@
-SHA256 (jailadmin-1.8.tar.gz) = 840aa3ee67a3235c39fb78928eea5608c94caa49324a7221e706f7d993afc37c
-SIZE (jailadmin-1.8.tar.gz) = 14732
+SHA256 (jailadmin-1.9.tar.xz) = db562e101ed4328248af963f24841824746886c21d1c65b10494dd37ab225566
+SIZE (jailadmin-1.9.tar.xz) = 13612

Modified: head/sysutils/jailadmin/pkg-descr
==============================================================================
--- head/sysutils/jailadmin/pkg-descr	Tue Sep  2 09:04:44 2014	(r366979)
+++ head/sysutils/jailadmin/pkg-descr	Fri Feb  5 23:28:46 2016	(r408277)
@@ -7,4 +7,4 @@ JailAdmin is a system for managing a set
 It is designed to provide more flexible functionality than FreeBSD's own
 rc.d/jail script, and should provide a complete superset of features.
 
-WWW: http://subwiki.honeypot.net/cgi-bin/view/Freebsd/JailAdmin
+WWW: http://BSDforge.com/projects/sysutils/jailadmin/



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