SF.net SVN: gar:[22615] csw/mgar/pkg/ant/trunk

[cgrzemba at users.sourceforge.net]

Revision: 22615
          http://gar.svn.sourceforge.net/gar/?rev=22615&view=rev
Author:   cgrzemba
Date:     2013-11-29 15:30:16 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
ant/trunk: fix issue 5083

Modified Paths:
--------------
    csw/mgar/pkg/ant/trunk/Makefile
    csw/mgar/pkg/ant/trunk/checksums

Modified: csw/mgar/pkg/ant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ant/trunk/Makefile	2013-11-29 14:05:08 UTC (rev 22614)
+++ csw/mgar/pkg/ant/trunk/Makefile	2013-11-29 15:30:16 UTC (rev 22615)
@@ -4,19 +4,19 @@
 NAME = ant
 VERSION = 1.8.4
 GARTYPE = v2
-CATEGORIES = utils
+# CATEGORIES = utils
 
 DESCRIPTION = Apache Ant is Java Build Tool 
 define BLURB
   Long description
 endef
 
-MASTER_SITES = http://ftp.halifax.rwth-aachen.de/apache//ant/source/
-MASTER_SITES += http://www.junit.org/
-MASTER_SITES += http://search.maven.org/remotecontent?filepath=org/mod4j/org/junit/3.8.2/
+JUVERSION = 3.8.2
+MASTER_SITES = http://archive.apache.org/dist/ant/source/
+MASTER_SITES += http://search.maven.org/remotecontent?filepath=junit/junit/$(JUVERSION)/
 DISTNAME = apache-$(NAME)-$(VERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
-DISTFILES  += junit-3.8.2.jar
+DISTFILES  += junit-$(JUVERSION).jar
 LICENSE = LICENSE
 LICENSE += NOTICE
 
@@ -36,13 +36,13 @@
 RUNTIME_DEP_PKGS_CSWant += CSWpython
 RUNTIME_DEP_PKGS_CSWant += CSWperl
 # usr share is ok
-CHECKPKG_OVERRIDES_CSWant += file-with-bad-content|/usr/share|root/opt/csw/share/java/ant/bin/ant
+# CHECKPKG_OVERRIDES_CSWant += file-with-bad-content|/usr/share|root/opt/csw/share/java/ant/bin/ant
 
 PACKAGES += CSWantdoc
 SPKG_DESC_CSWantdoc = $(DESCRIPTION), docs
 PKGFILES_CSWantdoc += $(PKGFILES_DOC)
-CHECKPKG_OVERRIDES_CSWantdoc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ant/manual/install.html
-CHECKPKG_OVERRIDES_CSWantdoc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/ant/manual/install.html
+# CHECKPKG_OVERRIDES_CSWantdoc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ant/manual/install.html
+# CHECKPKG_OVERRIDES_CSWantdoc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/ant/manual/install.html
 
 
 CONFIGURE_SCRIPTS = 
@@ -57,7 +57,8 @@
 include gar/category.mk
 
 pre-build-modulated:
-	(cd $(WORKSRC)/lib/optional && jar -xf ../../../junit-3.8.2.jar)
+#	(cd $(WORKSRC)/lib/optional && jar -xf ../../../junit-$(JUVERSION).jar)
+	(cd $(WORKSRC)/lib/optional && cp ../../../junit-$(JUVERSION).jar junit.jar)
 	@$(MAKECOOKIE)
 
 build-ant: 
@@ -74,6 +75,7 @@
 	find $(WORKSRC)/$(DISTNAME)/bin -type f -a ! -name \*.bat -a ! -name \*.cmd -exec ginstall -m755 {} $(DESTDIR)/$(ant_home)/bin \;
 	(cd $(DESTDIR)/$(bindir) && ln -s ../share/java/$(NAME)/bin/ant )
 	gsed -i -e '/^ANT_LIB/s/lib/share\/java/' $(DESTDIR)/$(ant_home)/bin/ant
+	gsed -i -e '18 i ANT_HOME=$(prefix)\n' $(DESTDIR)/$(ant_home)/bin/ant
 	ginstall -m644 $(WORKSRC)/$(DISTNAME)/lib/*.jar $(DESTDIR)/$(datadir)/java
 	gcp -Rp $(WORKSRC)/$(DISTNAME)/manual $(DESTDIR)/$(docdir)/$(NAME)
 	$(MAKECOOKIE)

Modified: csw/mgar/pkg/ant/trunk/checksums
===================================================================
--- csw/mgar/pkg/ant/trunk/checksums	2013-11-29 14:05:08 UTC (rev 22614)
+++ csw/mgar/pkg/ant/trunk/checksums	2013-11-29 15:30:16 UTC (rev 22615)
@@ -1,2 +1,2 @@
 4e05e1cc4ea4b56d85bbbc4fe29d1c29  apache-ant-1.8.4-src.tar.gz
-9d65b560478574b7783ddd568819cc7d  junit-3.8.2.jar
+28e7eb9eeefe31a657c68755bfccc541  junit-3.8.2.jar

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