Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (22923639eeac97b13c73871d3f00a59715b3d018)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (22923639eeac97b13c73871d3f00a59715b3d018)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (22923639eeac97b13c73871d3f00a59715b3d018)
  • Date: Mon, 22 Dec 2014 14:23:04 -0600
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

java/crimson-apache/DETAILS | 10 ++++------
java/crimson-apache/HISTORY | 3 +++
java/crimson-apache/INSTALL | 6 +++---
java/jakarta-commons-beanutils/DETAILS | 11 ++++-------
java/jakarta-commons-beanutils/HISTORY | 3 +++
java/jakarta-commons-beanutils/INSTALL | 6 +++---
java/jakarta-commons-collections/DETAILS | 11 ++++-------
java/jakarta-commons-collections/HISTORY | 3 +++
java/jakarta-commons-collections/INSTALL | 8 ++++----
java/jakarta-commons-daemon/DETAILS | 11 ++++-------
java/jakarta-commons-daemon/HISTORY | 3 +++
java/jakarta-commons-daemon/INSTALL | 6 +++---
java/jakarta-commons-dbcp/BUILD | 4 ++--
java/jakarta-commons-dbcp/DETAILS | 13 +++++--------
java/jakarta-commons-dbcp/HISTORY | 4 ++++
java/jakarta-commons-dbcp/INSTALL | 8 ++++----
java/jakarta-commons-digester/DETAILS | 11 ++++-------
java/jakarta-commons-digester/HISTORY | 3 +++
java/jakarta-commons-digester/INSTALL | 6 +++---
java/jakarta-commons-fileupload/DETAILS | 11 ++++-------
java/jakarta-commons-fileupload/HISTORY | 3 +++
java/jakarta-commons-fileupload/INSTALL | 6 +++---
java/jakarta-commons-lang/BUILD | 4 ++--
java/jakarta-commons-lang/DETAILS | 12 ++++--------
java/jakarta-commons-lang/HISTORY | 4 ++++
java/jakarta-commons-lang/INSTALL | 8 ++++----
java/jakarta-commons-logging/DETAILS | 13 +++++--------
java/jakarta-commons-logging/HISTORY | 3 +++
java/jakarta-commons-logging/INSTALL | 8 ++++----
java/jakarta-commons-modeler/BUILD | 4 ++--
java/jakarta-commons-modeler/DETAILS | 11 ++++-------
java/jakarta-commons-modeler/HISTORY | 4 ++++
java/jakarta-commons-modeler/INSTALL | 8 ++++----
java/jakarta-commons-pool/DETAILS | 12 ++++--------
java/jakarta-commons-pool/HISTORY | 3 +++
java/jakarta-commons-pool/INSTALL | 6 +++---
java/jakarta-log4j/DETAILS | 6 ++----
java/jakarta-log4j/HISTORY | 3 +++
java/jakarta-log4j/INSTALL | 4 ++--
java/jakarta-regexp/DETAILS | 6 ++----
java/jakarta-regexp/HISTORY | 3 +++
java/jakarta-regexp/INSTALL | 4 ++--
java/jakarta-struts-bin/DETAILS | 11 +++++------
java/jakarta-struts-bin/HISTORY | 3 +++
java/jakarta-struts-bin/INSTALL | 4 ++--
java/jakarta-velocity/DETAILS | 12 +++++-------
java/jakarta-velocity/HISTORY | 3 +++
java/jakarta-velocity/INSTALL | 6 +++---
48 files changed, 161 insertions(+), 154 deletions(-)

New commits:
commit 22923639eeac97b13c73871d3f00a59715b3d018
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

crimson-apache: Normalize SPELL field and remove PKG_* variables

commit 21af751d1e1c91c0fcb758a0182b05ddb6302dd5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-velocity: Normalize SPELL field and remove PKG_* variables

commit caee82fc09156abe40cff4d54254604a37c7fcff
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-struts-bin: Normalize SPELL field and remove PKG_* variables

commit 939a0774d740fb2bd653517242c0bd18225acd01
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-regexp: Normalize SPELL field and remove PKG_* variables

commit 602397a7dde8e2b61628946f91fdd77416df2320
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-log4j: Normalize SPELL field and remove PKG_* variables

commit 3e5d614b4e8cfc27c57fdeb63de2c12256cfe9f0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-pool: Normalize SPELL field and remove PKG_* variables

