[csw-devel] SF.net SVN: gar:[9382] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 9382
          http://gar.svn.sourceforge.net/gar/?rev=9382&view=rev
Author:   dmichelsen
Date:     2010-03-26 13:09:58 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
mGAR v2: Add Perl module name to package description and add PERL_MODULE_NAME to pkginfo

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-03-26 13:02:08 UTC (rev 9381)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2010-03-26 13:09:58 UTC (rev 9382)
@@ -31,6 +31,9 @@
 UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
 
+_CATEGORY_SPKG_DESC = $(GARNAME): $(SPKG_DESC)
+_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)";
+
 SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
 
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-03-26 13:02:08 UTC (rev 9381)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-03-26 13:09:58 UTC (rev 9382)
@@ -537,7 +537,7 @@
 endef
 
 define pkgvar
-$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1))))
+$(strip $(or $(_CATEGORY_$(1)_$(2)),$(_CATEGORY_$(1)),$($(1)_$(2)),$($(1))))
 endef
 
 # Make sure every producable package contains specific descriptions.
@@ -569,6 +569,7 @@
 	echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \
 	echo "OPENCSW_MODE64=$(call mode64,$*)"; \
 	echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \
+	$(_CATEGORY_PKGINFO) \
 	) >$@
 
 


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