3 files changed, 52 insertions, 36 deletions

diff --git a/sysutils/auto-admin/Makefile b/sysutils/auto-admin/Makefile
index 3543ec98775c..c9179ff8cd72 100644
--- a/sysutils/auto-admin/Makefile
+++ b/sysutils/auto-admin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	auto-admin
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
@@ -10,7 +10,7 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Tools for automating system management
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USES=		tar:xz
 
@@ -18,12 +18,12 @@ NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/sbin ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/Scripts/Common/* ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/Scripts/FreeBSD/* ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/Common/Scripts/* ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/FreeBSD/Scripts/* ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/Data/* ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/Doc/auto-admin.man \
 		${STAGEDIR}${MANPREFIX}/man/man1/auto-admin.1
-	for name in ${WRKSRC}/Scripts/Common/* ${WRKSRC}/Scripts/FreeBSD/*; do \
+	for name in ${WRKSRC}/Common/Scripts/* ${WRKSRC}/FreeBSD/Scripts/*; do \
 		${INSTALL_MAN} ${WRKSRC}/Doc/auto-admin.man \
 			${STAGEDIR}${MANPREFIX}/man/man1/`basename $${name}`.1; \
 	done
diff --git a/sysutils/auto-admin/distinfo b/sysutils/auto-admin/distinfo
index 8ea85a041134..b5318f3542f8 100644
--- a/sysutils/auto-admin/distinfo
+++ b/sysutils/auto-admin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (auto-admin-0.3.3.tar.xz) = 21c3e4376b5799afbdb83fca1758baa6f990c6760b0a6273ad09bf2416c2d96d
-SIZE (auto-admin-0.3.3.tar.xz) = 19528
+SHA256 (auto-admin-0.3.4.tar.xz) = 9e60eec356a59c15127fe383de5e38d71e061c991b4e69e5bbf42ae44c8b3d6c
+SIZE (auto-admin-0.3.4.tar.xz) = 42392
diff --git a/sysutils/auto-admin/pkg-plist b/sysutils/auto-admin/pkg-plist
index 3c4481fa1f3c..9bba76df3650 100644
--- a/sysutils/auto-admin/pkg-plist
+++ b/sysutils/auto-admin/pkg-plist
@@ -1,16 +1,57 @@
+man/man1/auto-admin.1.gz
+man/man1/auto-amd-nfs-setup.1.gz
+man/man1/auto-append-line.1.gz
+man/man1/auto-ask.1.gz
+man/man1/auto-clean-ports.1.gz
+man/man1/auto-config-snd-driver.1.gz
+man/man1/auto-db-dir.1.gz
+man/man1/auto-denyhosts-remove-ip.1.gz
+man/man1/auto-denyhosts-setup.1.gz
+man/man1/auto-disable-service.1.gz
+man/man1/auto-enable-autologout.1.gz
+man/man1/auto-enable-compat32.1.gz
+man/man1/auto-enable-hal-mount.1.gz
+man/man1/auto-enable-passwdqc.1.gz
+man/man1/auto-enable-procfs.1.gz
+man/man1/auto-enable-service.1.gz
+man/man1/auto-fastest-mirror.1.gz
+man/man1/auto-harden.1.gz
+man/man1/auto-insert-line.1.gz
+man/man1/auto-install-packages.1.gz
+man/man1/auto-ipfw-gateway-setup.1.gz
+man/man1/auto-kdm3-toggle.1.gz
+man/man1/auto-ldap-adduser.1.gz
+man/man1/auto-ldap-client-setup.1.gz
+man/man1/auto-package-installed.1.gz
+man/man1/auto-pkgsrc-setup.1.gz
+man/man1/auto-print-make-variable.1.gz
+man/man1/auto-pxe-installer-setup.1.gz
+man/man1/auto-pxe-node-discover.1.gz
+man/man1/auto-replace-file.1.gz
+man/man1/auto-service-enabled.1.gz
+man/man1/auto-set-suspend-mode.1.gz
+man/man1/auto-ssh-authorize.1.gz
+man/man1/auto-update-port-framework.1.gz
+man/man1/auto-update-xorg.conf.1.gz
+man/man1/auto-using-pkgng.1.gz
+man/man1/auto-xdm-toggle.1.gz
 sbin/auto-amd-nfs-setup
 sbin/auto-append-line
 sbin/auto-ask
 sbin/auto-clean-ports
 sbin/auto-config-snd-driver
 sbin/auto-db-dir
+sbin/auto-denyhosts-remove-ip
+sbin/auto-denyhosts-setup
 sbin/auto-disable-service
+sbin/auto-enable-autologout
 sbin/auto-enable-compat32
 sbin/auto-enable-hal-mount
 sbin/auto-enable-passwdqc
 sbin/auto-enable-procfs
 sbin/auto-enable-service
 sbin/auto-fastest-mirror
+sbin/auto-harden
 sbin/auto-insert-line
 sbin/auto-install-packages
 sbin/auto-ipfw-gateway-setup
@@ -18,41 +59,16 @@ sbin/auto-kdm3-toggle
 sbin/auto-ldap-adduser
 sbin/auto-ldap-client-setup
 sbin/auto-package-installed
+sbin/auto-pkgsrc-setup
 sbin/auto-print-make-variable
+sbin/auto-pxe-installer-setup
+sbin/auto-pxe-node-discover
 sbin/auto-replace-file
 sbin/auto-service-enabled
 sbin/auto-set-suspend-mode
+sbin/auto-ssh-authorize
 sbin/auto-update-port-framework
 sbin/auto-update-xorg.conf
 sbin/auto-using-pkgng
 sbin/auto-xdm-toggle
-man/man1/auto-admin.1.gz
-man/man1/auto-amd-nfs-setup.1.gz
-man/man1/auto-append-line.1.gz
-man/man1/auto-ask.1.gz
-man/man1/auto-clean-ports.1.gz
-man/man1/auto-config-snd-driver.1.gz
-man/man1/auto-db-dir.1.gz
-man/man1/auto-disable-service.1.gz
-man/man1/auto-enable-compat32.1.gz
-man/man1/auto-enable-hal-mount.1.gz
-man/man1/auto-enable-passwdqc.1.gz
-man/man1/auto-enable-procfs.1.gz
-man/man1/auto-enable-service.1.gz
-man/man1/auto-set-suspend-mode.1.gz
-man/man1/auto-fastest-mirror.1.gz
-man/man1/auto-install-packages.1.gz
-man/man1/auto-ipfw-gateway-setup.1.gz
-man/man1/auto-kdm3-toggle.1.gz
-man/man1/auto-ldap-adduser.1.gz
-man/man1/auto-ldap-client-setup.1.gz
-man/man1/auto-package-installed.1.gz
-man/man1/auto-print-make-variable.1.gz
-man/man1/auto-replace-file.1.gz
-man/man1/auto-service-enabled.1.gz
-man/man1/auto-insert-line.1.gz
-man/man1/auto-update-xorg.conf.1.gz
-man/man1/auto-update-port-framework.1.gz
-man/man1/auto-using-pkgng.1.gz
-man/man1/auto-xdm-toggle.1.gz
 %%DATADIR%%/ipfw-rules.sh