sysutils/psgconf: update to 3.2

PR:		ports/98300
Submitted by:	maintainer

6 files changed, 43 insertions, 87 deletions

diff --git a/sysutils/psgconf/Makefile b/sysutils/psgconf/Makefile
index 2abb6d17cd95..464825e72c9c 100644
--- a/sysutils/psgconf/Makefile
+++ b/sysutils/psgconf/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	psgconf
-PORTVERSION=	3.1.12
+PORTVERSION=	3.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/
 
 MAINTAINER=	pirzyk@freebsd.org
 COMMENT=	Controls system configuration
 
-BUILD_DEPENDS= ${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Objective \
+BUILD_DEPENDS=	${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Objective \
+ 	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
  	${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
 	${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable/Process.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
 	${SITE_PERL}/${PERL_ARCH}/Unix/Mknod.pm:${PORTSDIR}/sysutils/p5-Unix-Mknod \
-	${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version
+	${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \
+	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
 
 PERL_CONFIGURE=	YES
 
@@ -30,6 +32,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Action::Crontab.3 \
 		PSGConf::Action::File.3 \
 		PSGConf::Action::GenerateFile.3 \
+		PSGConf::Action::GenerateFile::AppConfig.3 \
 		PSGConf::Action::GenerateFile::BSD_exports.3 \
 		PSGConf::Action::GenerateFile::EnvFile.3 \
 		PSGConf::Action::GenerateFile::Literal.3 \
@@ -91,6 +94,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Action::PackageManager::FreeBSD::Ports.3 \
 		PSGConf::Action::PackageManager::RedHat::RHN.3 \
 		PSGConf::Action::PackageManager::RedHat::RPMS.3 \
+		PSGConf::Action::PackageManager::RedHat::Yum.3 \
 		PSGConf::Action::PackageManager::Solaris.3 \
 		PSGConf::Action::Remove.3 \
 		PSGConf::Action::RemoveCrontab.3 \
@@ -100,6 +104,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Action::Symlink.3 \
 		PSGConf::Action::TouchFile.3 \
 		PSGConf::Action::UntarFile.3 \
+		PSGConf::Action::svcs::addpg.3 \
 		PSGConf::Action::svcs::import.3 \
 		PSGConf::Action::svcs::setprop.3 \
 		PSGConf::Control.3 \
@@ -113,9 +118,6 @@ MAN3=		PSGConf.3 \
 		PSGConf::Control::FreeBSD.3 \
 		PSGConf::Control::InitScripts.3 \
 		PSGConf::Control::Inittab.3 \
-		PSGConf::Control::Library::crle.3 \
-		PSGConf::Control::Library::ld_so_conf.3 \
-		PSGConf::Control::Library::ldconfig.3 \
 		PSGConf::Control::NFS_Client.3 \
 		PSGConf::Control::NFS_Server.3 \
 		PSGConf::Control::NTP.3 \
@@ -125,10 +127,12 @@ MAN3=		PSGConf.3 \
 		PSGConf::Control::Packages.3 \
 		PSGConf::Control::PostgreSQL.3 \
 		PSGConf::Control::Printers.3 \
-		PSGConf::Control::RHN.3 \
+		PSGConf::Control::RedHat.3 \
 		PSGConf::Control::RPC.3 \
+		PSGConf::Control::RPC::rstatd.3 \
 		PSGConf::Control::Resolver.3 \
 		PSGConf::Control::SASL.3 \
+		PSGConf::Control::SharedLibrary.3 \
 		PSGConf::Control::ShellStartupFiles.3 \
 		PSGConf::Control::Shells.3 \
 		PSGConf::Control::Solaris.3 \
@@ -146,6 +150,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Control::sendmail.3 \
 		PSGConf::Control::sshd.3 \
 		PSGConf::Control::sudo.3 \
+		PSGConf::Control::swatch.3 \
 		PSGConf::Control::syslog.3 \
 		PSGConf::Data.3 \
 		PSGConf::Data::Boolean.3 \
@@ -156,15 +161,26 @@ MAN3=		PSGConf.3 \
 		PSGConf::Data::List.3 \
 		PSGConf::Data::String.3 \
 		PSGConf::Data::Table.3 \
+		PSGConf::DataStore.3 \
+		PSGConf::DataStore::AppConfig.3 \
 		PSGConf::DataStore::ConfigFile.3 \
+		PSGConf::DataStore::Storable.3 \
+		PSGConf::Import::Data::Hash.3 \
+		PSGConf::Import::Data::List.3 \
+		PSGConf::Import::Data::Table.3 \
+		PSGConf::Import::inittab.3 \
+		PSGConf::Import::pkg_default_versions.3 \
+		PSGConf::Import::ports.3 \
+		PSGConf::Import::shells.3 \
+		PSGConf::Util.3 \
 		psgconf-intro.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 .endif
-RUN_DEPENDS=   ${BUILD_DEPENDS}
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		requires perl 5.6 or newer
@@ -173,10 +189,17 @@ IGNORE=		requires perl 5.6 or newer
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 
+post-build:
+	cd ${WRKSRC} && ${MAKE} test
+	${CP} ${WRKSRC}/postinstall ${PKGINSTALL}
+
 post-install:
 	-@${MKDIR} ${PREFIX}/etc
 	@${CP} ${WRKSRC}/etc/psg.conf ${PREFIX}/etc/psg.conf.sample
 	@${CP} ${WRKSRC}/etc/psgconf_modules ${PREFIX}/etc/psgconf_modules.sample
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	PKG_PREFIX=${PREFIX} PKG_MGR=FreeBSD::Ports ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+post-clean:
+	@${RM} -f ${PKGINSTALL}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/psgconf/distinfo b/sysutils/psgconf/distinfo
index bf967f32febd..43c002bdd277 100644
--- a/sysutils/psgconf/distinfo
+++ b/sysutils/psgconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (psgconf-3.1.12.tar.gz) = 08eb3d87da5a9b9327a97b1975c76e19
-SHA256 (psgconf-3.1.12.tar.gz) = 620c8b4b62469602326d10c916565a57cdf5d1840ac031b979f9db0ceee74f80
-SIZE (psgconf-3.1.12.tar.gz) = 210514
+MD5 (psgconf-3.2.tar.gz) = d51617f6d2e41ef3fcf5eaa3d5f01f05
+SHA256 (psgconf-3.2.tar.gz) = e55d35e517ea115a903d2d99d2dade0bdfd6c9594a3322f36fe50d0e1f277a95
+SIZE (psgconf-3.2.tar.gz) = 232351
diff --git a/sysutils/psgconf/files/patch-PSGConf.pm b/sysutils/psgconf/files/patch-PSGConf.pm
index af79c74cc39b..705af174f7bc 100644
--- a/sysutils/psgconf/files/patch-PSGConf.pm
+++ b/sysutils/psgconf/files/patch-PSGConf.pm
@@ -1,26 +1,15 @@
---- ./lib/PSGConf.pm.orig	Mon Jun 21 21:17:31 2004
-+++ ./lib/PSGConf.pm	Mon Jun 21 21:17:48 2004
-@@ -34,8 +34,8 @@
+--- ./lib/PSGConf.pm.orig	Wed May  3 08:55:41 2006
++++ ./lib/PSGConf.pm	Thu May  4 10:21:24 2006
+@@ -34,7 +34,7 @@
  my %defaults = (
  	config_dir		=> '/usr/local/share/psgconf/config',
- 	files_dir		=> '/usr/local/share/psgconf/files',
--	config_file		=> '/etc/psg.conf',
+ 	files_dir			=> '/usr/local/share/psgconf/files',
 -	modules_file		=> '/etc/psgconf_modules',
-+	config_file		=> '/usr/local/etc/psg.conf',
 +	modules_file		=> '/usr/local/etc/psgconf_modules',
  	tmpdir			=> "/var/tmp/psgconf.$$",
  	verbose			=> 0,
  	do_fix			=> 0,
-@@ -713,7 +713,7 @@
- =item config_file
- 
- Full path to B<psgconf> config file (if applicable).  Default is
--F</etc/psg.conf>.
-+F</usr/local/etc/psg.conf>.
- 
- =item files_dir
- 
-@@ -723,7 +723,7 @@
+@@ -678,7 +678,7 @@
  =item modules_file
  
  Full path to B<psgconf> modules file.  Default is
diff --git a/sysutils/psgconf/files/patch-psgconf_modules b/sysutils/psgconf/files/patch-psgconf_modules
deleted file mode 100644
index f48e22e68f9b..000000000000
--- a/sysutils/psgconf/files/patch-psgconf_modules
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./etc/psgconf_modules.orig	Mon Jun 21 21:55:15 2004
-+++ ./etc/psgconf_modules	Mon Jun 21 21:55:30 2004
-@@ -3,7 +3,7 @@
- ###
- 
- ### define data store module(s)
--DataStore	PSGConf::DataStore::ConfigFile	config_file=/etc/psg.conf
-+DataStore	PSGConf::DataStore::ConfigFile	config_file=/usr/local/etc/psg.conf
- 
- ### define control modules
--Control		PSGConf::Control::Packages	PackageManager=PSGConf::Action::PackageManager::Encap
-+Control		PSGConf::Control::Packages	PackageManager=PSGConf::Action::PackageManager::FreeBSD::Ports
- Control		PSGConf::Control::Users
- Control		PSGConf::Control::Core
- Control		PSGConf::Control::Solaris
diff --git a/sysutils/psgconf/pkg-descr b/sysutils/psgconf/pkg-descr
index e23e2ff3e6df..b5caa5fa8579 100644
--- a/sysutils/psgconf/pkg-descr
+++ b/sysutils/psgconf/pkg-descr
@@ -2,3 +2,5 @@ The psgconf package is a modular system configuration framework.  It
 includes a number of default modules to configure typical system
 parameters, and allows administrators to add their own modules to meet
 site-specific needs.
+
+WWW: http://www-dev.cites.uiuc.edu/psgconf/
diff --git a/sysutils/psgconf/pkg-install b/sysutils/psgconf/pkg-install
index 4a51f1782f73..e69de29bb2d1 100644
--- a/sysutils/psgconf/pkg-install
+++ b/sysutils/psgconf/pkg-install
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-###
-###  Copyright 2000-2005 University of Illinois Board of Trustees
-###  All rights reserved.
-###
-###  pkg-install - Install script to use with FreeBSD packages
-###
-###  Campus Information Technologies and Educational Services
-###  University of Illinois at Urbana-Champaign
-###
-
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
-
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-case $2 in
-	POST-INSTALL)
-		if [ ! -r ${PKG_PREFIX}/etc/psg.conf ]; then
-			echo "installing ${PKG_PREFIX}/etc/psg.conf";
-			cp ${PKG_PREFIX}/etc/psg.conf.sample ${PKG_PREFIX}/etc/psg.conf;
-		fi
-
-		if [ -f ${PORTSDIR}/Makefile ]; then
-			echo "configuring ${PKG_PREFIX}/etc/psgconf_modules to use ports collection";
-			sed -e 's/FreeBSD::Packages$/FreeBSD::Ports/' < ${PKG_PREFIX}/etc/psgconf_modules.sample > ${PKG_PREFIX}/etc/psgconf_modules.sample.new
-			if [ $? -eq 0 ]; then
-				mv ${PKG_PREFIX}/etc/psgconf_modules.sample.new ${PKG_PREFIX}/etc/psgconf_modules.sample
-			else
-				rm -f ${PKG_PREFIX}/etc/psgconf_modules.sample.new
-			fi
-		fi
-		if [ ! -r ${PKG_PREFIX}/etc/psgconf_modules ]; then
-			echo "installing ${PKG_PREFIX}/etc/psgconf_modules";
-			cp ${PKG_PREFIX}/etc/psgconf_modules.sample ${PKG_PREFIX}/etc/psgconf_modules
-		fi
-		;;
-esac
-
-exit 0