[csw-devel] SF.net SVN: gar:[13380] csw/mgar/pkg/java/ajclang/trunk

[wbonnet at users.sourceforge.net]

Revision: 13380
          http://gar.svn.sourceforge.net/gar/?rev=13380&view=rev
Author:   wbonnet
Date:     2011-02-19 01:56:01 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
java/lang update to 2.6

Modified Paths:
--------------
    csw/mgar/pkg/java/ajclang/trunk/Makefile
    csw/mgar/pkg/java/ajclang/trunk/checksums

Modified: csw/mgar/pkg/java/ajclang/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajclang/trunk/Makefile	2011-02-18 18:24:57 UTC (rev 13379)
+++ csw/mgar/pkg/java/ajclang/trunk/Makefile	2011-02-19 01:56:01 UTC (rev 13380)
@@ -1,5 +1,5 @@
 SHORTNAME = lang
-VERSION = 2.4
+VERSION = 2.6
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,15 +11,21 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajclang,)
-DISTFILES += $(call admfiles,CSWajclangdoc,)
+PACKAGES = CSWajclang CSWajclangdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajclang = commons_lang
+CATALOGNAME_CSWajclangdoc = commons_lang_doc
+
+LICENSE = LICENSE.txt
+
 # Defines package description
 SPKG_DESC_CSWajclang    = $(DESCRIPTION)
 SPKG_DESC_CSWajclangdoc = $(DESCRIPTION) documentation package
@@ -27,8 +33,10 @@
 # Defines dependencies
 RUNTIME_DEP_PKGS_CSWajclang = CSWajcconfig
 
+CHECKPKG_OVERRIDES_CSWajclang += catalogname-does-not-match-pkgname|pkgname=CSWajclang|catalogname=commons_lang|expected-catalogname=ajclang
+CHECKPKG_OVERRIDES_CSWajclangdoc += catalogname-does-not-match-pkgname|pkgname=CSWajclangdoc|catalogname=commons_lang_doc|expected-catalogname=ajclangdoc
+
 # Defines package content
-PKGFILES_CSWajclang  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajclang += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -48,7 +56,5 @@
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-2.jar ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License-documentation.txt
 	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajclang/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajclang/trunk/checksums	2011-02-18 18:24:57 UTC (rev 13379)
+++ csw/mgar/pkg/java/ajclang/trunk/checksums	2011-02-19 01:56:01 UTC (rev 13380)
@@ -1,3 +1 @@
-5ff5d890e46021a2dbd77caba80f90f2  download/commons-lang-2.4-bin.tar.gz
-4cbc407e39410177a18ae06e9c421923  download/CSWajclang.gspec
-c5b33b5a694a837ebf14f7d33deadc84  download/CSWajclangdoc.gspec
+444075803459bffebfb5e28877861d23  commons-lang-2.6-bin.tar.gz


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