From 7090bbed6613de760d56dba2d0ac465fa1e9fc25 Mon Sep 17 00:00:00 2001
From: Ismael Luceno
Date: Mon, 22 Dec 2014 17:05:57 -0300
Subject: jakarta-commons-modeler: Normalize SPELL field and remove PKG_*
 variables

---
 java/jakarta-commons-modeler/BUILD   |  4 ++--
 java/jakarta-commons-modeler/DETAILS | 11 ++++-------
 java/jakarta-commons-modeler/HISTORY |  4 ++++
 java/jakarta-commons-modeler/INSTALL |  8 ++++----
 4 files changed, 14 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 java/jakarta-commons-modeler/DETAILS

(limited to 'java')

diff --git a/java/jakarta-commons-modeler/BUILD b/java/jakarta-commons-modeler/BUILD
index e3f3ce0d17..1bf4201e9c 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 7997336559..4a626d5d8c
--- 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 b2229ea949..1c0e01ee31 100644
--- a/java/jakarta-commons-modeler/HISTORY
+++ b/java/jakarta-commons-modeler/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+	* BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+	variables
+
 2011-10-14 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/java/jakarta-commons-modeler/INSTALL b/java/jakarta-commons-modeler/INSTALL
index 976d1efc24..cd879b3c88 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
-- 
cgit v1.2.3