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

author: Treeve Jelbert 2006-06-25 16:43:02 +0200
committer: Treeve Jelbert 2006-06-25 16:43:02 +0200
commit: 9904716b630f7dcaa4a73d5341cf8cd120a7233f (patch)
tree: 1e6c566b650522082e5e0b9d3589b4bf501ec035
parent: 748057d650b89af2fd9a5c1935104d9b001b8c64 (diff)
parent: 9b46d2c81c6d883793267b3d22f05578b1e736f9 (diff)
34 files changed, 187 insertions, 58 deletions
diff --git a/archive/rpm/DEPENDS b/archive/rpm/DEPENDS
index 69cfa9a0e0..682ef37a03 100755
--- a/archive/rpm/DEPENDS
+++ b/archive/rpm/DEPENDS
@@ -1,2 +1,3 @@
+depends  gcc34      &&
 depends  rpmunpack  &&
 depends  python
diff --git a/archive/rpm/DETAILS b/archive/rpm/DETAILS
index 55bcb0912e..93c54be1f1 100755
--- a/archive/rpm/DETAILS
+++ b/archive/rpm/DETAILS
@@ -11,6 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$RPM_VERSION
       LICENSE[0]=GPL
        BUILD_API=2
         KEYWORDS="archive"
+     GCC_VERSION=3.4
            SHORT="The RPM Package Manager (RPM)"
 cat << EOF
 The RPM Package Manager (RPM) is a powerful command line driven package management system capable of installing, uninstalling, verifying, querying, and updating computer software packages. Each software package consists of an archive of files along with information about the package like its version, a description, and the like. There is also a related API ("Application Program Interface"), permitting advanced developers to bypass 'shelling out' to a command line, and to manage such transactions from within a native coding language.
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 39bc19c271..3141506d50 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,3 +1,7 @@
+2006-06-25 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DETAILS, DEPENDS, PRE_BUILD: use gcc 3.4, bug #12754
+	* PRE_BUILD: fixed target dir in python Makefiles
+
 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/archive/rpm/PRE_BUILD b/archive/rpm/PRE_BUILD
index 0e0d824013..5882115c28 100755
--- a/archive/rpm/PRE_BUILD
+++ b/archive/rpm/PRE_BUILD
@@ -1,5 +1,9 @@
+invoke_gcc   &&
 unpack_file  &&
 rm -f $SPELL-$RPM_VERSION.spec &&
 mk_source_dir $SOURCE_DIRECTORY &&
 tar -xzf $SPELL-$RPM_VERSION.tar.gz &&
-rm $SPELL-$RPM_VERSION.tar.gz
+rm $SPELL-$RPM_VERSION.tar.gz       &&
+# this used a completely broken way to determine the target dir
+sedit  "s:pylibdir =.*:pylibdir = /usr/lib/python$(installed_version python| cut -d. -f1,2):"  $SOURCE_DIRECTORY/python/rpmdb/Makefile.in  &&
+sedit  "s:pylibdir =.*:pylibdir = /usr/lib/python$(installed_version python| cut -d. -f1,2):"  $SOURCE_DIRECTORY/python/Makefile.in
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/disk/udev/BUILD b/disk/udev/BUILD
index a94395a421..90cbc234b2 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -8,12 +8,12 @@ if [[ "$UDEV_EXTRAS" == 'y' ]]; then
   make EXTRAS="extras/ata_id extras/dasd_id extras/edd_id extras/floppy extras/scsi_id extras/usb_id extras/volume_id" \
        prefix=${INSTALL_ROOT}/ exec_prefix=${INSTALL_ROOT}/ ${OPTS} \
        ${UDEV_DEBUG} DEST_DIR="./" V=true 
-fi &&
-
-if [[ "$UDEV_STATIC" == 'y' ]]; then
-  pushd __static__ &&
-  # we are not going to use `make install' so no need to set its parameters
-  message "${MESSAGE_COLOR}Building static utilities: $UDEV_STATIC_TARGET${DEFAULT_COLOR}" &&
-  make USE_STATIC=true V=true $OPTS $UDEV_STATIC_TARGET &&
-  popd
 fi
+
+#if [[ "$UDEV_STATIC" == 'y' ]]; then
+#  pushd __static__ &&
+#  # we are not going to use `make install' so no need to set its parameters
+#  message "${MESSAGE_COLOR}Building static utilities: $UDEV_STATIC_TARGET${DEFAULT_COLOR}" &&
+#  make USE_STATIC=true V=true $OPTS $UDEV_STATIC_TARGET &&
+#  popd
+#fi
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 065d4eddae..e387202d50 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -1,17 +1,21 @@
 config_query UDEV_PERSIST 'Install persistent storage rules?' n &&
+
 if [ "$RECENT_KERNEL" == "y" ]; then
   config_query UDEV_PERSIST_INPUT 'Install persistent input rules?' n
 fi  &&
