Merge branch 'master' of ssh://jalasuutari@scm.sourcemage.org/smgl/grimoire

19 files changed, 56 insertions, 16 deletions

diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index 2aafbd31e5..1e191b3412 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,5 +1,5 @@
            SPELL=bitlbee
-         VERSION=1.0.2
+         VERSION=1.0.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 5bf4df516e..61059b3419 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,6 @@
+2006-06-25 George Sherwood <george@beernabeer.com>
+	* DETAILS: Updated to 1.0.3
+
 2006-04-26 George Sherwood <george@beernabeer.com>
 	* DEPENDS: Added glib2, gnutls. Bug #11077.
 
diff --git a/chat-irc/bitlbee/bitlbee-1.0.2.tar.gz.sig b/chat-irc/bitlbee/bitlbee-1.0.2.tar.gz.sig
deleted file mode 100644
index 5c031e97c7..0000000000
--- a/chat-irc/bitlbee/bitlbee-1.0.2.tar.gz.sig
+++ /dev/null
diff --git a/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig b/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig
new file mode 100644
index 0000000000..72784a6f6a
--- /dev/null
+++ b/chat-irc/bitlbee/bitlbee-1.0.3.tar.gz.sig
diff --git a/editors/gobby/DETAILS b/editors/gobby/DETAILS
index f5cfcfe4ec..368762e508 100755
--- a/editors/gobby/DETAILS
+++ b/editors/gobby/DETAILS
@@ -1,13 +1,17 @@
            SPELL=gobby
-         VERSION=0.4.0rc2
-       BUILD_API=2
+if [[ "${GOBBY_DEVEL}" == "y" ]]
+then     VERSION=0.4.0rc2
+else     VERSION=0.3.1
+fi
+  
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
      SOURCE2_URL=${SOURCE_URL}.sig
-     SOURCE_GPG=0x539.gpg:${SOURCE}.sig
- SOURCE2_IGNORE=signature
+      SOURCE_GPG=0x539.gpg:${SOURCE}.sig
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+       BUILD_API=2
         WEB_SITE=http://gobby.0x539.de/index.html
          ENTERED=20050930
          UPDATED=20050930
diff --git a/editors/gobby/HISTORY b/editors/gobby/HISTORY
index 572dd168c2..cc315eb03b 100644
--- a/editors/gobby/HISTORY
+++ b/editors/gobby/HISTORY
@@ -1,5 +1,5 @@
 2006-06-25 Pieter Lenaerts <e-type@sourcemage.org>
-	* DETAILS: version 0.4.0rc2
+	* add PREPARE, edit DETAILS: added 0.4.0rc2 devel version
 
 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org>
 	* DETAILS: version 0.3.0
diff --git a/editors/gobby/PREPARE b/editors/gobby/PREPARE
new file mode 100755
index 0000000000..10f5b3b67a
--- /dev/null
+++ b/editors/gobby/PREPARE
@@ -0,0 +1 @@
+config_query GOBBY_DEVEL "Use devel version?" n
diff --git a/libs/obby/DETAILS b/libs/obby/DETAILS
index ac018d9ff3..bc710e9bd8 100755
--- a/libs/obby/DETAILS
+++ b/libs/obby/DETAILS
@@ -1,13 +1,23 @@
            SPELL=obby
+
+if [[ "${OBBY_DEVEL}" == "y" ]] ; then
          VERSION=0.4.0rc2
-       BUILD_API=2
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
      SOURCE2_URL=${SOURCE_URL}.sig
       SOURCE_GPG=0x539.gpg:${SOURCE}.sig
   SOURCE2_IGNORE=signature
+
+else
+         VERSION=0.3.0
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
+      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+fi
+    
+       BUILD_API=2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://gobby.0x539.de/index.html
          ENTERED=20050930
          UPDATED=20050930
diff --git a/libs/obby/HISTORY b/libs/obby/HISTORY
index c494500568..d02cc28584 100644
--- a/libs/obby/HISTORY
+++ b/libs/obby/HISTORY
@@ -1,5 +1,5 @@
 2006-06-25 Pieter Lenaerts <e-type@sourcemage.org>
-	* DETAILS: updated to 0.4.0rc2
+	* add PREPARE, edit DETAILS: added 0.4.0rc2 devel version
 
 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org>
 	* DETAILS: updated to 0.3.0
