Index: head/sysutils/psgconf/Makefile =================================================================== --- head/sysutils/psgconf/Makefile (revision 187012) +++ head/sysutils/psgconf/Makefile (revision 187013) @@ -1,207 +1,210 @@ # New ports collection makefile for: psgconf # Date created: 17 Feb 2004 # Whom: Jim Pirzyk # # $FreeBSD$ # PORTNAME= psgconf -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.4 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 \ ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \ 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}/version.pm:${PORTSDIR}/devel/p5-version \ ${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff PERL_CONFIGURE= YES MAN1= psgconf.1 MAN3= PSGConf.3 \ PSGConf::Action.3 \ PSGConf::Action::ChGrp.3 \ PSGConf::Action::ChMod.3 \ PSGConf::Action::ChOwn.3 \ PSGConf::Action::CopyFile.3 \ PSGConf::Action::CreateFile.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 \ PSGConf::Action::GenerateFile::RC_Script.3 \ PSGConf::Action::GenerateFile::SASL_conf.3 \ PSGConf::Action::GenerateFile::TLI_hosts.3 \ PSGConf::Action::GenerateFile::auto_direct.3 \ PSGConf::Action::GenerateFile::dfstab.3 \ PSGConf::Action::GenerateFile::dsm_opt.3 \ PSGConf::Action::GenerateFile::dsm_sys.3 \ PSGConf::Action::GenerateFile::etc_cshrc.3 \ PSGConf::Action::GenerateFile::etc_exports.3 \ PSGConf::Action::GenerateFile::etc_group.3 \ PSGConf::Action::GenerateFile::etc_master_passwd.3 \ PSGConf::Action::GenerateFile::etc_passwd.3 \ PSGConf::Action::GenerateFile::etc_profile.3 \ PSGConf::Action::GenerateFile::etc_rpc.3 \ PSGConf::Action::GenerateFile::etc_security_passwd.3 \ PSGConf::Action::GenerateFile::etc_services.3 \ PSGConf::Action::GenerateFile::etc_shadow.3 \ PSGConf::Action::GenerateFile::etc_system.3 \ PSGConf::Action::GenerateFile::etc_user_attr.3 \ PSGConf::Action::GenerateFile::ftpaccess.3 \ PSGConf::Action::GenerateFile::hosts.3 \ PSGConf::Action::GenerateFile::hosts_allow.3 \ PSGConf::Action::GenerateFile::httpd_conf.3 \ PSGConf::Action::GenerateFile::inetd_conf.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::nsswitch_conf.3 \ PSGConf::Action::GenerateFile::ntp_conf.3 \ PSGConf::Action::GenerateFile::pam_conf.3 \ PSGConf::Action::GenerateFile::pam_file.3 \ PSGConf::Action::GenerateFile::printcap.3 \ PSGConf::Action::GenerateFile::qpopper_conf.3 \ PSGConf::Action::GenerateFile::resolv_conf.3 \ PSGConf::Action::GenerateFile::sendmail_aliases.3 \ PSGConf::Action::GenerateFile::sendmail_cf.3 \ PSGConf::Action::GenerateFile::sendmail_map.3 \ PSGConf::Action::GenerateFile::sendmail_mc.3 \ PSGConf::Action::GenerateFile::sendmail_trusted_users.3 \ PSGConf::Action::GenerateFile::sshd_config.3 \ PSGConf::Action::GenerateFile::sudoers.3 \ PSGConf::Action::GenerateFile::syslog_conf.3 \ PSGConf::Action::GenerateFile::tsm_inclexcl.3 \ PSGConf::Action::GenerateFile::workers_properties.3 \ PSGConf::Action::GenerateFile::xinetd_conf.3 \ PSGConf::Action::HomeDir.3 \ PSGConf::Action::lpadmin.3 \ PSGConf::Action::MkDir.3 \ PSGConf::Action::MkNod.3 \ PSGConf::Action::ModifyFile.3 \ PSGConf::Action::PackageManager.3 \ PSGConf::Action::PackageManager::Encap.3 \ PSGConf::Action::PackageManager::FTPArchive.3 \ PSGConf::Action::PackageManager::FreeBSD.3 \ PSGConf::Action::PackageManager::FreeBSD::Packages.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 \ PSGConf::Action::RestartDaemon.3 \ PSGConf::Action::RPMImportGPGKey.3 \ PSGConf::Action::RunCommand.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 \ PSGConf::Control::AIX.3 \ PSGConf::Control::AnonFTP.3 \ PSGConf::Control::Apache.3 \ PSGConf::Control::Apache::FastCGI.3 \ PSGConf::Control::Apache::mod_jk.3 \ PSGConf::Control::CachingDNS.3 \ PSGConf::Control::Core.3 \ PSGConf::Control::FreeBSD.3 \ PSGConf::Control::InitScripts.3 \ PSGConf::Control::Inittab.3 \ PSGConf::Control::NFS_Client.3 \ PSGConf::Control::NFS_Server.3 \ PSGConf::Control::NTP.3 \ PSGConf::Control::NameServiceSwitch.3 \ PSGConf::Control::Network.3 \ PSGConf::Control::PAM.3 \ PSGConf::Control::Packages.3 \ PSGConf::Control::PostgreSQL.3 \ PSGConf::Control::Printers.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 \ PSGConf::Control::TCPWrappers.3 \ PSGConf::Control::TSM.3 \ PSGConf::Control::Users.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 \ PSGConf::Control::sudo.3 \ PSGConf::Control::swatch.3 \ PSGConf::Control::syslog.3 \ PSGConf::Data.3 \ PSGConf::Data::Boolean.3 \ PSGConf::Data::ConfigError.3 \ PSGConf::Data::Enum.3 \ PSGConf::Data::Hash.3 \ PSGConf::Data::Integer.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 .if ${PERL_LEVEL} < 500800 BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net .endif RUN_DEPENDS= ${BUILD_DEPENDS} .if ${PERL_LEVEL} < 500600 IGNORE= requires perl 5.6 or newer .endif PKGINSTALL= ${WRKSRC}/postinstall PKGDEINSTALL= ${WRKSRC}/postinstall post-patch: ${FIND} ${WRKSRC} -name "*.orig" -delete +.if ${ARCH} == "amd64" +# Does not work because Proc::ProcessTable is broken post-build: cd ${WRKSRC} && ${MAKE} test +.endif 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} PKG_MGR=FreeBSD::Ports ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/sysutils/psgconf/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/sysutils/psgconf/distinfo =================================================================== --- head/sysutils/psgconf/distinfo (revision 187012) +++ head/sysutils/psgconf/distinfo (revision 187013) @@ -1,3 +1,3 @@ -MD5 (psgconf-3.2.3.tar.gz) = 59da41ee9c9fe2a97fd9920b86e43974 -SHA256 (psgconf-3.2.3.tar.gz) = ee95a3956bdfc8fee6a69e7b2cce830179c324413ca20cc0e9dbe9d9ea4540ed -SIZE (psgconf-3.2.3.tar.gz) = 238061 +MD5 (psgconf-3.2.4.tar.gz) = e4b9cb31dcbef71ce1a9132fe0b7fcb4 +SHA256 (psgconf-3.2.4.tar.gz) = 5e6e0dfb0daab9eba53765017aee07b83b67bd57c9c8afb06941464e1dcb6cdb +SIZE (psgconf-3.2.4.tar.gz) = 238460 Property changes on: head/sysutils/psgconf/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/sysutils/psgconf/files/patch-postinstall =================================================================== --- head/sysutils/psgconf/files/patch-postinstall (revision 187012) +++ head/sysutils/psgconf/files/patch-postinstall (nonexistent) @@ -1,18 +0,0 @@ ---- ./postinstall.orig Wed Oct 25 08:25:58 2006 -+++ ./postinstall Wed Feb 7 13:11:34 2007 -@@ -13,6 +13,7 @@ - - DATE=`date +%Y-%m-%d` - PKG_NAME=psgconf -+HOSTNAME=`uname -n` - - # ROOT_PATH is the relocatable start of the psgconf tree. - # Ala the root_path that is used in pkgadd(8) on Solaris. -@@ -128,7 +129,6 @@ - echo "Generating a default ${ROOT_PATH}${ETC_DIR}/psg.conf file"; - - # FIXME: Need to figure out the default network interface... -- HOSTNAME=`uname -n` - sed -e "s/^#hostname.*$/hostname \"$HOSTNAME\";/" \ - < ${SRC_CONF} \ - > ${ROOT_PATH}${ETC_DIR}/psg.conf Property changes on: head/sysutils/psgconf/files/patch-postinstall ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/psgconf/files/patch-PSGConf.pm =================================================================== --- head/sysutils/psgconf/files/patch-PSGConf.pm (revision 187012) +++ head/sysutils/psgconf/files/patch-PSGConf.pm (revision 187013) @@ -1,38 +1,21 @@ --- ./lib/PSGConf.pm.orig Sat Sep 23 13:44:35 2006 +++ ./lib/PSGConf.pm Thu Jan 11 11:15:45 2007 -@@ -14,6 +14,7 @@ - - use strict; - -+use File::Basename; - use File::Copy; - use File::Path; - use File::stat; -@@ -34,8 +35,8 @@ +@@ -34,8 +34,8 @@ my %defaults = ( config_dir => '/usr/local/share/psgconf/config', files_dir => '/usr/local/share/psgconf/files', - modules_file => '/etc/psgconf_modules', -- tmpdir => "/var/tmp/$0.$$", + modules_file => '/usr/local/etc/psgconf_modules', -+ tmpdir => '/var/tmp/' . basename $0 . ".$$", + tmpdir => '/var/tmp/' . basename $0 . ".$$", verbose => 0, do_fix => 0, restart_daemons => 1, -@@ -62,6 +63,7 @@ - - ### Set from the environment variables if - ### not set on the command line. -+ $0 = basename $0; - $self->{tmpdir} = $ENV{'PSGCONF_TMPDIR'} . "/$0.$$" - if ( !defined $self->{tmpdir} && - defined $ENV{'PSGCONF_TMPDIR'} && -@@ -677,7 +679,7 @@ +@@ -677,7 +677,7 @@ =item modules_file Full path to B modules file. Default is -F. +F. =item tmpdir Property changes on: head/sysutils/psgconf/files/patch-PSGConf.pm ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property