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

[wbonnet at users.sourceforge.net]

Revision: 13356
          http://gar.svn.sourceforge.net/gar/?rev=13356&view=rev
Author:   wbonnet
Date:     2011-02-18 10:32:21 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
Fix makefile and upgrade tp 1.4

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

Modified: csw/mgar/pkg/java/ajccodec/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajccodec/trunk/Makefile	2011-02-17 23:57:54 UTC (rev 13355)
+++ csw/mgar/pkg/java/ajccodec/trunk/Makefile	2011-02-18 10:32:21 UTC (rev 13356)
@@ -1,5 +1,5 @@
 SHORTNAME = codec
-VERSION = 1.3
+VERSION = 1.4
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,23 +11,25 @@
 
 # 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,CSWajccodec,)
-DISTFILES += $(call admfiles,CSWajccodecdoc,)
+PACKAGES = CSWajccodec CSWajccodecdoc
+ARCHALL  = 1
+CATALOGNAME_CSWajccodec = commons_codec
+CATALOGNAME_CSWajccodecdoc = commons_codec_doc
 
+LICENSE = LICENSE.txt
+
 # Defines package description
 SPKG_DESC_CSWajccodec    = $(DESCRIPTION)
 SPKG_DESC_CSWajccodecdoc = $(DESCRIPTION) documentation package
 
-# Defines dependencies
+CHECKPKG_OVERRIDES_CSWajccodec += catalogname-does-not-match-pkgname|pkgname=CSWajccodec|catalogname=commons_codec|expected-catalogname=ajccodec
+CHECKPKG_OVERRIDES_CSWajccodecdoc += catalogname-does-not-match-pkgname|pkgname=CSWajccodecdoc|catalogname=commons_codec_doc|expected-catalogname=ajccodecdoc
 
 # Defines package content
-PKGFILES_CSWajccodec   	 = $(prefix)/share/doc/$(NAME)/LICENSE.txt
 PKGFILES_CSWajccodec   	+= $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -38,19 +40,14 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-SRC_FIRSTMOD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))
-export SRC_FIRSTMOD
-
 include gar/category.mk
 
 install-custom:
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/commons-codec-$(VERSION).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/$(NAME)-$(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)/LICENSE $(DESTDIR)$(datadir)/doc/$(NAME)/LICENSE.txt
-	@gcp -fp $(WORKSRC)/LICENSE $(DESTDIR)$(datadir)/doc/$(NAME)/LICENSE-documentation.txt
-	@gcp -frp $(WORKSRC)/docs/api/* $(DESTDIR)$(datadir)/doc/$(NAME)
+	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajccodec/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajccodec/trunk/checksums	2011-02-17 23:57:54 UTC (rev 13355)
+++ csw/mgar/pkg/java/ajccodec/trunk/checksums	2011-02-18 10:32:21 UTC (rev 13356)
@@ -1,3 +1 @@
-aad3948be13476d9599cadaf146bc92a  download/commons-codec-1.3.tar.gz
-89528aa0c2143a712a20a166b7031ff9  download/CSWajccodec.gspec
-c1064ad5035505ad95fb3127c49bbc14  download/CSWajccodecdoc.gspec
+413c2d2ede7865db7037ad49e3535957  commons-codec-1.4-bin.tar.gz


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