commit 7090bbed6613de760d56dba2d0ac465fa1e9fc25
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-modeler: Normalize SPELL field and remove PKG_* variables

commit 7b4d20aad35cfb3aa777ae44ab34bad8d32bcc3b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-logging: Normalize SPELL field and remove PKG_* variables

commit 31fb28d2fe1a9cc28d1b6b1a6f374752edfcd5f9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-lang: Normalize SPELL field and remove PKG_* variables

commit 894e9e3635bff32c1702c6aee243b139de9a389c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-fileupload: Normalize SPELL field and remove PKG_*
variables

commit 62885c1bb6c9f034ffc357690236974bea30dbfb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-digester: Normalize SPELL field and remove PKG_* variables

commit 793bd46bed33e73cc5cb7e77898582a8d7489042
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-dbcp: Normalize SPELL field and remove PKG_* variables

commit e1c76800775363a89f125e0677ced5a6da92f1dc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-daemon: Normalize SPELL field and remove PKG_* variables

commit 5fa2e386a08f70269e4eaee3412d02c683ee845c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-collections: Normalize SPELL field and remove PKG_*
variables

commit 1ede378bfbbb589d47450ce70220bbc3f7b448dd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

jakarta-commons-beanutils: Normalize SPELL field and remove PKG_*
variables

diff --git a/java/crimson-apache/DETAILS b/java/crimson-apache/DETAILS
index e50d440..02de993 100755
--- a/java/crimson-apache/DETAILS
+++ b/java/crimson-apache/DETAILS
@@ -1,10 +1,8 @@
- SPELL_NAME=crimson
- PKG_NAME=${SPELL_NAME}
- SPELL=${SPELL_NAME}-apache
+ SPELL=crimson-apache
VERSION=1.1.3
- SOURCE=${SPELL_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL_NAME}-${VERSION}
- SOURCE_URL[0]=http://xml.apache.org/dist/${SPELL_NAME}/$SOURCE
+ SOURCE=${SPELL%-*}-$VERSION-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%-*}-${VERSION}
+ SOURCE_URL[0]=http://xml.apache.org/dist/${SPELL%-*}/$SOURCE

