pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

auto-admin: Clean up



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed Sep 6 11:08:12 2017 -0500
Changeset:	5304fa7932fd37fe1d65e2a057d6dc9300d96490

Modified Files:
	auto-admin/Makefile
	auto-admin/PLIST.FreeBSD
	auto-admin/PLIST.Linux
	auto-admin/PLIST.NetBSD
Added Files:
	auto-admin/PLIST.common
Removed Files:
	auto-admin/PLIST.Darwin

Log Message:
auto-admin: Clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5304fa7932fd37fe1d65e2a057d6dc9300d96490

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 auto-admin/Makefile      |  4 +++-
 auto-admin/PLIST.Darwin  | 30 -----------------------------
 auto-admin/PLIST.FreeBSD | 49 ++++++++++++++++++++++++++++++------------------
 auto-admin/PLIST.Linux   | 36 -----------------------------------
 auto-admin/PLIST.NetBSD  | 36 -----------------------------------
 auto-admin/PLIST.common  | 37 ++++++++++++++++++++++++++++++++++++
 6 files changed, 71 insertions(+), 121 deletions(-)

diffs:
diff --git a/auto-admin/Makefile b/auto-admin/Makefile
index f53af3de3b..bdd16ef9a4 100644
--- a/auto-admin/Makefile
+++ b/auto-admin/Makefile
@@ -23,6 +23,8 @@ SUBST_SED.prefix=	-e "s|/usr/local|${PREFIX}|g"
 
 INSTALLATION_DIRS=	sbin
 
