[csw-devel] SF.net SVN: gar:[13374] csw/mgar/pkg/java/ajchttpcl/trunk/Makefile

[wbonnet at users.sourceforge.net]

Revision: 13374
          http://gar.svn.sourceforge.net/gar/?rev=13374&view=rev
Author:   wbonnet
Date:     2011-02-18 16:45:36 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
java/httpclient upgrade to 3.1

Modified Paths:
--------------
    csw/mgar/pkg/java/ajchttpcl/trunk/Makefile

Modified: csw/mgar/pkg/java/ajchttpcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajchttpcl/trunk/Makefile	2011-02-18 16:37:59 UTC (rev 13373)
+++ csw/mgar/pkg/java/ajchttpcl/trunk/Makefile	2011-02-18 16:45:36 UTC (rev 13374)
@@ -11,15 +11,24 @@
 
 # Use jakarta sources
 MASTER_SITES = http://www.apache.org/dist/httpcomponents/commons-$(SHORTNAME)/binary/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajchttpclient,)
-DISTFILES += $(call admfiles,CSWajchttpcldoc,)
+PACKAGES = CSWajchttpclient CSWajchttpcldoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajchttpclient = commons_httpclient
+CATALOGNAME_CSWajchttpcldoc = commons_httpcl_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajchttpclient += catalogname-does-not-match-pkgname|pkgname=CSWajchttpclient|catalogname=commons_httpclient|expected-catalogname=ajchttpclient
+CHECKPKG_OVERRIDES_CSWajchttpcldoc += catalogname-does-not-match-pkgname|pkgname=CSWajchttpcldoc|catalogname=commons_httpcl_doc|expected-catalogname=ajchttpcldoc
+
 # Defines package description
 SPKG_DESC_CSWajchttpclient  = $(DESCRIPTION)
 SPKG_DESC_CSWajchttpcldoc   = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWajchttpclient = CSWajclogging 
 
 # Defines package content
-PKGFILES_CSWajchttpclient  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajchttpclient += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -48,7 +56,5 @@
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-3.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)/docs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)


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