From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 4 22:30:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 226B916A419 for ; Mon, 4 Feb 2008 22:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0325F13C46E for ; Mon, 4 Feb 2008 22:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m14MU3e3078838 for ; Mon, 4 Feb 2008 22:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m14MU3tZ078835; Mon, 4 Feb 2008 22:30:03 GMT (envelope-from gnats) Resent-Date: Mon, 4 Feb 2008 22:30:03 GMT Resent-Message-Id: <200802042230.m14MU3tZ078835@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jim Pirzyk Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D4A016A418 for ; Mon, 4 Feb 2008 22:24:07 +0000 (UTC) (envelope-from pirzyk@lilo.cites.uiuc.edu) Received: from lilo.cites.uiuc.edu (lilo.cites.uiuc.edu [128.174.204.195]) by mx1.freebsd.org (Postfix) with ESMTP id 2BCE213C442 for ; Mon, 4 Feb 2008 22:24:07 +0000 (UTC) (envelope-from pirzyk@lilo.cites.uiuc.edu) Received: from lilo.cites.uiuc.edu (localhost [127.0.0.1]) by lilo.cites.uiuc.edu (8.13.8/8.13.8) with ESMTP id m14MDNis035925 for ; Mon, 4 Feb 2008 16:13:23 -0600 (CST) (envelope-from pirzyk@lilo.cites.uiuc.edu) Received: (from pirzyk@localhost) by lilo.cites.uiuc.edu (8.13.8/8.13.8/Submit) id m14MDNAg035924; Mon, 4 Feb 2008 16:13:23 -0600 (CST) (envelope-from pirzyk) Message-Id: <200802042213.m14MDNAg035924@lilo.cites.uiuc.edu> Date: Mon, 4 Feb 2008 16:13:23 -0600 (CST) From: Jim Pirzyk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/120268: Update port sysutils/psgconf X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jim Pirzyk List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Feb 2008 22:30:04 -0000 >Number: 120268 >Category: ports >Synopsis: Update port sysutils/psgconf >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 04 22:30:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jim Pirzyk >Release: FreeBSD 6.2-RELEASE-p9 i386 >Organization: >Environment: System: FreeBSD lilo.cites.uiuc.edu 6.2-RELEASE-p9 FreeBSD 6.2-RELEASE-p9 #0: Thu Nov 29 04:07:33 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Updated the package from 3.2.4 to 3.3 >How-To-Repeat: >Fix: diff -Nru ./psgconf.orig/Makefile ./psgconf/Makefile --- ./psgconf.orig/Makefile Mon Oct 1 05:10:21 2007 +++ ./psgconf/Makefile Mon Feb 4 15:12:06 2008 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ .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 @@ 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 -Nru ./psgconf.orig/distinfo ./psgconf/distinfo --- ./psgconf.orig/distinfo Fri Mar 9 07:47:27 2007 +++ ./psgconf/distinfo Mon Feb 4 15:12:21 2008 @@ -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 -Nru ./psgconf.orig/files/patch-PSGConf.pm ./psgconf/files/patch-PSGConf.pm --- ./psgconf.orig/files/patch-PSGConf.pm Fri Mar 9 07:47:28 2007 +++ ./psgconf/files/patch-PSGConf.pm Fri Feb 1 17:24:32 2008 @@ -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 modules file. Default is diff -Nru ./psgconf.orig/pkg-plist ./psgconf/pkg-plist --- ./psgconf.orig/pkg-plist Thu Feb 8 15:02:44 2007 +++ ./psgconf/pkg-plist Fri Feb 1 17:19:20 2008 @@ -9,11 +9,13 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: