From c0b7748af9f228de6959e2f7bcbf9ab1052ea7d6 Mon Sep 17 00:00:00 2001
From: Thierry N <thierryn1 at hispeed dot ch>
Date: Mon, 31 Aug 2009 23:24:54 +0200
Subject: Remplacement de apache-ant par ant#1.7.1-2

---
 base/ant/ant/.footprint       | 144 ++++++++++++++++++++++++++++++++++++++++++
 base/ant/ant/.md5sum          |   1 +
 base/ant/ant/Pkgfile          |  23 +++++++
 base/apache-ant/Pkgfile       |  30 ---------
 base/apache-ant/apache-ant.sh |   2 -
 5 files changed, 168 insertions(+), 32 deletions(-)
 create mode 100644 base/ant/ant/.footprint
 create mode 100644 base/ant/ant/.md5sum
 create mode 100644 base/ant/ant/Pkgfile
 delete mode 100644 base/apache-ant/Pkgfile
 delete mode 100644 base/apache-ant/apache-ant.sh

diff --git a/base/ant/ant/.footprint b/base/ant/ant/.footprint
new file mode 100644
index 000000000..3cd9f3167
--- /dev/null
+++ b/base/ant/ant/.footprint
@@ -0,0 +1,144 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/profile.d/
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+lrwxrwxrwx	root/root	usr/bin/ant -> /usr/lib/ant/bin/ant
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/ant/
+drwxr-xr-x	root/root	usr/lib/ant/bin/
+-rwxr-xr-x	root/root	usr/lib/ant/bin/ant
+-rw-r--r--	root/root	usr/lib/ant/bin/ant.cmd
+-rwxr-xr-x	root/root	usr/lib/ant/bin/antRun
+-rwxr-xr-x	root/root	usr/lib/ant/bin/antRun.pl
+-rw-r--r--	root/root	usr/lib/ant/bin/antenv.cmd
+-rwxr-xr-x	root/root	usr/lib/ant/bin/complete-ant-cmd.pl
+-rw-r--r--	root/root	usr/lib/ant/bin/envset.cmd
+-rwxr-xr-x	root/root	usr/lib/ant/bin/runant.pl
+-rwxr-xr-x	root/root	usr/lib/ant/bin/runant.py
+-rw-r--r--	root/root	usr/lib/ant/bin/runrc.cmd
+drwxr-xr-x	root/root	usr/lib/ant/etc/
+-rw-r--r--	root/root	usr/lib/ant/etc/ant-bootstrap.jar
+-rw-r--r--	root/root	usr/lib/ant/etc/changelog.xsl
+drwxr-xr-x	root/root	usr/lib/ant/etc/checkstyle/
+-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-text.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-xdoc.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/coverage-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/jdepend-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/jdepend.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/junit-frames-xalan1.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/junit-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/junit-noframes.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/log.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/maudit-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/mmetrics-frames.xsl
+-rw-r--r--	root/root	usr/lib/ant/etc/tagdiff.xsl
+-rw-r--r--	root/root	usr/lib/ant/fetch.xml
+-rw-r--r--	root/root	usr/lib/ant/get-m2.xml
+drwxr-xr-x	root/root	usr/lib/ant/lib/
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-nodeps-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-nodeps-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-nodeps-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-nodeps.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-parent-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-parent-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-parent-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-starteam-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-starteam-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-starteam-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-starteam.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-stylebook-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-stylebook-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-stylebook-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-stylebook.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-trax-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-trax-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-trax-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-trax.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-weblogic-1.7.1.pom
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-weblogic-1.7.1.pom.md5
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-weblogic-1.7.1.pom.sha1
+-rw-r--r--	root/root	usr/lib/ant/lib/ant-weblogic.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/ant.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/libraries.properties
+-rw-r--r--	root/root	usr/lib/ant/lib/xercesImpl.jar
+-rw-r--r--	root/root	usr/lib/ant/lib/xml-apis.jar
diff --git a/base/ant/ant/.md5sum b/base/ant/ant/.md5sum
new file mode 100644
index 000000000..bec392885
--- /dev/null
+++ b/base/ant/ant/.md5sum
@@ -0,0 +1 @@
+9330447f3763b87570dd1118c49a8efd  apache-ant-1.7.1-bin.tar.bz2
diff --git a/base/ant/ant/Pkgfile b/base/ant/ant/Pkgfile
new file mode 100644
index 000000000..b504caf4a
--- /dev/null
+++ b/base/ant/ant/Pkgfile
@@ -0,0 +1,23 @@
+# Description: Outils basés sur Java
+# URL: http://ant.apache.org/
+# Maintainer: NutyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: jdk
+
+name=ant
+version=1.7.1
+release=2
+source=(http://archive.apache.org/dist/ant/binaries/apache-ant-$version-bin.tar.bz2)
+
+
+build() {
+	cd apache-ant-$version
+	mkdir -p $PKG/etc/profile.d
+	install -d $PKG/usr/{bin,lib/ant}
+	cp -rf * $PKG/usr/lib/ant
+	ln -sf /usr/lib/ant/bin/ant $PKG/usr/bin/ant
+	rm -r $PKG/usr/lib/ant/bin/*.bat
+	rm -r $PKG/usr/lib/ant/docs
+	rm -r $PKG/usr/lib/ant/{KEYS,LICENS*,README,NOTICE,WHATSNEW,INSTALL}
+	rm -r $PKG/usr/lib/ant/lib/README
+}
diff --git a/base/apache-ant/Pkgfile b/base/apache-ant/Pkgfile
deleted file mode 100644
index 693801237..000000000
--- a/base/apache-ant/Pkgfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description: Outils basés sur Java
-# URL: http://ant.apache.org/
-# Maintainer: NutyX core team
-# Packager: thierryn1 at hispeed dot ch
-# Depends on: jdk, junit
-
-name=apache-ant
-version=1.7.1
-release=1
-source=(http://apache.org/dist/ant/source/$name-$version-src.tar.bz2\
-	apache-ant.sh)
-
-
-build() {
-	export CLASSPATH=$CLASSPATH:/usr/share/junit-4.5/junit-4.5.jar:/usr/share/junit-4.5
-	cd $name-$version
-        sed -i 's|/etc/ant.conf|/etc/ant/ant.conf|' src/script/ant
-        mkdir dist
-	./build.sh -Ddist.dir=dist/ dist
-	mkdir $PKG/opt
-	mkdir -p $PKG/etc/{profile.d,ant}
-	touch $PKG/etc/ant/ant.conf
-	export ANT_HOME=$PKG/opt/ant-$version
-#	export JAVA_HOME=/opt/jdk
-	./build.sh install-lite
-	install -m644  ../apache-ant.sh $PKG/etc/profile.d/
-	ln -svf ant-$version $PKG/opt/ant
-	ln -v -sf /etc/ant $PKG/opt/ant-$version/etc
-}
-
diff --git a/base/apache-ant/apache-ant.sh b/base/apache-ant/apache-ant.sh
deleted file mode 100644
index 0e7f59518..000000000
--- a/base/apache-ant/apache-ant.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export PATH=$PATH:/opt/ant/bin
-export ANT_HOME=/opt/ant
-- 
cgit v1.2.3-70-g09d2