4 files changed, 39 insertions, 34 deletions

diff --git a/sysutils/psgconf/Makefile b/sysutils/psgconf/Makefile
index f0eab7e017bd..cc4310cf8796 100644
--- a/sysutils/psgconf/Makefile
+++ b/sysutils/psgconf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psgconf
-PORTVERSION=	3.2.4
+PORTVERSION=	3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/
 
@@ -18,8 +18,10 @@ BUILD_DEPENDS=	${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Obje
  	p5-NetAddr-IP>0:${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}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 	${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \
 	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
@@ -62,10 +64,13 @@ MAN3=		PSGConf.3 \
 		PSGConf::Action::GenerateFile::hosts_allow.3 \
 		PSGConf::Action::GenerateFile::httpd_conf.3 \
 		PSGConf::Action::GenerateFile::inetd_conf.3 \
+		PSGConf::Action::GenerateFile::logadm.3 \
+		PSGConf::Action::GenerateFile::logrotate.3 \
 		PSGConf::Action::GenerateFile::ld_so_config.3 \
 		PSGConf::Action::GenerateFile::mime_types.3 \
 		PSGConf::Action::GenerateFile::named_conf.3 \
 		PSGConf::Action::GenerateFile::netmasks.3 \
+		PSGConf::Action::GenerateFile::newsyslog.3 \
 		PSGConf::Action::GenerateFile::nsswitch_conf.3 \
 		PSGConf::Action::GenerateFile::ntp_conf.3 \
 		PSGConf::Action::GenerateFile::pam_conf.3 \
@@ -121,6 +126,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Control::FreeBSD.3 \
 		PSGConf::Control::InitScripts.3 \
 		PSGConf::Control::Inittab.3 \
+		PSGConf::Control::LogFiles.3 \
 		PSGConf::Control::NFS_Client.3 \
 		PSGConf::Control::NFS_Server.3 \
 		PSGConf::Control::NTP.3 \
@@ -145,10 +151,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Control::cron.3 \
 		PSGConf::Control::dtlogin.3 \
 		PSGConf::Control::inetd.3 \
-		PSGConf::Control::logadm.3 \
-		PSGConf::Control::logrotate.3 \
 		PSGConf::Control::motd.3 \
-		PSGConf::Control::newsyslog.3 \
 		PSGConf::Control::qpopper.3 \
 		PSGConf::Control::sendmail.3 \
 		PSGConf::Control::sshd.3 \
@@ -159,6 +162,7 @@ MAN3=		PSGConf.3 \
 		PSGConf::Data::Boolean.3 \
 		PSGConf::Data::ConfigError.3 \
 		PSGConf::Data::Enum.3 \
+		PSGConf::Data::FileTest.3 \
 		PSGConf::Data::Hash.3 \
 		PSGConf::Data::Integer.3 \
 		PSGConf::Data::List.3 \
@@ -168,13 +172,12 @@ MAN3=		PSGConf.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::group_info.3 \
 		PSGConf::Import::inittab.3 \
 		PSGConf::Import::pkg_default_versions.3 \
 		PSGConf::Import::ports.3 \
 		PSGConf::Import::shells.3 \
+		PSGConf::Import::user_info.3 \
 		PSGConf::Util.3 \
 		psgconf-intro.3
 
@@ -182,8 +185,8 @@ MAN3=		PSGConf.3 \
 
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 .endif
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PKGINSTALL=	${WRKSRC}/postinstall
 PKGDEINSTALL=	${WRKSRC}/postinstall
@@ -191,11 +194,12 @@ PKGDEINSTALL=	${WRKSRC}/postinstall
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 
-.if ${OSVERSION} > 599999
+#.if ${OSVERSION} > 599999
 # Does not work because Proc::ProcessTable is broken in 5.x
-post-build:
-	cd ${WRKSRC} && ${MAKE} test
-.endif
+#${BUILD_DEPENDS}+=	${SITE_PERL}/Perl/Tidy.pm:${PORTSDIR}/devel/perltidy
+#post-build:
+#	cd ${WRKSRC} && ${MAKE} test
+#.endif
 
 post-install:
 	-@${MKDIR} ${PREFIX}/etc
diff --git a/sysutils/psgconf/distinfo b/sysutils/psgconf/distinfo
index f2e86a8a2c35..97e04f88d892 100644
--- a/sysutils/psgconf/distinfo
+++ b/sysutils/psgconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (psgconf-3.2.4.tar.gz) = e4b9cb31dcbef71ce1a9132fe0b7fcb4
-SHA256 (psgconf-3.2.4.tar.gz) = 5e6e0dfb0daab9eba53765017aee07b83b67bd57c9c8afb06941464e1dcb6cdb
-SIZE (psgconf-3.2.4.tar.gz) = 238460
+MD5 (psgconf-3.3.tar.gz) = bb5b9913daa20855a5d83e5a75072c07
+SHA256 (psgconf-3.3.tar.gz) = a27670ba8f52a9627ba1185f895064f7871d9aa3f4467b0b8f95b8cf0d6bc746
+SIZE (psgconf-3.3.tar.gz) = 276468
diff --git a/sysutils/psgconf/files/patch-PSGConf.pm b/sysutils/psgconf/files/patch-PSGConf.pm
index 4367579df50b..e017b2216a49 100644
--- a/sysutils/psgconf/files/patch-PSGConf.pm
+++ b/sysutils/psgconf/files/patch-PSGConf.pm
@@ -1,16 +1,15 @@
---- ./lib/PSGConf.pm.orig	Sat Sep 23 13:44:35 2006
-+++ ./lib/PSGConf.pm	Thu Jan 11 11:15:45 2007
-@@ -34,8 +34,8 @@
+--- ./lib/PSGConf.pm.orig	Thu Jan 24 15:59:07 2008
++++ ./lib/PSGConf.pm	Fri Feb  1 17:23:53 2008
+@@ -39,7 +39,7 @@
  my %defaults = (
- 	config_dir		=> '/usr/local/share/psgconf/config',
- 	files_dir			=> '/usr/local/share/psgconf/files',
--	modules_file		=> '/etc/psgconf_modules',
-+	modules_file		=> '/usr/local/etc/psgconf_modules',
- 	tmpdir			=> '/var/tmp/' . basename $0 . ".$$",
- 	verbose			=> 0,
- 	do_fix			=> 0,
- 	restart_daemons	=> 1,
-@@ -677,7 +677,7 @@
+     config_dir      => "/usr/local/share/$myname/config",
+     files_dir       => "/usr/local/share/$myname/files",
+-    modules_file    => "/etc/${myname}_modules",
++    modules_file    => "/usr/local/etc/${myname}_modules",
+     myname          => $myname,
+     columns         => 80,
+     verbose         => 0,
+@@ -711,7 +711,7 @@
  =item modules_file
  
  Full path to B<psgconf> modules file.  Default is
diff --git a/sysutils/psgconf/pkg-plist b/sysutils/psgconf/pkg-plist
index aea84af339eb..fcc152c00773 100644
--- a/sysutils/psgconf/pkg-plist
+++ b/sysutils/psgconf/pkg-plist
@@ -9,11 +9,13 @@ sbin/platform-name
 %%DATADIR%%/config/platform-freebsd4.conf
 %%DATADIR%%/config/platform-freebsd5.conf
 %%DATADIR%%/config/platform-freebsd6.conf
+%%DATADIR%%/config/platform-freebsd7.conf
 %%DATADIR%%/config/platform-hpux10.conf
 %%DATADIR%%/config/platform-hpux11.conf
 %%DATADIR%%/config/platform-irix6.conf
 %%DATADIR%%/config/platform-rhel3.conf
 %%DATADIR%%/config/platform-rhel4.conf
+%%DATADIR%%/config/platform-rhel5.conf
 %%DATADIR%%/config/platform-rs6000-aix4.3.3.conf
 %%DATADIR%%/config/platform-rs6000-aix5.1.0.conf
 %%DATADIR%%/config/platform-solaris8.conf
@@ -61,10 +63,13 @@ sbin/platform-name
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/hosts_allow.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/httpd_conf.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/inetd_conf.pm
+%%SITE_PERL%%/PSGConf/Action/GenerateFile/logadm.pm
+%%SITE_PERL%%/PSGConf/Action/GenerateFile/logrotate.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/ld_so_config.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/mime_types.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/named_conf.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/netmasks.pm
+%%SITE_PERL%%/PSGConf/Action/GenerateFile/newsyslog.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/nsswitch_conf.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/ntp_conf.pm
 %%SITE_PERL%%/PSGConf/Action/GenerateFile/pam_conf.pm
@@ -120,6 +125,7 @@ sbin/platform-name
 %%SITE_PERL%%/PSGConf/Control/FreeBSD.pm
 %%SITE_PERL%%/PSGConf/Control/InitScripts.pm
 %%SITE_PERL%%/PSGConf/Control/Inittab.pm
+%%SITE_PERL%%/PSGConf/Control/LogFiles.pm
 %%SITE_PERL%%/PSGConf/Control/NFS_Client.pm
 %%SITE_PERL%%/PSGConf/Control/NFS_Server.pm
 %%SITE_PERL%%/PSGConf/Control/NTP.pm
@@ -144,10 +150,7 @@ sbin/platform-name
 %%SITE_PERL%%/PSGConf/Control/cron.pm
 %%SITE_PERL%%/PSGConf/Control/dtlogin.pm
 %%SITE_PERL%%/PSGConf/Control/inetd.pm
-%%SITE_PERL%%/PSGConf/Control/logadm.pm
-%%SITE_PERL%%/PSGConf/Control/logrotate.pm
 %%SITE_PERL%%/PSGConf/Control/motd.pm
-%%SITE_PERL%%/PSGConf/Control/newsyslog.pm
 %%SITE_PERL%%/PSGConf/Control/qpopper.pm
 %%SITE_PERL%%/PSGConf/Control/sendmail.pm
 %%SITE_PERL%%/PSGConf/Control/sshd.pm
@@ -158,6 +161,7 @@ sbin/platform-name
 %%SITE_PERL%%/PSGConf/Data/Boolean.pm
 %%SITE_PERL%%/PSGConf/Data/ConfigError.pm
 %%SITE_PERL%%/PSGConf/Data/Enum.pm
+%%SITE_PERL%%/PSGConf/Data/FileTest.pm
 %%SITE_PERL%%/PSGConf/Data/Hash.pm
 %%SITE_PERL%%/PSGConf/Data/Integer.pm
 %%SITE_PERL%%/PSGConf/Data/List.pm
@@ -167,13 +171,12 @@ sbin/platform-name
 %%SITE_PERL%%/PSGConf/DataStore/AppConfig.pm
 %%SITE_PERL%%/PSGConf/DataStore/ConfigFile.pm
 %%SITE_PERL%%/PSGConf/DataStore/Storable.pm
-%%SITE_PERL%%/PSGConf/Import/Data/Hash.pm
-%%SITE_PERL%%/PSGConf/Import/Data/List.pm
-%%SITE_PERL%%/PSGConf/Import/Data/Table.pm
+%%SITE_PERL%%/PSGConf/Import/group_info.pm
 %%SITE_PERL%%/PSGConf/Import/inittab.pm
 %%SITE_PERL%%/PSGConf/Import/pkg_default_versions.pm
 %%SITE_PERL%%/PSGConf/Import/ports.pm
 %%SITE_PERL%%/PSGConf/Import/shells.pm
+%%SITE_PERL%%/PSGConf/Import/user_info.pm
 %%SITE_PERL%%/PSGConf/Util.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGConf
 @dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat
@@ -188,7 +191,6 @@ sbin/platform-name
 @dirrmtry %%SITE_PERL%%/PSGConf/Control
 @dirrmtry %%SITE_PERL%%/PSGConf/Data
 @dirrmtry %%SITE_PERL%%/PSGConf/DataStore
-@dirrmtry %%SITE_PERL%%/PSGConf/Import/Data
 @dirrmtry %%SITE_PERL%%/PSGConf/Import
 @dirrmtry %%SITE_PERL%%/PSGConf
 @dirrmtry %%DATADIR%%/config