SOURCE_HASH=sha512:d54af330871dae8601e4d371b10b1c32a5a1033b464c83a55d3db70996777132af7c6cf51d81da91ed0c86b9c1c87a1535116d204dfa03c2349b486b5d4d6a7a
LICENSE[0]=APACHE
KEYWORDS="parser java xml"
diff --git a/java/crimson-apache/HISTORY b/java/crimson-apache/HISTORY
index e1abccd..b8dd334 100644
--- a/java/crimson-apache/HISTORY
+++ b/java/crimson-apache/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
Shortened SHORT
diff --git a/java/crimson-apache/INSTALL b/java/crimson-apache/INSTALL
index 306243a..adf18e7 100755
--- a/java/crimson-apache/INSTALL
+++ b/java/crimson-apache/INSTALL
@@ -1,3 +1,3 @@
-extract_jakarta_dist ${PKG_NAME} ${PKG_NAME}-${VERSION} \
- build/${PKG_NAME}-${VERSION}-bin.tar.gz &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/crimson.jar crimson.jar
+extract_jakarta_dist ${SPELL##*-} ${SPELL##*-}-${VERSION} \
+ build/${SPELL##*-}-${VERSION}-bin.tar.gz &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/crimson.jar crimson.jar
diff --git a/java/jakarta-commons-beanutils/DETAILS
b/java/jakarta-commons-beanutils/DETAILS
old mode 100755
new mode 100644
index 5a8636a..9bb3f31
--- a/java/jakarta-commons-beanutils/DETAILS
+++ b/java/jakarta-commons-beanutils/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=beanutils
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-beanutils
VERSION=1.6.1
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-${VERSION}-src.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE

SOURCE_HASH=sha512:2b2da28f598d5cb52a07d59e5fdc14dc1a41b66a906a530e61aee0555afb46084c750778ec1b38a4cb70866406afe5957b0b9b81a8bf107c3f6bd08d49c0ab40
LICENSE[0]=APACHE
KEYWORDS="java"
diff --git a/java/jakarta-commons-beanutils/HISTORY
b/java/jakarta-commons-beanutils/HISTORY
index 76c9dfb..42a4f48 100644
--- a/java/jakarta-commons-beanutils/HISTORY
+++ b/java/jakarta-commons-beanutils/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-beanutils/INSTALL
b/java/jakarta-commons-beanutils/INSTALL
index ca18510..a1c0468 100755
--- a/java/jakarta-commons-beanutils/INSTALL
+++ b/java/jakarta-commons-beanutils/INSTALL
@@ -1,6 +1,6 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} $SOURCE_DIRECTORY &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-beanutils.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-beanutils.jar \
commons-beanutils.jar
diff --git a/java/jakarta-commons-collections/DETAILS
b/java/jakarta-commons-collections/DETAILS
old mode 100755
new mode 100644
index 7d2d7cb..8e8796f5
--- a/java/jakarta-commons-collections/DETAILS
+++ b/java/jakarta-commons-collections/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=collections
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-collections
VERSION=2.1
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE

SOURCE_HASH=sha512:c99f63790cdc59a5d753b20bd0f5b15b4090fe822c26ccc3634bd1e6983a38e689e8291573ba88602930e709c28e34665411813bd156786748477edb73d69b8f
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/collections.html
diff --git a/java/jakarta-commons-collections/HISTORY
b/java/jakarta-commons-collections/HISTORY
index 0172fd5..1391834 100644
--- a/java/jakarta-commons-collections/HISTORY
+++ b/java/jakarta-commons-collections/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-collections/INSTALL
b/java/jakarta-commons-collections/INSTALL
index 0409870..a0b05ef 100755
--- a/java/jakarta-commons-collections/INSTALL
+++ b/java/jakarta-commons-collections/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_dist ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- dist/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}.tar.gz &&
+extract_jakarta_dist ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ dist/${SPELL#*-}-${VERSION}.tar.gz &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-collections.jar \
+ ${SPELL#*-}-${VERSION}/commons-collections.jar \
commons-collections.jar
diff --git a/java/jakarta-commons-daemon/DETAILS
b/java/jakarta-commons-daemon/DETAILS
old mode 100755
new mode 100644
index 529112a..92b25f7
--- a/java/jakarta-commons-daemon/DETAILS
+++ b/java/jakarta-commons-daemon/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=daemon
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-daemon
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
-
SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+
SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}

SOURCE_HASH=sha512:9328bacd966b07eb7877ffb68075b80c8ecd534e526725f8d16a28b8da658d99725498fb817417fb0db6e5985810a1b2ad78e62857d82860f6d7d0cb57723c80
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/sandbox/daemon/index.html
diff --git a/java/jakarta-commons-daemon/HISTORY
b/java/jakarta-commons-daemon/HISTORY
index 12fd9ea..f7a3ae5 100644
--- a/java/jakarta-commons-daemon/HISTORY
+++ b/java/jakarta-commons-daemon/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-daemon/INSTALL
b/java/jakarta-commons-daemon/INSTALL
index dbbc6a8..e21c915 100755
--- a/java/jakarta-commons-daemon/INSTALL
+++ b/java/jakarta-commons-daemon/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-daemon.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-daemon.jar \
commons-daemon.jar
diff --git a/java/jakarta-commons-dbcp/BUILD b/java/jakarta-commons-dbcp/BUILD
index 4c737be..747f84d 100755
--- a/java/jakarta-commons-dbcp/BUILD
+++ b/java/jakarta-commons-dbcp/BUILD
@@ -6,7 +6,7 @@ set_ant_env &&
export
CLASSPATH="${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/lib/classes.zip:${ANT_HOME}/lib/ant.jar"

# create build.properties
-cat >
$SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src/build.properties
<<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src/build.properties <<EOF
base.path=${SM_JAKARTA_HOME}
commons-collections.home=\${base.path}/commons-collections
commons-collections.jar=\${commons-collections.home}/commons-collections.jar
@@ -25,6 +25,6 @@ jndi.lib=\${jndi.home}/lib
jndi.jar=\${jndi.lib}/jndi.jar
EOF

-cd ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src &&
+cd ${SPELL#*-}-${VERSION}-src &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-dbcp/DETAILS
b/java/jakarta-commons-dbcp/DETAILS
old mode 100755
new mode 100644
index 210854d..fc57a6f
--- a/java/jakarta-commons-dbcp/DETAILS
+++ b/java/jakarta-commons-dbcp/DETAILS
@@ -1,12 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=dbcp
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-dbcp
VERSION=1.0
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
-
SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.tar.gz
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+
SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/${SPELL#*-}-${VERSION}-src.tar.gz

SOURCE_HASH=sha512:d5d8e2bf44277d9a309b8a4bf04505bce11a82d79e88cb4b3694a0da346df745d8c4466121cdcb5f65bfc99dd5e2875a772e88447dad75c3ee029c0792adcd3c
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/dbcp/
diff --git a/java/jakarta-commons-dbcp/HISTORY
b/java/jakarta-commons-dbcp/HISTORY
index 509eecd..c7b60b2 100644
--- a/java/jakarta-commons-dbcp/HISTORY
+++ b/java/jakarta-commons-dbcp/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2010-10-30 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE_URL[1]

diff --git a/java/jakarta-commons-dbcp/INSTALL
b/java/jakarta-commons-dbcp/INSTALL
index a9651a4..473428f 100755
--- a/java/jakarta-commons-dbcp/INSTALL
+++ b/java/jakarta-commons-dbcp/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME}
\
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}
\
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
&&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-dbcp.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-dbcp.jar \
commons-dbcp.jar
diff --git a/java/jakarta-commons-digester/DETAILS
b/java/jakarta-commons-digester/DETAILS
old mode 100755
new mode 100644
index 38989b6..e74eead
--- a/java/jakarta-commons-digester/DETAILS
+++ b/java/jakarta-commons-digester/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=digester
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-digester
VERSION=1.4.1
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE

SOURCE_HASH=sha512:51dc72c4360e8c36da68bcfa79cc28f941d916fc5d22f1171cd6e942f60e39caf1533d67b79ff563bbf256e5f5cccce1a79a73251d3af3956270284422d3cda1
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/digester.html
diff --git a/java/jakarta-commons-digester/HISTORY
b/java/jakarta-commons-digester/HISTORY
index 0172fd5..1391834 100644
--- a/java/jakarta-commons-digester/HISTORY
+++ b/java/jakarta-commons-digester/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-digester/INSTALL
b/java/jakarta-commons-digester/INSTALL
index af614a7..110bd3b 100755
--- a/java/jakarta-commons-digester/INSTALL
+++ b/java/jakarta-commons-digester/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-digester.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-digester.jar \
commons-digester.jar
diff --git a/java/jakarta-commons-fileupload/DETAILS
b/java/jakarta-commons-fileupload/DETAILS
old mode 100755
new mode 100644
index ed2298f..63fbf17
--- a/java/jakarta-commons-fileupload/DETAILS
+++ b/java/jakarta-commons-fileupload/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=fileupload
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-fileupload
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
-
SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+
SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}

