[csw-devel] SF.net SVN: gar:[8022] csw/mgar/pkg/pca/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8022
          http://gar.svn.sourceforge.net/gar/?rev=8022&view=rev
Author:   dmichelsen
Date:     2010-01-15 16:48:13 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
pca: Add /etc/opt/csw as default location and add sample config file

Modified Paths:
--------------
    csw/mgar/pkg/pca/trunk/Makefile
    csw/mgar/pkg/pca/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch

Modified: csw/mgar/pkg/pca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pca/trunk/Makefile	2010-01-15 16:41:00 UTC (rev 8021)
+++ csw/mgar/pkg/pca/trunk/Makefile	2010-01-15 16:48:13 UTC (rev 8022)
@@ -18,7 +18,9 @@
 DISTFILES += COPYING
 DISTFILES += pca.conf
 
-PATCHFILES = 0001-prefer-opencsw-perl.diff
+PATCHFILES  = 0001-prefer-opencsw-perl.diff
+PATCHFILES += 0002-Add-etc-opt-csw-as-config-location.patch
+
 #PATCHDIRLEVEL = 0
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -34,17 +36,21 @@
 SPKG_SOURCEURL = http://www.par.univie.ac.at/solaris/pca/
 SPKG_VERSION = $(shell echo $(GARVERSION) | sed -e 's/-/./g')
 
+SAMPLECONF = /etc/opt/csw/pca.conf
+
 ARCHALL = 1
 
 include gar/category.mk
 
 post-extract-modulated:
-	@mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca
+	mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca
 	@$(MAKECOOKIE)
 
 install-custom:
-	@ginstall -d $(DESTDIR)$(bindir)
-	@ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca
-	@ginstall -d $(DESTDIR)$(mandir)/man8
-	@pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca
+	ginstall -d $(DESTDIR)/etc/opt/csw
+	ginstall $(WORKSRC)/pca.conf $(DESTDIR)/etc/opt/csw
+	ginstall -d $(DESTDIR)$(mandir)/man8
+	pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pca/trunk/checksums
===================================================================
--- csw/mgar/pkg/pca/trunk/checksums	2010-01-15 16:41:00 UTC (rev 8021)
+++ csw/mgar/pkg/pca/trunk/checksums	2010-01-15 16:48:13 UTC (rev 8022)
@@ -1,4 +1,5 @@
 4376789925fa9002d0567d739f717748  0001-prefer-opencsw-perl.diff
+78c76967d20b4c9c69acacd7417527e1  0002-Add-etc-opt-csw-as-config-location.patch
 6f2f2376eba0a788795dd43d68ad32d1  COPYING
 7236327edeb969fd2a223cd5b60c0b57  pca-20091216-02
 12de68ff8f67b4bb8b095e5646402208  pca.conf

Added: csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch
===================================================================
--- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch	                        (rev 0)
+++ csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch	2010-01-15 16:48:13 UTC (rev 8022)
@@ -0,0 +1,30 @@
+From 00323f9c9023a24b559f59938bc5258caf74501e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 15 Jan 2010 17:41:19 +0100
+Subject: [PATCH] Add /etc/opt/csw as config location
+
+---
+ pca |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/pca b/pca
+index b0206f9..45140f1 100644
+--- a/pca
++++ b/pca
+@@ -2394,11 +2394,13 @@ sub parse_args {
+   if ($o{proxy}) {
+     push (@conf, dirname($0)."/../etc/pca-proxy.conf");
+     push (@conf, "/etc/pca-proxy.conf");
++    push (@conf, "/etc/opt/csw/pca-proxy.conf");
+     push (@conf, "pca-proxy.conf");
+   } else {
+     push (@conf, dirname($0)."/pca.conf");
+     push (@conf, dirname($0)."/../etc/pca.conf");
+     push (@conf, "/etc/pca.conf");
++    push (@conf, "/etc/opt/csw/pca.conf");
+     $ENV{HOME} && push (@conf, $ENV{HOME}."/.pca");
+     push (@conf, "pca.conf");
+   }
+-- 
+1.6.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.