From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 13 02:10:12 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E03E16A41F for ; Tue, 13 Dec 2005 02:10:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98C8C43D6A for ; Tue, 13 Dec 2005 02:10:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBD2A3Jj031069 for ; Tue, 13 Dec 2005 02:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBD2A3ww031068; Tue, 13 Dec 2005 02:10:03 GMT (envelope-from gnats) Resent-Date: Tue, 13 Dec 2005 02:10:03 GMT Resent-Message-Id: <200512130210.jBD2A3ww031068@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8EE516A41F for ; Tue, 13 Dec 2005 02:00:33 +0000 (GMT) (envelope-from pirzyk@lilo.cites.uiuc.edu) Received: from lilo.cites.uiuc.edu (lilo.cites.uiuc.edu [128.174.86.231]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B8F443D5E for ; Tue, 13 Dec 2005 02:00:33 +0000 (GMT) (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.4/8.13.4) with ESMTP id jBD20WAc075989 for ; Mon, 12 Dec 2005 20:00:32 -0600 (CST) (envelope-from pirzyk@lilo.cites.uiuc.edu) Received: (from pirzyk@localhost) by lilo.cites.uiuc.edu (8.13.4/8.13.4/Submit) id jBD20WSm075988; Mon, 12 Dec 2005 20:00:32 -0600 (CST) (envelope-from pirzyk) Message-Id: <200512130200.jBD20WSm075988@lilo.cites.uiuc.edu> Date: Mon, 12 Dec 2005 20:00:32 -0600 (CST) From: Jim Pirzyk To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/90318: 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: Tue, 13 Dec 2005 02:10:12 -0000 >Number: 90318 >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: Tue Dec 13 02:10:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jim Pirzyk >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD lilo.cites.uiuc.edu 5.4-STABLE FreeBSD 5.4-STABLE #15: Fri Nov 4 09:03:01 CST 2005 root@lilo.cites.uiuc.edu:/usr/obj/usr/src/sys/LILO_KERNEL i386 Not sure I have the conditional dependancy right, as this depends on Net::FTP, which is in perl 5.8 but not before. The application can run with perl 5.6, if Net::FTP is included. >Description: >How-To-Repeat: >Fix: diff -Nru sysutils/psgconf/Makefile sysutils/psgconf-dev/Makefile --- sysutils/psgconf/Makefile Thu Nov 24 15:10:24 2005 +++ sysutils/psgconf-dev/Makefile Sun Dec 11 21:31:13 2005 @@ -6,7 +6,7 @@ # PORTNAME= psgconf -PORTVERSION= 3.1.5 +PORTVERSION= 3.1.12 CATEGORIES= sysutils MASTER_SITES= ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/ @@ -16,8 +16,8 @@ BUILD_DEPENDS= ${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Objective \ ${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 -RUN_DEPENDS= ${BUILD_DEPENDS} + ${SITE_PERL}/${PERL_ARCH}/Unix/Mknod.pm:${PORTSDIR}/sysutils/p5-Unix-Mknod \ + ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version PERL_CONFIGURE= YES @@ -26,6 +26,7 @@ PSGConf::Action.3 \ PSGConf::Action::ChMod.3 \ PSGConf::Action::CopyFile.3 \ + PSGConf::Action::CreateFile.3 \ PSGConf::Action::Crontab.3 \ PSGConf::Action::File.3 \ PSGConf::Action::GenerateFile.3 \ @@ -78,6 +79,7 @@ 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 \ @@ -93,9 +95,12 @@ 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::import.3 \ PSGConf::Action::svcs::setprop.3 \ PSGConf::Control.3 \ PSGConf::Control::AIX.3 \ @@ -155,6 +160,11 @@ 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= this port requires perl 5.6 or newer diff -Nru sysutils/psgconf/distinfo sysutils/psgconf-dev/distinfo --- sysutils/psgconf/distinfo Thu Nov 24 07:04:29 2005 +++ sysutils/psgconf-dev/distinfo Sun Dec 11 21:31:26 2005 @@ -1,2 +1,3 @@ -MD5 (psgconf-3.1.5.tar.gz) = 493794887e885a30f7859f85ba02633b -SIZE (psgconf-3.1.5.tar.gz) = 197379 +MD5 (psgconf-3.1.12.tar.gz) = 08eb3d87da5a9b9327a97b1975c76e19 +SHA256 (psgconf-3.1.12.tar.gz) = 620c8b4b62469602326d10c916565a57cdf5d1840ac031b979f9db0ceee74f80 +SIZE (psgconf-3.1.12.tar.gz) = 210514 diff -Nru sysutils/psgconf/pkg-install sysutils/psgconf-dev/pkg-install --- sysutils/psgconf/pkg-install Thu Nov 24 07:04:29 2005 +++ sysutils/psgconf-dev/pkg-install Thu Dec 8 15:17:51 2005 @@ -21,12 +21,21 @@ POST-INSTALL) if [ ! -r ${PKG_PREFIX}/etc/psg.conf ]; then echo "installing ${PKG_PREFIX}/etc/psg.conf"; - cp ${PKG_PREFIX}/etc/psg.conf ${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 ${PKG_PREFIX}/etc/psgconf_modules + cp ${PKG_PREFIX}/etc/psgconf_modules.sample ${PKG_PREFIX}/etc/psgconf_modules fi ;; esac diff -Nru sysutils/psgconf/pkg-plist sysutils/psgconf-dev/pkg-plist --- sysutils/psgconf/pkg-plist Thu Nov 24 07:04:29 2005 +++ sysutils/psgconf-dev/pkg-plist Thu Dec 8 11:53:51 2005 @@ -1,5 +1,3 @@ -@unexec cmp %D/etc/psg.conf.sample %D/etc/psg.conf && rm %D/etc/psg.conf -@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/psgconf @@ -25,6 +23,7 @@ %%SITE_PERL%%/PSGConf/Action.pm %%SITE_PERL%%/PSGConf/Action/ChMod.pm %%SITE_PERL%%/PSGConf/Action/CopyFile.pm +%%SITE_PERL%%/PSGConf/Action/CreateFile.pm %%SITE_PERL%%/PSGConf/Action/Crontab.pm %%SITE_PERL%%/PSGConf/Action/File.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile.pm @@ -77,6 +76,7 @@ %%SITE_PERL%%/PSGConf/Action/GenerateFile/workers_properties.pm %%SITE_PERL%%/PSGConf/Action/GenerateFile/xinetd_conf.pm %%SITE_PERL%%/PSGConf/Action/HomeDir.pm +%%SITE_PERL%%/PSGConf/Action/lpadmin.pm %%SITE_PERL%%/PSGConf/Action/MkDir.pm %%SITE_PERL%%/PSGConf/Action/MkNod.pm %%SITE_PERL%%/PSGConf/Action/ModifyFile.pm @@ -92,9 +92,12 @@ %%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/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 >Release-Note: >Audit-Trail: >Unformatted: