Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 net/cacti/DETAILS   |    6 +++---
 net/cacti/HISTORY   |    3 ++-
 net/cacti/PRE_BUILD |   12 ++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 52e1f12c3bce721e3c5ed2d8f730f584335cef1f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cacti: updated PA to 2.6

diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 2bbbc2c..4fb7d2a 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,12 +1,12 @@
            SPELL=cacti
          VERSION=0.8.7e
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=$SPELL-$VERSION.tar.gz
 if [[ $CACTI_PA == y ]]; then
-      VERSION_PA=2.5
+      VERSION_PA=2.6
          SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.zip
   SOURCE2_URL[0]=http://mirror.cactiusers.org/downloads/plugins/$SOURCE2
-    
SOURCE2_HASH=sha512:e9b5c4e914da84742940b8ef461c8621ba3ac0d1f7c1daea20628bbb27aac6fe4e01c3d55f25805bf612ab10c6fdd259feb3c835ad99c4ce8713ef145ad66c16
+    
SOURCE2_HASH=sha512:0468d1d688f957b01e331dd554626fd2efb601fd6e78b170234925578c2da0d81e8c914854b99991b2a807315f20bdc2f49ff18965a5ed737d369ac2db107744
 SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 40a8859..91e7582 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,5 +1,6 @@
 2009-12-28 Vlad Glagolev <stealth AT sourcemage.org>
-       * DETAILS: PATCHLEVEL=1
+       * DETAILS: PATCHLEVEL=2; updated Plugin Architecture to 2.6
+       * PRE_BUILD: apply official patches first; corrected PA source dir
        * patches/cross_site_fix.patch: added
 
 2009-10-02 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 64af94d..12f877c 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -8,11 +8,11 @@ fi &&
 
 cd "$SOURCE_DIRECTORY" &&
 
-if [[ $CACTI_PA == y ]]; then
-  cat "$SOURCE_DIRECTORY2/pa.sql" >> cacti.sql &&
-  patch -p1 < 
"$SOURCE_DIRECTORY2/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
-fi &&
-
 for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
   patch -p1 < $patch
-done
+done &&
+
+if [[ $CACTI_PA == y ]]; then
+  cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
+  patch -p1 < 
"$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
+fi