+REDHAT_RELEASE=		/etc/redhat-release
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/Common/Scripts/* \
 		${DESTDIR}${PREFIX}/sbin
@@ -30,7 +32,7 @@ do-install:
 	    ${INSTALL_SCRIPT} ${WRKSRC}/${OPSYS}/Scripts/* \
 		${DESTDIR}${PREFIX}/sbin; \
 	fi
-	if ${TEST} -e /etc/redhat-release; then \
+	if ${TEST} -e ${REDHAT_RELEASE}; then \
 	    ${INSTALL_SCRIPT} ${WRKSRC}/CentOS/Scripts/* \
 		${DESTDIR}${PREFIX}/sbin; \
 	fi
diff --git a/auto-admin/PLIST.Darwin b/auto-admin/PLIST.Darwin
deleted file mode 100644
index 06f462479a..0000000000
--- a/auto-admin/PLIST.Darwin
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD$
-sbin/auto-adduser
-sbin/auto-admin
-sbin/auto-append-line
-sbin/auto-ask
-sbin/auto-backup-file
-sbin/auto-clean-pkgsrc
-sbin/auto-denyhosts-remove-ip
-sbin/auto-denyhosts-setup
-sbin/auto-disable-tcp-timestamps
-sbin/auto-enable-autologout
-sbin/auto-enable-passwdqc
-sbin/auto-file-secure
-sbin/auto-harden
-sbin/auto-insert-line
-sbin/auto-ldap-adduser
-sbin/auto-ostype
-sbin/auto-pkgsrc-add-license
-sbin/auto-pkgsrc-setup
-sbin/auto-pkgsrc-wip-checkout
-sbin/auto-print-make-variable
-sbin/auto-pxe-node-discover
-sbin/auto-replace-file
-sbin/auto-restore-pw
-sbin/auto-set-sysctl
-sbin/auto-set-umask
-sbin/auto-ssh-authorize
-sbin/auto-ssh-reverse-authorize
-sbin/auto-update-system
-sbin/auto-using-pkgsrc
diff --git a/auto-admin/PLIST.FreeBSD b/auto-admin/PLIST.FreeBSD
index e0c5084722..d00836550a 100644
--- a/auto-admin/PLIST.FreeBSD
+++ b/auto-admin/PLIST.FreeBSD
@@ -1,19 +1,32 @@
 @comment $NetBSD$
-sbin/auto-append-line
-sbin/auto-ask
-sbin/auto-backup-file
-sbin/auto-clean-pkgsrc
-sbin/auto-denyhosts-remove-ip
-sbin/auto-denyhosts-setup
-sbin/auto-enable-autologout
-sbin/auto-enable-passwdqc
-sbin/auto-file-secure
-sbin/auto-harden
-sbin/auto-insert-line
-sbin/auto-ldap-adduser
-sbin/auto-pkgsrc-setup
-sbin/auto-pxe-node-discover
-sbin/auto-replace-file
-sbin/auto-restore-pw
-sbin/auto-ssh-authorize
-sbin/auto-update-system
+sbin/auto-add-fdesc-mount
+sbin/auto-add-linproc-mount
+sbin/auto-add-proc-mount
+sbin/auto-amd-nfs-setup
+sbin/auto-autofs-nfs-setup
+sbin/auto-clean-ports
+sbin/auto-config-snd-driver
+sbin/auto-db-dir
+sbin/auto-detect-intel-gpu
+sbin/auto-disable-service
+sbin/auto-enable-compat32
+sbin/auto-enable-hal-mount
+sbin/auto-enable-procfs
+sbin/auto-enable-service
+sbin/auto-fastest-mirror
+sbin/auto-install-packages
+sbin/auto-ipfw-gateway-setup
+sbin/auto-kdm3-toggle
+sbin/auto-ldap-client-setup
+sbin/auto-mount-any
+sbin/auto-package-installed
+sbin/auto-ports-checkout
+sbin/auto-ports-setup
+sbin/auto-pxe-installer-setup
+sbin/auto-service-enabled
+sbin/auto-set-lid-switch-mode
+sbin/auto-update-port-framework
+sbin/auto-update-xorg.conf
+sbin/auto-using-pkgng
+sbin/auto-wifi-failover
+sbin/auto-xdm-toggle
diff --git a/auto-admin/PLIST.Linux b/auto-admin/PLIST.Linux
index c12d451121..7860497c5d 100644
--- a/auto-admin/PLIST.Linux
+++ b/auto-admin/PLIST.Linux
@@ -1,44 +1,8 @@
 @comment $NetBSD$
-sbin/auto-adduser
-sbin/auto-admin
-sbin/auto-append-line
-sbin/auto-ask
-sbin/auto-backup-file
-sbin/auto-change-group-gid
-sbin/auto-change-group-ownership
-sbin/auto-change-primary-group
-sbin/auto-change-uid
-sbin/auto-clean-pkgsrc
-sbin/auto-clean-tmp
 sbin/auto-cuda-install
-sbin/auto-denyhosts-remove-ip
-sbin/auto-denyhosts-setup
 sbin/auto-disable-file-transfers
 sbin/auto-disable-hyperthreading
-sbin/auto-disable-tcp-timestamps
-sbin/auto-enable-autologout
-sbin/auto-enable-passwdqc
-sbin/auto-file-secure
-sbin/auto-harden
-sbin/auto-insert-line
-sbin/auto-ldap-adduser
 sbin/auto-ldap-client-setup
-sbin/auto-ostype
-sbin/auto-passwd-user-expiration
-sbin/auto-pkgsrc-add-license
-sbin/auto-pkgsrc-setup
-sbin/auto-pkgsrc-wip-checkout
-sbin/auto-print-make-variable
 sbin/auto-pxe-installer-setup
-sbin/auto-pxe-node-discover
 sbin/auto-register-dhcp-hostname
-sbin/auto-replace-file
-sbin/auto-restore-pw
-sbin/auto-restore-user
 sbin/auto-set-memory-limits
-sbin/auto-set-sysctl
-sbin/auto-set-umask
-sbin/auto-ssh-authorize
-sbin/auto-ssh-reverse-authorize
-sbin/auto-update-system
-sbin/auto-using-pkgsrc
diff --git a/auto-admin/PLIST.NetBSD b/auto-admin/PLIST.NetBSD
index dc38f1ed85..472dcda779 100644
--- a/auto-admin/PLIST.NetBSD
+++ b/auto-admin/PLIST.NetBSD
@@ -1,43 +1,7 @@
 @comment $NetBSD$
-sbin/auto-adduser
-sbin/auto-admin
-sbin/auto-append-line
-sbin/auto-ask
-sbin/auto-backup-file
-sbin/auto-change-group-gid
-sbin/auto-change-group-ownership
-sbin/auto-change-primary-group
-sbin/auto-change-uid
-sbin/auto-clean-pkgsrc
-sbin/auto-clean-tmp
-sbin/auto-denyhosts-remove-ip
-sbin/auto-denyhosts-setup
 sbin/auto-desktop-setup
-sbin/auto-disable-tcp-timestamps
-sbin/auto-enable-autologout
-sbin/auto-enable-passwdqc
-sbin/auto-file-secure
-sbin/auto-harden
-sbin/auto-insert-line
 sbin/auto-install-packages
 sbin/auto-install-packages-from-source
 sbin/auto-install-pkgsrc-tree
-sbin/auto-ldap-adduser
-sbin/auto-ostype
 sbin/auto-package-installed
-sbin/auto-passwd-user-expiration
-sbin/auto-pkgsrc-add-license
-sbin/auto-pkgsrc-setup
-sbin/auto-pkgsrc-wip-checkout
-sbin/auto-print-make-variable
-sbin/auto-pxe-node-discover
-sbin/auto-replace-file
-sbin/auto-restore-pw
-sbin/auto-restore-user
 sbin/auto-select-pkgsrc-dist
-sbin/auto-set-sysctl
-sbin/auto-set-umask
-sbin/auto-ssh-authorize
-sbin/auto-ssh-reverse-authorize
-sbin/auto-update-system
-sbin/auto-using-pkgsrc
diff --git a/auto-admin/PLIST.common b/auto-admin/PLIST.common
new file mode 100644
index 0000000000..0fdb4a4dbc
--- /dev/null
+++ b/auto-admin/PLIST.common
@@ -0,0 +1,37 @@
+@comment $NetBSD$
+sbin/auto-adduser
+sbin/auto-admin
+sbin/auto-append-line
+sbin/auto-ask
+sbin/auto-backup-file
+sbin/auto-change-group-gid
+sbin/auto-change-group-ownership
+sbin/auto-change-primary-group
+sbin/auto-change-uid
+sbin/auto-clean-pkgsrc
+sbin/auto-clean-tmp
+sbin/auto-denyhosts-remove-ip
+sbin/auto-denyhosts-setup
+sbin/auto-disable-tcp-timestamps
+sbin/auto-enable-autologout
+sbin/auto-enable-passwdqc
+sbin/auto-file-secure
+sbin/auto-harden
+sbin/auto-insert-line
+sbin/auto-ldap-adduser
+sbin/auto-ostype
+sbin/auto-passwd-user-expiration
+sbin/auto-pkgsrc-add-license
+sbin/auto-pkgsrc-setup
+sbin/auto-pkgsrc-wip-checkout
+sbin/auto-print-make-variable
+sbin/auto-pxe-node-discover
+sbin/auto-replace-file
+sbin/auto-restore-pw
+sbin/auto-restore-user
+sbin/auto-set-sysctl
+sbin/auto-set-umask
+sbin/auto-ssh-authorize
+sbin/auto-ssh-reverse-authorize
+sbin/auto-update-system
+sbin/auto-using-pkgsrc


Home | Main Index | Thread Index | Old Index