Date: Thu, 27 Sep 2012 20:59:38 -0400 (EDT) From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: g.veniamin@googlemail.com Subject: ports/172127: [PATCH] net-mgmt/p5-FusionInventory-Agent: Fix plist Message-ID: <201209280059.q8S0xckQ012153@meatwad.mouf.net> Resent-Message-ID: <201209280100.q8S10IKH067756@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172127 >Category: ports >Synopsis: [PATCH] net-mgmt/p5-FusionInventory-Agent: Fix plist >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 28 01:00:18 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #7 r239244M: Mon Aug 13 23:21:42 EDT >Description: - Fix plist See: http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/a.9.20120913072723/p5-FusionInventory-Agent-2.2.5.log Port maintainer (g.veniamin@googlemail.com) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- p5-FusionInventory-Agent-2.2.5.patch begins here --- Index: pkg-plist =================================================================== --- pkg-plist (revision 304978) +++ pkg-plist (working copy) @@ -1,5 +1,8 @@ bin/fusioninventory-agent bin/fusioninventory-injector +@unexec if cmp -s %D/etc/fusioninventory/agent.cfg.sample %D/etc/fusioninventory/agent.cfg; then rm -f %D/etc/fusioninventory/agent.cfg; fi +etc/fusioninventory/agent.cfg.sample +@exec if [ ! -f %D/etc/fusioninventory/agent.cfg ] ; then cp -p %D/etc/fusioninventory/agent.cfg.sample %D/etc/fusioninventory/agent.cfg; fi share/fusioninventory/lib/FusionInventory/Agent.pm share/fusioninventory/lib/FusionInventory/Agent/Config.pm share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client.pm Index: Makefile =================================================================== --- Makefile (revision 304978) +++ Makefile (working copy) @@ -15,18 +15,8 @@ MAINTAINER= g.veniamin@googlemail.com COMMENT= Agent for OCS Inventory server and FusionInventory for GLPI servers -OPTIONS= CUPS "Enable CUPS" OFF \ - HTTP "Enable HTTP daemon mode" OFF \ - ZLIB "Enable Zlib compression" ON \ - SSL "Enable SSL" OFF \ - DMIDECODE "Enable dmidecode hardware information" ON \ - PCIUTILS "Enable pciutils hardware information" ON \ - NMAP "Enable NMAP network inventory" OFF - LICENSE= GPLv2 -USE_GMAKE= yes - BUILD_DEPENDS= p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \ p5-ExtUtils-MakeMaker>=6.59:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \ p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \ @@ -36,7 +26,6 @@ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which RUN_DEPENDS:= ${BUILD_DEPENDS} - TEST_DEPENDS= p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \ p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \ p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \ @@ -44,9 +33,18 @@ p5-HTTP-Proxy>=0:${PORTSDIR}/www/p5-HTTP-Proxy \ p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \ p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \ - p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture \ + p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture +OPTIONS= CUPS "Enable CUPS" OFF \ + HTTP "Enable HTTP daemon mode" OFF \ + ZLIB "Enable Zlib compression" ON \ + SSL "Enable SSL" OFF \ + DMIDECODE "Enable dmidecode hardware information" ON \ + PCIUTILS "Enable pciutils hardware information" ON \ + NMAP "Enable NMAP network inventory" OFF + PERL_CONFIGURE= yes +USE_GMAKE= yes MAN1= fusioninventory-agent.1 \ fusioninventory-injector.1 @@ -125,4 +123,9 @@ @${FIND} ${WRKSRC} -type f \( -name '*.orig' \) -delete @${ECHO_MSG} " [ DONE ]" +post-install: + @if [ ! -f ${PREFIX}/etc/fusioninventory/agent.cfg ]; then \ + ${CP} -p ${PREFIX}/etc/fusioninventory/agent.cfg.sample ${PREFIX}/etc/fusioninventory/agent.cfg ; \ + fi + .include <bsd.port.post.mk> Index: files/patch-Makefile.PL =================================================================== --- files/patch-Makefile.PL (revision 0) +++ files/patch-Makefile.PL (working copy) @@ -0,0 +1,15 @@ +--- Makefile.PL.orig 2012-09-27 23:53:24.000000000 +0000 ++++ Makefile.PL 2012-09-27 23:55:38.000000000 +0000 +@@ -151,11 +151,7 @@ + + config_install : + install -d -m 755 $(DESTDIR)$(SYSCONFDIR) +- if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \ +- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \ +- else \ +- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \ +- fi ++ install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.sample + + data_install : + install -d -m 755 $(DESTDIR)$(DATADIR) Property changes on: files/patch-Makefile.PL ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --- p5-FusionInventory-Agent-2.2.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209280059.q8S0xckQ012153>