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

[wbonnet at users.sourceforge.net]

Revision: 13355
          http://gar.svn.sourceforge.net/gar/?rev=13355&view=rev
Author:   wbonnet
Date:     2011-02-17 23:57:54 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
java/cli upgrade to 1.2

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

Modified: csw/mgar/pkg/java/ajccli/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajccli/trunk/Makefile	2011-02-17 23:41:55 UTC (rev 13354)
+++ csw/mgar/pkg/java/ajccli/trunk/Makefile	2011-02-17 23:57:54 UTC (rev 13355)
@@ -1,5 +1,5 @@
 SHORTNAME = cli
-VERSION = 1.1
+VERSION = 1.2
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,24 +11,24 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).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,CSWajccli,)
-DISTFILES += $(call admfiles,CSWajcclidoc,)
+PACKAGES = CSWajccli CSWajcclidoc
 
-# Defines package description
 SPKG_DESC_CSWajccli    = $(DESCRIPTION)
 SPKG_DESC_CSWajcclidoc = $(DESCRIPTION) documentation package
 
-# Defines dependencies
-# RUNTIME_DEP_PKGS_CSWajccli  = 
+ARCHALL = 1
 
+LICENSE = LICENSE.txt
+
+CATALOGNAME_CSWajccli = commons_cli
+CATALOGNAME_CSWajcclidoc = commons_cli_doc
+
 # Defines package content
-PKGFILES_CSWajccli   	 = $(prefix)/share/doc/$(NAME)/LICENSE.txt
 PKGFILES_CSWajccli   	+= $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -39,16 +39,17 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+CHECKPKG_OVERRIDES_CSWajcclidoc += catalogname-does-not-match-pkgname|pkgname=CSWajcclidoc|catalogname=commons_cli_doc|expected-catalogname=ajcclidoc
+CHECKPKG_OVERRIDES_CSWajccli += catalogname-does-not-match-pkgname|pkgname=CSWajccli|catalogname=commons_cli|expected-catalogname=ajccli
+
 include gar/category.mk
 
 install-custom:
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/commons-cli-1.1.jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/commons-cli-$(VERSION).jar $(DESTDIR)$(datadir)/java
 	@( cd $(DESTDIR)$(datadir)/java ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-1.jar ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/LICENSE-documentation.txt
-	@gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(NAME)
+	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajccli/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajccli/trunk/checksums	2011-02-17 23:41:55 UTC (rev 13354)
+++ csw/mgar/pkg/java/ajccli/trunk/checksums	2011-02-17 23:57:54 UTC (rev 13355)
@@ -1,3 +1 @@
-2e5fc38f03a28788bf131d7c0c36d3f2  download/commons-cli-1.1.tar.gz
-b2edae5cdfb8a97ef3d7c3070205bd1f  download/CSWajccli.gspec
-ee12ee5ad48ab4c8b3eac56093f467b4  download/CSWajcclidoc.gspec
+a05956c9ac8bacdc2b8d07fb2cb331ce  commons-cli-1.2-bin.tar.gz


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