SOURCE_HASH=sha512:e52de83a9fd64601970e4f4df7dbbf6a033985b780cf081fa233af512d816ba6dfc9d301246faf6e466df4de14b67a08c810a68c89482205ba8a47a195d406dd
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/fileupload/
diff --git a/java/jakarta-commons-fileupload/HISTORY
b/java/jakarta-commons-fileupload/HISTORY
index c378f4f..8bbecbc 100644
--- a/java/jakarta-commons-fileupload/HISTORY
+++ b/java/jakarta-commons-fileupload/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-fileupload/INSTALL
b/java/jakarta-commons-fileupload/INSTALL
index 0a62410..885e8b6 100755
--- a/java/jakarta-commons-fileupload/INSTALL
+++ b/java/jakarta-commons-fileupload/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&

register_jakarta_jar
\
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-fileupload-1.0-dev.jar
\
+ ${SPELL#*-}-${VERSION}/dist/commons-fileupload-1.0-dev.jar \
commons-fileupload.jar
diff --git a/java/jakarta-commons-lang/BUILD b/java/jakarta-commons-lang/BUILD
index 5e9c6c0..8b38220 100755
--- a/java/jakarta-commons-lang/BUILD
+++ b/java/jakarta-commons-lang/BUILD
@@ -3,13 +3,13 @@
set_ant_env &&

# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}/build.properties <<EOF
base.path=${SM_JAKARTA_HOME}
commons-collections.home=\${base.path}/commons-collections
commons-collections.jar=\${commons-collections.home}/commons-collections.jar
junit.jar=${SM_IBM_HOME}/lib/junit.jar
EOF

-cd ${PKG_SUBPRJ}-${PKG_NAME} &&
+cd ${SPELL#*-} &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-lang/DETAILS
b/java/jakarta-commons-lang/DETAILS
old mode 100755
new mode 100644
index 08f3b40..fe12d5d
--- a/java/jakarta-commons-lang/DETAILS
+++ b/java/jakarta-commons-lang/DETAILS
@@ -1,12 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=lang
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-lang
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
-
SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
-
#http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+
SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}

SOURCE_HASH=sha512:1e659d231bbd71527fcba668e3d9ecbd811668e9c95f291b8f1f64aafa9a70c398661e33dd87b251cc21e4dc56dfb073fd697baf85907c753fa04493338f5991
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/lang.html
diff --git a/java/jakarta-commons-lang/HISTORY
b/java/jakarta-commons-lang/HISTORY
index 6c79061..407bc7e 100644
--- a/java/jakarta-commons-lang/HISTORY
+++ b/java/jakarta-commons-lang/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-lang/INSTALL
b/java/jakarta-commons-lang/INSTALL
index 89dec51..c586034 100755
--- a/java/jakarta-commons-lang/INSTALL
+++ b/java/jakarta-commons-lang/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME} &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-} &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-lang-2.0-dev.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-lang-2.0-dev.jar \
commons-lang.jar
diff --git a/java/jakarta-commons-logging/DETAILS
b/java/jakarta-commons-logging/DETAILS
old mode 100755
new mode 100644
index 8c07926..e027bc4
--- a/java/jakarta-commons-logging/DETAILS
+++ b/java/jakarta-commons-logging/DETAILS
@@ -1,12 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=logging
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-logging
VERSION=1.0.2
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
-
SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+
SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/$SOURCE