diff --git a/libs/obby/PREPARE b/libs/obby/PREPARE
new file mode 100755
index 0000000000..f181340bad
--- /dev/null
+++ b/libs/obby/PREPARE
@@ -0,0 +1 @@
+config_query OBBY_DEVEL "Use devel version?" n
diff --git a/libs/obby/obby-0.3.0.tar.gz.sig b/libs/obby/obby-0.3.0.tar.gz.sig
new file mode 100644
index 0000000000..d78b1d90c4
--- /dev/null
+++ b/libs/obby/obby-0.3.0.tar.gz.sig
diff --git a/net/net6/DETAILS b/net/net6/DETAILS
index 74cb5a9374..abd02f024b 100755
--- a/net/net6/DETAILS
+++ b/net/net6/DETAILS
@@ -1,13 +1,23 @@
            SPELL=net6
+
+if [[ "${NET6_DEVEL}" == "y" ]] ; then
          VERSION=1.3.0rc2
-       BUILD_API=2
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
      SOURCE2_URL=${SOURCE_URL}.sig
       SOURCE_GPG=0x539.gpg:${SOURCE}.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+
+else
+         VERSION=1.2.2
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
+      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+fi
+         
+       BUILD_API=2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://gobby.0x539.de/index.html
          ENTERED=20050930
          UPDATED=20050930
diff --git a/net/net6/HISTORY b/net/net6/HISTORY
index ffa633b364..01f1f1ea9c 100644
--- a/net/net6/HISTORY
+++ b/net/net6/HISTORY
@@ -1,5 +1,5 @@
 2006-06-25 Pieter Lenaerts <e-type@sourcemage.org>
-	* DETAILS: updated to 1.3.0rc2
+	* add PREPARE, edit DETAILS: added 1.3.0rc2 devel version
 
 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org>
 	* DETAILS: updated to 1.2.2
diff --git a/net/net6/PREPARE b/net/net6/PREPARE
new file mode 100755
index 0000000000..307be6db4e
--- /dev/null
+++ b/net/net6/PREPARE
@@ -0,0 +1 @@
+config_query NET6_DEVEL "Use devel version?" n
diff --git a/net/net6/net6-1.2.2.tar.gz.sig b/net/net6/net6-1.2.2.tar.gz.sig
new file mode 100644
index 0000000000..c1820f5b3b
--- /dev/null
+++ b/net/net6/net6-1.2.2.tar.gz.sig
diff --git a/net/sobby/DETAILS b/net/sobby/DETAILS
index c1cdd937d1..d688e59eb3 100755
--- a/net/sobby/DETAILS
+++ b/net/sobby/DETAILS
@@ -1,13 +1,22 @@
            SPELL=sobby
+
+if [[ "${SOBBY_DEVEL}" == "y" ]] ; then
          VERSION=0.4.0rc1
-       BUILD_API=2
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://releases.0x539.de/${SPELL}/${SOURCE}
      SOURCE2_URL=${SOURCE_URL}.sig
       SOURCE_GPG=0x539.gpg:${SOURCE}.sig
   SOURCE2_IGNORE=signature
+
+else     VERSION=0.3.0
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+      SOURCE_URL=http://releases.0x539.de/${SPELL}/${SOURCE}
+      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+fi
+      
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+       BUILD_API=2
         WEB_SITE=http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/WikiStart
          ENTERED=20060625
          UPDATED=20060625
diff --git a/net/sobby/HISTORY b/net/sobby/HISTORY
index 9f4a0d64ae..6f53cd54b7 100644
--- a/net/sobby/HISTORY
+++ b/net/sobby/HISTORY
@@ -1,2 +1,2 @@
 2006-06-25 Pieter Lenaerts <e-type@sourcemage.org>
-	* DETAILS, DEPENDS, HISTORY: created spell
+	* PREPARE, DETAILS, DEPENDS, HISTORY: created spell
diff --git a/net/sobby/PREPARE b/net/sobby/PREPARE
new file mode 100755
index 0000000000..0d5ae2e343
--- /dev/null
+++ b/net/sobby/PREPARE
@@ -0,0 +1 @@
+config_query SOBBY_DEVEL "Use devel version?" n
diff --git a/net/sobby/sobby-0.3.0.tar.gz.sig b/net/sobby/sobby-0.3.0.tar.gz.sig
new file mode 100644
index 0000000000..5e265c51f0
--- /dev/null
+++ b/net/sobby/sobby-0.3.0.tar.gz.sig