Date: Thu, 1 Jun 2006 13:31:37 -0500 (CDT) From: Jim Pirzyk <pirzyk@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98300: Udate port: sysutils/psgconf Version update of psgconf Message-ID: <200606011831.k51IVbab083120@lilo.ci.uiuc.edu> Resent-Message-ID: <200606011840.k51IeG7x064080@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98300 >Category: ports >Synopsis: Udate port: sysutils/psgconf Version update of 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: Thu Jun 01 18:40:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jim Pirzyk >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD lilo.ci.uiuc.edu 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 9 20:02:52 CDT 2006 supirzyk@lilo.ci.uiuc.edu:/services/scratch/usr/src/sys/VMWARE_KERNEL i386 >Description: >How-To-Repeat: >Fix: cvs delete sysutils/psgconf/files/patch-psgconf_modules cvs delete sysutils/psgconf/pkg-install diff -Nru psgconf.orig/Makefile psgconf/Makefile --- psgconf.orig/Makefile Wed Jan 4 18:15:39 2006 +++ psgconf/Makefile Thu Jun 1 13:23:05 2006 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -Nru psgconf.orig/distinfo psgconf/distinfo --- psgconf.orig/distinfo Wed Jan 4 18:15:39 2006 +++ psgconf/distinfo Wed May 31 09:03:27 2006 @@ -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 -Nru psgconf.orig/files/patch-ConfigFile2Storable psgconf/files/patch-ConfigFile2Storable --- psgconf.orig/files/patch-ConfigFile2Storable Wed Dec 31 18:00:00 1969 +++ psgconf/files/patch-ConfigFile2Storable Wed May 10 20:24:20 2006 @@ -0,0 +1,11 @@ +--- ./sbin/ConfigFile2Storable.orig 2006-05-04 08:29:40.000000000 -0500 ++++ ./sbin/ConfigFile2Storable 2006-05-04 10:13:46.000000000 -0500 +@@ -43,7 +43,7 @@ + ### Create a special psgconf_modules file so we guarentee + ### that we get use DataStore::$convert_from. + ### +-$modules_file = '/etc/psgconf_modules'; ++$modules_file = '/usr/local/etc/psgconf_modules'; + $modules_tmp_file = (( -d $ENV{'PSGCONF_TMPDIR'} )? + $ENV{'PSGCONF_TMPDIR'}: + '/var/tmp/') diff -Nru psgconf.orig/files/patch-PSGConf.pm psgconf/files/patch-PSGConf.pm --- psgconf.orig/files/patch-PSGConf.pm Thu Nov 24 07:04:29 2005 +++ psgconf/files/patch-PSGConf.pm Wed May 10 20:24:20 2006 @@ -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 -Nru psgconf.orig/files/patch-psgconf_modules psgconf/files/patch-psgconf_modules --- psgconf.orig/files/patch-psgconf_modules Thu Nov 24 07:04:29 2005 +++ psgconf/files/patch-psgconf_modules Wed Dec 31 18:00:00 1969 @@ -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 -Nru psgconf.orig/pkg-descr psgconf/pkg-descr --- psgconf.orig/pkg-descr Thu Nov 24 07:04:29 2005 +++ psgconf/pkg-descr Sun May 14 12:01:49 2006 @@ -2,3 +2,5 @@ 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 -Nru psgconf.orig/pkg-install psgconf/pkg-install --- psgconf.orig/pkg-install Wed Jan 4 18:15:39 2006 +++ psgconf/pkg-install Wed Dec 31 18:00:00 1969 @@ -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 diff -Nru psgconf.orig/pkg-plist psgconf/pkg-plist --- psgconf.orig/pkg-plist Sat Jan 21 20:52:17 2006 +++ psgconf/pkg-plist Thu Jun 1 13:22:42 2006 @@ -2,23 +2,27 @@ @unexec cmp %D/etc/psgconf_modules.sample %D/etc/psgconf_modules && rm %D/etc/psgconf_modules etc/psg.conf.sample etc/psgconf_modules.sample +sbin/ConfigFile2Storable sbin/psgconf +sbin/psgconf-import sbin/platform-name -share/psgconf/config/defaults.conf -share/psgconf/config/platform-freebsd4.conf -share/psgconf/config/platform-freebsd5.conf -share/psgconf/config/platform-freebsd6.conf -share/psgconf/config/platform-hpux10.conf -share/psgconf/config/platform-hpux11.conf -share/psgconf/config/platform-irix6.conf -share/psgconf/config/platform-ix86-linux2.4.conf -share/psgconf/config/platform-rs6000-aix4.3.3.conf -share/psgconf/config/platform-rs6000-aix5.1.0.conf -share/psgconf/config/platform-sparc-solaris8.conf -share/psgconf/config/platform-sparc-solaris9.conf -share/psgconf/config/platform-sparc-solaris10.conf -share/psgconf/files/magic -share/psgconf/files/rc.shutdown +%%DATADIR%%/config/defaults.conf +%%DATADIR%%/config/platform-fc4.conf +%%DATADIR%%/config/platform-freebsd4.conf +%%DATADIR%%/config/platform-freebsd5.conf +%%DATADIR%%/config/platform-freebsd6.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-rs6000-aix4.3.3.conf +%%DATADIR%%/config/platform-rs6000-aix5.1.0.conf +%%DATADIR%%/config/platform-solaris8.conf +%%DATADIR%%/config/platform-solaris9.conf +%%DATADIR%%/config/platform-solaris10.conf +%%DATADIR%%/files/magic +%%DATADIR%%/files/rc.shutdown %%SITE_PERL%%//%%PERL_ARCH%%/auto/PSGConf/.packlist %%SITE_PERL%%/psgconf-intro.pod %%SITE_PERL%%/PSGConf.pm @@ -29,6 +33,7 @@ %%SITE_PERL%%/PSGConf/Action/Crontab.pm %%SITE_PERL%%/PSGConf/Action/File.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile.pm +%%SITE_PERL%%/PSGConf/Action/GenerateFile/AppConfig.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile/BSD_exports.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile/EnvFile.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile/Literal.pm @@ -90,17 +95,19 @@ %%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD/Ports.pm %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/RHN.pm %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/RPMS.pm +%%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat/Yum.pm %%SITE_PERL%%/PSGConf/Action/PackageManager/Solaris.pm %%SITE_PERL%%/PSGConf/Action/Remove.pm %%SITE_PERL%%/PSGConf/Action/RemoveCrontab.pm %%SITE_PERL%%/PSGConf/Action/RestartDaemon.pm %%SITE_PERL%%/PSGConf/Action/RPMImportGPGKey.pm %%SITE_PERL%%/PSGConf/Action/RunCommand.pm +%%SITE_PERL%%/PSGConf/Action/svcs/addpg.pm +%%SITE_PERL%%/PSGConf/Action/svcs/import.pm +%%SITE_PERL%%/PSGConf/Action/svcs/setprop.pm %%SITE_PERL%%/PSGConf/Action/Symlink.pm %%SITE_PERL%%/PSGConf/Action/TouchFile.pm %%SITE_PERL%%/PSGConf/Action/UntarFile.pm -%%SITE_PERL%%/PSGConf/Action/svcs/import.pm -%%SITE_PERL%%/PSGConf/Action/svcs/setprop.pm %%SITE_PERL%%/PSGConf/Control.pm %%SITE_PERL%%/PSGConf/Control/AIX.pm %%SITE_PERL%%/PSGConf/Control/AnonFTP.pm @@ -112,9 +119,6 @@ %%SITE_PERL%%/PSGConf/Control/FreeBSD.pm %%SITE_PERL%%/PSGConf/Control/InitScripts.pm %%SITE_PERL%%/PSGConf/Control/Inittab.pm -%%SITE_PERL%%/PSGConf/Control/Library/crle.pm -%%SITE_PERL%%/PSGConf/Control/Library/ld_so_conf.pm -%%SITE_PERL%%/PSGConf/Control/Library/ldconfig.pm %%SITE_PERL%%/PSGConf/Control/NFS_Client.pm %%SITE_PERL%%/PSGConf/Control/NFS_Server.pm %%SITE_PERL%%/PSGConf/Control/NTP.pm @@ -124,10 +128,12 @@ %%SITE_PERL%%/PSGConf/Control/Packages.pm %%SITE_PERL%%/PSGConf/Control/PostgreSQL.pm %%SITE_PERL%%/PSGConf/Control/Printers.pm -%%SITE_PERL%%/PSGConf/Control/RHN.pm %%SITE_PERL%%/PSGConf/Control/RPC.pm +%%SITE_PERL%%/PSGConf/Control/RPC/rstatd.pm +%%SITE_PERL%%/PSGConf/Control/RedHat.pm %%SITE_PERL%%/PSGConf/Control/Resolver.pm %%SITE_PERL%%/PSGConf/Control/SASL.pm +%%SITE_PERL%%/PSGConf/Control/SharedLibrary.pm %%SITE_PERL%%/PSGConf/Control/ShellStartupFiles.pm %%SITE_PERL%%/PSGConf/Control/Shells.pm %%SITE_PERL%%/PSGConf/Control/Solaris.pm @@ -145,6 +151,7 @@ %%SITE_PERL%%/PSGConf/Control/sendmail.pm %%SITE_PERL%%/PSGConf/Control/sshd.pm %%SITE_PERL%%/PSGConf/Control/sudo.pm +%%SITE_PERL%%/PSGConf/Control/swatch.pm %%SITE_PERL%%/PSGConf/Control/syslog.pm %%SITE_PERL%%/PSGConf/Data.pm %%SITE_PERL%%/PSGConf/Data/Boolean.pm @@ -155,7 +162,17 @@ %%SITE_PERL%%/PSGConf/Data/List.pm %%SITE_PERL%%/PSGConf/Data/String.pm %%SITE_PERL%%/PSGConf/Data/Table.pm +%%SITE_PERL%%/PSGConf/DataStore.pm +%%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/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/Util.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGConf @dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat @@ -165,11 +182,13 @@ @dirrmtry %%SITE_PERL%%/PSGConf/Action/svcs @dirrmtry %%SITE_PERL%%/PSGConf/Action @dirrmtry %%SITE_PERL%%/PSGConf/Control/Apache -@dirrmtry %%SITE_PERL%%/PSGConf/Control/Library +@dirrmtry %%SITE_PERL%%/PSGConf/Control/RPC @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 share/psgconf/config -@dirrmtry share/psgconf/files -@dirrmtry share/psgconf +@dirrmtry %%DATADIR%%/config +@dirrmtry %%DATADIR%%/files +@dirrmtry %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606011831.k51IVbab083120>