New commits:
commit 8d3dd01825a476959b54ee1ceca6c9ab9bbeb5c5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ristretto: => 0.1.1
commit 286718922cc5c324281d579da591eed08681bb98
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
jedit: => 4.4.2
commit 8b7c13c8a46321f86af437d134e8438a13c26740
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ant: => 1.8.2
diff --git a/editors/jedit/DETAILS b/editors/jedit/DETAILS
index d0c2d34..e8f7b10 100755
--- a/editors/jedit/DETAILS
+++ b/editors/jedit/DETAILS
@@ -1,11 +1,11 @@
SPELL=jedit
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=jedit${VERSION}source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jEdit
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
WEB_SITE=http://www.jedit.org
ENTERED=20040608
-
SOURCE_HASH=sha512:7d1587c6868b9c584f58a2a61f496f7aa260e727e8a65dc3522749011336de11e87bdc35e7c2b9ad25023d570a2e272ea97615126b7aa3bde3ba531f9deaf70c
+
SOURCE_HASH=sha512:76bfa29d3f33fc20e8699e038f364867b037c7227be3cb02f566fdd5b282d737c7a83623fb771578309c6c44545d1aea9441530b6020b1741a3221da63e8e7ad
LICENSE[0]=GPL
KEYWORDS="editors"
SHORT="jEdit is a mature and well-designed programmer's text
editor that has been in development for over 5 years."
diff --git a/editors/jedit/HISTORY b/editors/jedit/HISTORY
index 5a5be26..22f5e01 100644
--- a/editors/jedit/HISTORY
+++ b/editors/jedit/HISTORY
@@ -1,3 +1,8 @@
+2011-10-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2
+ * PRE_BUILD: apply build properties
+ * build.properties_4.4.1.patch: removed
+
2011-08-10 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.4.1
* build.properties_4.3.2.patch: removed
diff --git a/editors/jedit/PRE_BUILD b/editors/jedit/PRE_BUILD
index 270098d..7fedb18 100755
--- a/editors/jedit/PRE_BUILD
+++ b/editors/jedit/PRE_BUILD
@@ -1,3 +1,14 @@
-default_pre_build &&
-patch -p1 -d ${SOURCE_DIRECTORY} < \
- ${SCRIPT_DIRECTORY}/build.properties_${VERSION}.patch
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}"
+
+local BUILD_PROPS="build.properties" &&
+
+if is_depends_enabled $SPELL xocbook-xsl; then
+ echo "xsltproc.executable=xsltproc" >> $BUILD_PROPS &&
+ echo
"docbook.xsl=$INSTALL_ROOT/usr/share/xml/docbook/xsl-stylesheets-1.76" >>
$BUILD_PROPS &&
+ echo
"docbook.catalog=$INSTALL_ROOT/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml"
>> $BUILD_PROPS
+fi &&
+
+if is_depends_enabled $SPELL fop; then
+ echo "fop.dir=$INSTALL_ROOT/usr/share/fop-0.20.5" >> $BUILD_PROPS
+fi
diff --git a/editors/jedit/build.properties_4.4.1.patch
b/editors/jedit/build.properties_4.4.1.patch
deleted file mode 100644
index d92dfd9..0000000
--- a/editors/jedit/build.properties_4.4.1.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urNp jEdit.orig/build.properties jEdit/build.properties
---- jEdit.orig/build.properties 1970-01-01 01:00:00.000000000 +0100
-+++ jEdit/build.properties 2006-08-08 21:07:34.000000000 +0200
-@@ -0,0 +1,4 @@
-+xsltproc.executable=xsltproc
-+docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.76
-+docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
-+fop.dir=/usr/share/fop-0.20.5
diff --git a/java/ant/DETAILS b/java/ant/DETAILS
index ee3846a..e2231c6 100755
--- a/java/ant/DETAILS
+++ b/java/ant/DETAILS
@@ -1,10 +1,9 @@
SPELL=ant
- VERSION=1.7.1
+ VERSION=1.8.2
SOURCE=apache-$SPELL-$VERSION-src.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/apache-$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE
- SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
-
SOURCE_HASH=sha512:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc
+
SOURCE_HASH=sha512:d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c
LICENSE[0]=APACHE
WEB_SITE=http://ant.apache.org/
KEYWORDS="java"
diff --git a/java/ant/HISTORY b/java/ant/HISTORY
index ca3ddfd..74ea80a 100644
--- a/java/ant/HISTORY
+++ b/java/ant/HISTORY
@@ -1,3 +1,10 @@
+2011-10-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.2; removed broken mirror; quoting
paths
+ * PRE_BUILD: replaced patch with simple sed
+ * ant-buildfile-junit.patch: removed
+ * ant.sh: always override JAVA_HOME (in situations like when a user
+ switches from JRE to JDK with different java binary paths)
+
2008-08-30 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.7.1 (fixing bug #13749),
removed PATCHLEVEL
diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD
index 5c5cb06..b9ee217 100755
--- a/java/ant/PRE_BUILD
+++ b/java/ant/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
# fix bugs #13749 and #3230 : removing junit task if not installed
if ! spell_ok junit; then
- patch -p0 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
+ sedit "s:,test-jar::" build.xml
fi
diff --git a/java/ant/ant-buildfile-junit.patch
b/java/ant/ant-buildfile-junit.patch
deleted file mode 100644
index 21a4a0d..0000000
--- a/java/ant/ant-buildfile-junit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.old 2008-08-30 13:59:52.000000000 +0200
-+++ build.xml 2008-08-30 14:00:00.000000000 +0200
-@@ -925,7 +925,7 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
diff --git a/java/ant/ant.sh b/java/ant/ant.sh
index 6362a9f..c71fb66 100644
--- a/java/ant/ant.sh
+++ b/java/ant/ant.sh
@@ -3,10 +3,9 @@
# then if not set, check it (maybe), then set it
if [ -z "$ANT_HOME" ] ; then
- if [ -z "$JAVA_HOME" ] ; then
- source /etc/profile.d/java.sh
- fi
- ANT_HOME=/opt/ant
+ source /etc/profile.d/java.sh
+
+ ANT_HOME=/opt/ant
fi