SOURCE_HASH=sha512:acabf10b27965cffc71bc920e6643fb66d555b827bd4387c65c8d6c08a9ea79644041321958935da310583567212d46691c925ef2d1879629a8bc473148cf1b2
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/logging.html
diff --git a/java/jakarta-commons-logging/HISTORY
b/java/jakarta-commons-logging/HISTORY
index 19eb83e..4ad6ca6 100644
--- a/java/jakarta-commons-logging/HISTORY
+++ b/java/jakarta-commons-logging/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/java/jakarta-commons-logging/INSTALL
b/java/jakarta-commons-logging/INSTALL
index 814e61e..7f40840 100755
--- a/java/jakarta-commons-logging/INSTALL
+++ b/java/jakarta-commons-logging/INSTALL
@@ -1,10 +1,10 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY/logging/dist &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging-api.jar \
+ ${SPELL#*-}-${VERSION}/commons-logging-api.jar \
commons-logging-api.jar &&

-register_jakarta_jar
${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging.jar \
+register_jakarta_jar ${SPELL#*-}-${VERSION}/commons-logging.jar \
commons-logging.jar
diff --git a/java/jakarta-commons-modeler/BUILD
b/java/jakarta-commons-modeler/BUILD
index e3f3ce0..1bf4201 100755
--- a/java/jakarta-commons-modeler/BUILD
+++ b/java/jakarta-commons-modeler/BUILD
@@ -5,7 +5,7 @@ set_ant_env &&
export
CLASSPATH="${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/lib/classes.zip:${ANT_HOME}/lib/ant.jar"
&&

# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}/build.properties <<EOF
commons.home=${SM_JAKARTA_HOME}/
sandbox.home=${SM_JAKARTA_HOME}/commons-sandbox
jaxp.home=${SM_SUN_HOME}/java_xml_pack/jaxp-1.2_01
@@ -27,7 +27,7 @@ jaxp.xalan.jar=${SM_JAKARTA_HOME}/lib/xalan.jar
junit.jar=\${junit.home}/junit.jar
EOF

-cd ${PKG_SUBPRJ}-${PKG_NAME} &&
+cd ${SPELL#*-} &&
cp LICENSE.txt ../LICENSE &&

ant dist
diff --git a/java/jakarta-commons-modeler/DETAILS
b/java/jakarta-commons-modeler/DETAILS
old mode 100755
new mode 100644
index 7997336..4a626d5
--- a/java/jakarta-commons-modeler/DETAILS
+++ b/java/jakarta-commons-modeler/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=modeler
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-modeler
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
-
SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+
SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/$SOURCE

SOURCE_HASH=sha512:4f947d092f0ed503f073ee1e5cd7c8df2bbcb4078563cc87effb9b57177061ba422977d6ab19fac055e05d4642a399855113706a9e6cd808e515baedbd03b81d
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/modeler.html
diff --git a/java/jakarta-commons-modeler/HISTORY
b/java/jakarta-commons-modeler/HISTORY
index b2229ea..1c0e01e 100644
--- a/java/jakarta-commons-modeler/HISTORY
+++ b/java/jakarta-commons-modeler/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/java/jakarta-commons-modeler/INSTALL
b/java/jakarta-commons-modeler/INSTALL
index 976d1ef..cd879b3 100755
--- a/java/jakarta-commons-modeler/INSTALL
+++ b/java/jakarta-commons-modeler/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME} &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-} &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-modeler.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-modeler.jar \
commons-modeler.jar
diff --git a/java/jakarta-commons-pool/DETAILS
b/java/jakarta-commons-pool/DETAILS
old mode 100755
new mode 100644
index 46b7b57..a4b9422
--- a/java/jakarta-commons-pool/DETAILS
+++ b/java/jakarta-commons-pool/DETAILS
@@ -1,12 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=pool
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-pool
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
-
SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
-
#http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+
SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}

SOURCE_HASH=sha512:928605af91feaa0e6f26401ec0921953176193d31bfc82309455e28a4ee5ee7eb983b9cc218f66545f97a677035d95e8e06d3a63e276ef3c3c1756dfcf3a5d57
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/pool/
diff --git a/java/jakarta-commons-pool/HISTORY
b/java/jakarta-commons-pool/HISTORY
index 12fd9ea..f7a3ae5 100644
--- a/java/jakarta-commons-pool/HISTORY
+++ b/java/jakarta-commons-pool/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-pool/INSTALL
b/java/jakarta-commons-pool/INSTALL
index ac23530..3ff19e7 100755
--- a/java/jakarta-commons-pool/INSTALL
+++ b/java/jakarta-commons-pool/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&

register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-pool.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-pool.jar \
commons-pool.jar
diff --git a/java/jakarta-log4j/DETAILS b/java/jakarta-log4j/DETAILS
old mode 100755
new mode 100644
index ff68f6e..2aecd4e
--- a/java/jakarta-log4j/DETAILS
+++ b/java/jakarta-log4j/DETAILS
@@ -1,10 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_NAME=log4j
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-log4j
VERSION=1.2.8
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://jakarta.apache.org/${PKG_NAME}/${SOURCE}
+ SOURCE_URL[0]=http://jakarta.apache.org/${SPELL#*-}/$SOURCE

SOURCE_HASH=sha512:b76c7644c474db145b6848db5b4e9293b6bd93dd20a3558d36cd27b4be4f9443a6f48a4d3bef55ba865d50922959060fd952317082c1a82a1f96b93f1446188d
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/log4j/docs/index.html
diff --git a/java/jakarta-log4j/HISTORY b/java/jakarta-log4j/HISTORY
index ff37f40..c937d1d 100644
--- a/java/jakarta-log4j/HISTORY
+++ b/java/jakarta-log4j/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2007-08-29 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Fixed missing parameters for depending on z-rejected

diff --git a/java/jakarta-log4j/INSTALL b/java/jakarta-log4j/INSTALL
index 8920009..b036dba 100755
--- a/java/jakarta-log4j/INSTALL
+++ b/java/jakarta-log4j/INSTALL
@@ -1,2 +1,2 @@
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY
&&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/lib/log4j-1.2.8.jar log4j.jar
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION}
$SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/lib/log4j-1.2.8.jar log4j.jar
diff --git a/java/jakarta-regexp/DETAILS b/java/jakarta-regexp/DETAILS
old mode 100755
new mode 100644
index 6b7e413..3f6d455
--- a/java/jakarta-regexp/DETAILS
+++ b/java/jakarta-regexp/DETAILS
@@ -1,10 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_NAME=regexp
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-regexp
VERSION=1.2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_NAME}/source/${SOURCE}
+
SOURCE_URL[0]=http://www.apache.org/dist/${SPELL%-*}/${SPELL#*-}/source/${SOURCE}

