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

[wbonnet at users.sourceforge.net]

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

Log Message:
-----------
java/net upgrade to 2.2

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

Modified: csw/mgar/pkg/java/ajcnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcnet/trunk/Makefile	2011-02-19 02:14:30 UTC (rev 13382)
+++ csw/mgar/pkg/java/ajcnet/trunk/Makefile	2011-02-19 02:27:41 UTC (rev 13383)
@@ -1,5 +1,5 @@
 SHORTNAME = net
-VERSION = 2.0
+VERSION = 2.2
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,24 +11,32 @@
 
 # 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).tar.gz
+DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcnet,)
-DISTFILES += $(call admfiles,CSWajcnetdoc,)
+PACKAGES = CSWajcnet CSWajcnetdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcnet = commons_net
+CATALOGNAME_CSWajcnetdoc = commons_net_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcnetdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcnetdoc|catalogname=commons_net_doc|expected-catalogname=ajcnetdoc
+CHECKPKG_OVERRIDES_CSWajcnet += catalogname-does-not-match-pkgname|pkgname=CSWajcnet|catalogname=commons_net|expected-catalogname=ajcnet
+
 # Defines package description
 SPKG_DESC_CSWajcnet    = $(DESCRIPTION)
 SPKG_DESC_CSWajcnetdoc = $(DESCRIPTION) documentation package
 
 # Defines dependencies
-RUNTIME_DEP_PKGS_CSWajcnet = CSWajclogging CSWajccollect CSWajcbeanutils 	
+RUNTIME_DEP_PKGS_CSWajcnet = CSWajclogging CSWajccollect CSWajcbeanutils
 
 # Defines package content
-PKGFILES_CSWajcnet  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcnet += $(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/ajcnet/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcnet/trunk/checksums	2011-02-19 02:14:30 UTC (rev 13382)
+++ csw/mgar/pkg/java/ajcnet/trunk/checksums	2011-02-19 02:27:41 UTC (rev 13383)
@@ -1,3 +1 @@
-52fee591a8be0688a57af64ade1af237  download/commons-net-2.0.tar.gz
-82bf2124f0409750525f68e7075c9fee  download/CSWajcnet.gspec
-b5b88f3af8255f933204a1a9f1031f94  download/CSWajcnetdoc.gspec
+9da0cd8e4d8d174eb08f5c9d3b9ec2ae  commons-net-2.2-bin.tar.gz


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