-config_query UDEV_STATIC 'Create static binaries in addition to dynamically linked ones?' n &&
+
 config_query_option UDEV_DEBUG 'Compile extra debugging messages?' n 'DEBUG=true' 'DEBUG=false' &&
-if [[ "$UDEV_STATIC" == 'y' ]]; then
-  if [[ -z "$UDEV_STATIC_TARGET" ]]; then
-    # add more UDEV utilities here as necessary, space-separated
-    local UDEV_STATIC_TARGET="udevstart"
-  fi &&
-  persistent_add UDEV_STATIC_TARGET &&
-  message "${MESSAGE_COLOR}Static utilities (with suffix .static): $UDEV_STATIC_TARGET${DEFAULT_COLOR}"
-fi  &&
+
+#config_query UDEV_STATIC 'Create static binaries in addition to dynamically linked ones?' n &&
+#if [[ "$UDEV_STATIC" == 'y' ]]; then
+#  if [[ -z "$UDEV_STATIC_TARGET" ]]; then
+#    # add more UDEV utilities here as necessary, space-separated
+#    local UDEV_STATIC_TARGET="udevstart"
+#  fi &&
+#  persistent_add UDEV_STATIC_TARGET &&
+#  message "${MESSAGE_COLOR}Static utilities (with suffix .static): $UDEV_STATIC_TARGET${DEFAULT_COLOR}"
+#fi  &&
+
 if [[ "$UDEV_PERSIST" == "y" ]]; then
   UDEV_EXTRAS=y  &&
   persistent_add UDEV_EXTRAS
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 97dee70278..db612b100c 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,13 @@
+2006-06-25 Juuso Alasuutari <iuso@sourcemage.org>
+	* PRE_BUILD: Added patch to allow network interface renaming 
+	  with existing names. Added comments about patches, tidied 
+	  code.
+	* CONFIGURE, PRE_BUILD, BUILD, INSTALL: Commented out static 
+	  target parts, it only installs udevstart which is deprecated 
+	  now.
+	* ifrename_wait_retry.patch: Added.
+	* Makefile.patch: Updated.
+
 2006-06-24 Juuso Alasuutari <iuso@sourcemage.org>
 	* helpers/mac2name: Edited to read DEVICE_MAC instead of MAC in 
 	  /etc/sysconfig/network/*.dev. Fixed a bug where supplying no 
diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index f4fe9b5ff7..648c03b705 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -64,13 +64,13 @@ if [[ "$UDEV_EXTRAS" == 'y' ]]; then
       install_config_file etc/udev/60-persistent-input.rules ${UDEV_CFG}/rules.d/60-persistent-input.rules
     fi
   fi
-fi  &&
-
-if [[ "$UDEV_STATIC" == 'y' ]]; then
-  pushd __static__ &&
-  # we are not supposed to use `make install'
-  for FILE in $UDEV_STATIC_TARGET; do
-    install -D $FILE $INSTALL_ROOT/usr/sbin/$FILE.static
-  done &&
-  popd
 fi
+
+#if [[ "$UDEV_STATIC" == 'y' ]]; then
+#  pushd __static__ &&
+#  # we are not supposed to use `make install'
+#  for FILE in $UDEV_STATIC_TARGET; do
+#    install -D $FILE $INSTALL_ROOT/usr/sbin/$FILE.static
+#  done &&
+#  popd
+#fi
diff --git a/disk/udev/Makefile.patch b/disk/udev/Makefile.patch
index 6807c627d1..77c1c5be3c 100644
--- a/disk/udev/Makefile.patch
+++ b/disk/udev/Makefile.patch
@@ -1,7 +1,7 @@
---- Makefile	2005-12-03 19:11:40.000000000 +0100
-+++ Makefile.new	2005-12-03 19:12:18.000000000 +0100
-@@ -340,11 +340,6 @@
- 		echo $$target; \
+--- Makefile	2006-06-25 15:48:49.000000000 +0300
++++ Makefile.new	2006-06-25 15:49:39.000000000 +0300
+@@ -294,11 +294,6 @@
+ 	@extras="$(EXTRAS)"; for target in $$extras; do \
  		$(MAKE) -C $$target $@ || exit 1; \
  	done;
 -ifndef DESTDIR
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index a74738dce9..c0c1f0e475 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -1,9 +1,13 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
 
-if [[ "$UDEV_STATIC" == 'y' ]]; then
-  message "${MESSAGE_COLOR}Setting up static build directory...${DEFAULT_COLOR}" &&
-  mkdir __static__ &&
-  cp -aRv Makefile *.{c,h} ./__static__/
-fi
+# Prevent udev restart on 'make install',
+# allow network interface renaming with existing name.
+patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch             &&
+patch -p0 < $SCRIPT_DIRECTORY/ifrename_wait_retry.patch
+
+#if [[ "$UDEV_STATIC" == 'y' ]]; then
+#  message "${MESSAGE_COLOR}Setting up static build directory...${DEFAULT_COLOR}" &&
+#  mkdir __static__ &&
+#  cp -aRv Makefile *.{c,h} ./__static__/
+#fi
diff --git a/disk/udev/ifrename_wait_retry.patch b/disk/udev/ifrename_wait_retry.patch
new file mode 100644
index 0000000000..ecc57e8363
--- /dev/null
+++ b/disk/udev/ifrename_wait_retry.patch
@@ -0,0 +1,58 @@
+--- udev_device.c	2006-06-25 15:56:38.000000000 +0300
++++ udev_device.c.new	2006-06-25 15:52:20.000000000 +0300
+@@ -86,6 +86,7 @@
+ 	int sk;
+ 	struct ifreq ifr;
+ 	int retval;
++	int timeout = (1000000 / 50000) * 30; /* 30 seconds */
+ 
+ 	info("changing net interface name from '%s' to '%s'", udev->dev->kernel_name, udev->name);
+ 	if (udev->test_run)
+@@ -102,10 +103,44 @@
+ 	strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
+ 
+ 	retval = ioctl(sk, SIOCSIFNAME, &ifr);
+-	if (retval != 0)
+-		err("error changing net interface name: %s", strerror(errno));
+-	close(sk);
++	if (retval != 0) {
++		if (errno != EEXIST) {
++			err("error changing net interface name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
++			goto error;
++		}
++
++		/* Destination interface already exits.
++		 * First rename our interface to something temporary in case
++		 * we're trying to swap with that one. */
++		strlcpy(ifr.ifr_newname, udev->dev->kernel_name, IFNAMSIZ);
++		strlcat(ifr.ifr_newname, "_temp", IFNAMSIZ);
++
++		retval = ioctl(sk, SIOCSIFNAME, &ifr);
++		if (retval != 0) {
++			err("error changing net interface name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
++			goto error;
++		}
++
++		/* Now we loop until our target interface goes away. */
++		strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
++		strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
++		while ((retval = ioctl(sk, SIOCSIFNAME, &ifr)) != 0) {
++			if (errno != EEXIST) {
++				err("error changing net interface name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
++				break;
++			}
++
++			if (timeout-- <= 0) {
++				err("error changing net interface name %s to %s: timeout", ifr.ifr_name, ifr.ifr_newname);
++				break;
++			}
+ 
++			usleep(50000);
++		}
++	}
++
++error:
++	close(sk);
+ 	return retval;
+ }
+ 
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/kde-apps/kdevelop/DETAILS b/kde-apps/kdevelop/DETAILS
index 14076e21f1..e8e954cf5a 100755
--- a/kde-apps/kdevelop/DETAILS
+++ b/kde-apps/kdevelop/DETAILS
@@ -1,10 +1,10 @@
 source  $SECTION_DIRECTORY/KDE_DETAILS
 
            SPELL=kdevelop
-         VERSION=3.3.2
+         VERSION=3.3.3
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$KDE_URL/stable/3.5.2/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/3.5.3/src/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
        BUILD_API=2
         WEB_SITE=http://www.kdevelop.org/
diff --git a/kde-apps/kdevelop/HISTORY b/kde-apps/kdevelop/HISTORY
index 54a0ffdbf3..b632117f97 100644
--- a/kde-apps/kdevelop/HISTORY
+++ b/kde-apps/kdevelop/HISTORY
@@ -1,5 +1,8 @@
+2006-06-25 George Sherwood <george@beernabeer.com>
+	* DETAILS: Updated to version 3.3.3
+
 2006-04-09 George Sherwood <george@beernabeer.com>
-	* DETAILS: Updated to versoin 3.3.2 & SOURCE_URL
+	* DETAILS: Updated to version 3.3.2 & SOURCE_URL
 
 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
diff --git a/kde-apps/kdevelop/kdevelop-3.3.2.tar.bz2.sig b/kde-apps/kdevelop/kdevelop-3.3.2.tar.bz2.sig
deleted file mode 100644
index a24dbfc3aa..0000000000
--- a/kde-apps/kdevelop/kdevelop-3.3.2.tar.bz2.sig
+++ /dev/null
diff --git a/kde-apps/kdevelop/kdevelop-3.3.3.tar.bz2.sig b/kde-apps/kdevelop/kdevelop-3.3.3.tar.bz2.sig
new file mode 100644
index 0000000000..dc69b5fa4b
--- /dev/null
+++ b/kde-apps/kdevelop/kdevelop-3.3.3.tar.bz2.sig
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
author	Treeve Jelbert	2006-06-25 16:43:02 +0200
committer	Treeve Jelbert	2006-06-25 16:43:02 +0200
commit	9904716b630f7dcaa4a73d5341cf8cd120a7233f (patch)
tree	1e6c566b650522082e5e0b9d3589b4bf501ec035
parent	748057d650b89af2fd9a5c1935104d9b001b8c64 (diff)
parent	9b46d2c81c6d883793267b3d22f05578b1e736f9 (diff)