SOURCE_HASH=sha512:94192a4f1dc2831debdff69e920d3d684df724cfd9d88a8f7a9a9c4753c9c3a43441b8f9048f77ece2ea690e473cac09338f007ed84331369d7d7160ff41a8b9
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/regexp/index.html
diff --git a/java/jakarta-regexp/HISTORY b/java/jakarta-regexp/HISTORY
index 5e3d098..6f3ee42 100644
--- a/java/jakarta-regexp/HISTORY
+++ b/java/jakarta-regexp/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/java/jakarta-regexp/INSTALL b/java/jakarta-regexp/INSTALL
index bbd1610..1d06101 100755
--- a/java/jakarta-regexp/INSTALL
+++ b/java/jakarta-regexp/INSTALL
@@ -1,3 +1,3 @@
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY
&&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/jakarta-regexp-1.2.jar
\
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION}
$SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/jakarta-regexp-1.2.jar
\
jakarta-regexp.jar
diff --git a/java/jakarta-struts-bin/DETAILS b/java/jakarta-struts-bin/DETAILS
old mode 100755
new mode 100644
index cbd89b1..d6853e5
--- a/java/jakarta-struts-bin/DETAILS
+++ b/java/jakarta-struts-bin/DETAILS
@@ -1,10 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_NAME=struts
- SPELL=${PKG_PROJECT}-${PKG_NAME}-bin
+ SPELL=jakarta-struts-bin
+ SPELLX=${SPELL%-bin}
VERSION=1.1-rc1
- SOURCE=${PKG_PROJECT}-${PKG_NAME}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_PROJECT}-${PKG_NAME}-${VERSION}
-
SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_NAME}/binaries/${SOURCE}
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELLX/-/\/}/binaries/$SOURCE

