irssi: => 0.8.13

6 files changed, 37 insertions, 35 deletions

diff --git a/chat-irc/irssi/CONFIGURE b/chat-irc/irssi/CONFIGURE
index 1907c22664..93de53b005 100755
--- a/chat-irc/irssi/CONFIGURE
+++ b/chat-irc/irssi/CONFIGURE
@@ -1,9 +1,11 @@
 config_query_option IRSSI_OPTS "build with irssi-bot" n \
-			       "--with-bot" "--without-bot" &&
-config_query_option IRSSI_OPTS \
-	"build with irssi-proxy (to use irssi as a bouncer)" n \
-	"--with-proxy" "--without-proxy" &&
+                               "--with-bot" \
+                               "--without-bot" &&
 
-config_query_option IRSSI_OPTS \
-	"build with IPv6 support?" y \
-	"--enable-ipv6" "--disable-ipv6"
+config_query_option IRSSI_OPTS "build with irssi-proxy (to use irssi as a bouncer)" n \
+                               "--with-proxy" \
+                               "--without-proxy" &&
+
+config_query_option IRSSI_OPTS "build with IPv6 support?" y \
+                               "--enable-ipv6" \
+                               "--disable-ipv6"
diff --git a/chat-irc/irssi/DEPENDS b/chat-irc/irssi/DEPENDS
index 8c1e09172a..7faeeef799 100755
--- a/chat-irc/irssi/DEPENDS
+++ b/chat-irc/irssi/DEPENDS
@@ -11,11 +11,12 @@ optional_depends  "perl"                \
                   "--with-perl=module"  \
                   "--with-perl=no"      \
                   "for perl support"    &&
+
 optional_depends  "dante"               \
 		  "--with-socks"        \
 		  "--without-socks"     \
 		  "for SOCKS support"   &&
 
-if [ "$IRSSI_SVN" = "y" ]; then
+if [[ $IRSSI_SVN == y ]]; then
   depends  subversion
 fi
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index ca41dc5dc1..fa1d7e463f 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -1,40 +1,35 @@
            SPELL=irssi
-if [[ "${IRSSI_SVN}" = "y" ]];
-then
-  if [[ "${IRSSI_SVN_AUTOUPDATE}" == "y" ]];
-  then
+if [[ $IRSSI_SVN == y ]]; then
+  if [[ $IRSSI_SVN_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
   fi
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
   FORCE_DOWNLOAD=ON
     SOURCE_HINTS=old_svn_compat
    SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.8.13-rc1
+         VERSION=0.8.13
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.irssi.org/files/${SOURCE}
-         SOURCE2=${SOURCE}.sig
-  SOURCE2_URL[0]=http://www.irssi.org/files/${SOURCE2}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
   SOURCE2_IGNORE=signature
-      SOURCE_GPG="irssi.gpg:${SOURCE}.sig:VERIFIED_UPSTREAM_KEY"
+      SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
 fi
         WEB_SITE=http://www.irssi.org
          ENTERED=20011126
       LICENSE[0]=GPL
         KEYWORDS="irc chat"
-           SHORT="irssi - a textmode irc client" 
+           SHORT="textmode irc client" 
 cat << EOF
-irssi - a textmode irc client
-Irssi is a modular IRC client that currently has 
-only text mode user interface, but 80-90% of the 
-code isn't text mode specific, so other UIs could
-be created pretty easily. Also, Irssi isn't really
-even IRC specific anymore, there's already a working
-SILC module available. Support for other protocols
-like ICQ could be created some day too.
+Irssi is a modular IRC client that currently has only text mode user interface,
+but 80-90% of the code isn't text mode specific, so other UIs could be created
+pretty easily. Also, Irssi isn't really even IRC specific anymore, there's
+already a working SILC module available. Support for other protocols like ICQ
+could be created some day too.
 EOF
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 5cbda60a9d..17d2017876 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2009-04-01 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.8.13; cleaned up
+	* CONFIGURE: unify ftw
+
 2009-03-25 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 0.8.13-rc1
 	  Fixed Bug #14904
@@ -113,4 +117,3 @@
 	* added MAINTAINTER tag to DETAILS file
 	* added this HISTORY file
 	* updated VERSION to 0.8.4
-
diff --git a/chat-irc/irssi/PREPARE b/chat-irc/irssi/PREPARE
index 073b974723..0c7a8c75d2 100755
--- a/chat-irc/irssi/PREPARE
+++ b/chat-irc/irssi/PREPARE
@@ -1,6 +1,6 @@
 config_query IRSSI_SVN "Build SVN version?" n &&
-if [[ "${IRSSI_SVN}" == "y" ]]
-then
+
+if [[ $IRSSI_SVN == "y" ]]; then
   config_query IRSSI_SVN_AUTOUPDATE \
-            "Automaticaly update the spell on sorcery queue/system-update?" n
+               "Automaticaly update the spell on sorcery queue/system-update?" n
 fi
diff --git a/chat-irc/irssi/PRE_BUILD b/chat-irc/irssi/PRE_BUILD
index 91a86cdc04..b51ec916da 100755
--- a/chat-irc/irssi/PRE_BUILD
+++ b/chat-irc/irssi/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [ "$IRSSI_SVN" = "y" ]; then
-NOCONFIGURE=yes ./autogen.sh
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $IRSSI_SVN == y ]]; then
+  NOCONFIGURE=yes ./autogen.sh
 fi