Bug 172127 - [PATCH] net-mgmt/p5-FusionInventory-Agent: Fix plist
Summary: [PATCH] net-mgmt/p5-FusionInventory-Agent: Fix plist
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-28 02:00 UTC by Steve Wills
Modified: 2012-09-28 14:50 UTC (History)
1 user (show)

See Also:


Attachments
p5-FusionInventory-Agent-2.2.5.patch (3.91 KB, patch)
2012-09-28 02:00 UTC, Steve Wills
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Steve Wills freebsd_committer freebsd_triage 2012-09-28 02:00:18 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-28 02:00:33 UTC
Responsible Changed
From-To: freebsd-ports-bugs->perl

perl@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-28 02:00:37 UTC
Maintainer of net-mgmt/p5-FusionInventory-Agent,

Please note that PR ports/172127 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172127

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-28 02:00:41 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Steve Wills freebsd_committer freebsd_triage 2012-09-28 02:05:45 UTC
Responsible Changed
From-To: perl->swills

I'll take it.
Comment 5 Steve Wills freebsd_committer freebsd_triage 2012-09-28 14:41:56 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer freebsd_triage 2012-09-28 14:41:56 UTC
Author: swills
Date: Fri Sep 28 13:41:47 2012
New Revision: 304995
URL: http://svn.freebsd.org/changeset/ports/304995

Log:
  - Fix PLIST errors for config file
  - Pet portlint while here
  
  PR:		ports/172127
  Approved by:	"Veniamin Gvozdikov" <g.veniamin@googlemail.com> (maintainer, via private email)

Added:
  head/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL   (contents, props changed)
Modified:
  head/net-mgmt/p5-FusionInventory-Agent/Makefile
  head/net-mgmt/p5-FusionInventory-Agent/pkg-plist   (contents, props changed)

Modified: head/net-mgmt/p5-FusionInventory-Agent/Makefile
==============================================================================
--- head/net-mgmt/p5-FusionInventory-Agent/Makefile	Fri Sep 28 12:59:55 2012	(r304994)
+++ head/net-mgmt/p5-FusionInventory-Agent/Makefile	Fri Sep 28 13:41:47 2012	(r304995)
@@ -15,18 +15,8 @@ PKGNAMEPREFIX=	p5-
 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 @@ BUILD_DEPENDS=	p5-Text-Template>=0:${POR
 		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 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${POR
 		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 @@ post-patch-script:
 	@${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>

Added: head/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL	Fri Sep 28 13:41:47 2012	(r304995)
@@ -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)

Modified: head/net-mgmt/p5-FusionInventory-Agent/pkg-plist
==============================================================================
--- head/net-mgmt/p5-FusionInventory-Agent/pkg-plist	Fri Sep 28 12:59:55 2012	(r304994)
+++ head/net-mgmt/p5-FusionInventory-Agent/pkg-plist	Fri Sep 28 13:41:47 2012	(r304995)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"