SOURCE_HASH=sha512:901d24bcc799d170cd03ddb8a4fe731b98a6ec4de7223864cafc02f5414a0c2f3976b48fd2886f4eabfe4869ecb835c2896b72752e4fc2efe5f68ec2859616c7
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/struts/index.html
diff --git a/java/jakarta-struts-bin/HISTORY b/java/jakarta-struts-bin/HISTORY
index 0517372..210e089 100644
--- a/java/jakarta-struts-bin/HISTORY
+++ b/java/jakarta-struts-bin/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/java/jakarta-struts-bin/INSTALL b/java/jakarta-struts-bin/INSTALL
index 6a99118..4f387d4 100755
--- a/java/jakarta-struts-bin/INSTALL
+++ b/java/jakarta-struts-bin/INSTALL
@@ -1,4 +1,4 @@
. $SECTION_DIRECTORY/java-functions &&

-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY
&&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/lib/struts.jar struts.jar
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION}
$SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/lib/struts.jar struts.jar
diff --git a/java/jakarta-velocity/DETAILS b/java/jakarta-velocity/DETAILS
old mode 100755
new mode 100644
index 6d1ac18..869c820
--- a/java/jakarta-velocity/DETAILS
+++ b/java/jakarta-velocity/DETAILS
@@ -1,11 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_NAME=velocity
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-velocity
VERSION=1.3.1
- SOURCE=${PKG_NAME}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_NAME}-${VERSION}
-
SOURCE_URL[0]=http://jakarta.apache.org/builds/$SPELL/release/v1.3.1/${SOURCE}
- SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/${SOURCE}
+ SOURCE=${SPELL#*-}-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-$VERSION
+
SOURCE_URL[0]=http://jakarta.apache.org/builds/$SPELL/release/v$VERSION/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE

SOURCE_HASH=sha512:14780e79a72b67953388132b23eed6e41491e1247b3b9ed4fa6b2c409efa5ace0a3ba1c6b94ea138b3c502575ecbfa89be5710ff841968118e7ab7229c981a9a
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/velocity/index.html
diff --git a/java/jakarta-velocity/HISTORY b/java/jakarta-velocity/HISTORY
index 58d18cb..910b13b 100644
--- a/java/jakarta-velocity/HISTORY
+++ b/java/jakarta-velocity/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-velocity/INSTALL b/java/jakarta-velocity/INSTALL
index 914261a..91b079b 100755
--- a/java/jakarta-velocity/INSTALL
+++ b/java/jakarta-velocity/INSTALL
@@ -1,5 +1,5 @@
-extract_jakarta_dist ${PKG_NAME} ${PKG_NAME}-${VERSION} ${SOURCE} &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/velocity-1.3.1-rc2.jar \
+extract_jakarta_dist ${SPELL##*-} ${SPELL##*-}-${VERSION} ${SOURCE} &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/velocity-1.3.1-rc2.jar \
velocity.jar &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/velocity-dep-1.3.1-rc2.jar \
+register_jakarta_jar ${SPELL##*-}-${VERSION}/velocity-dep-1.3.1-rc2.jar \
velocity-dep.jar


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (22923639eeac97b13c73871d3f00a59715b3d018), Ismael Luceno, 12/22/2014

Archive powered by MHonArc 2.6.24.

Top of Page