chat-irc/weechat: version 1.2

6 files changed, 99 insertions, 48 deletions

diff --git a/chat-irc/weechat/BUILD b/chat-irc/weechat/BUILD
index 5b569eb6e1..e013b8d866 100755
--- a/chat-irc/weechat/BUILD
+++ b/chat-irc/weechat/BUILD
@@ -1,16 +1 @@
-if [[ $WEECHAT_DEBUG == y ]]; then
-  if [[ $WEECHAT_DEBUG_FULL == y ]]; then
-    OPTS="$OPTS  --with-debug=2"
-  else
-    OPTS="$OPTS  --with-debug=1"
-  fi
-fi &&
-
-if [[ $WEECHAT_CMAKE == y ]]; then
-  cmake_build
-else
-  if [[ $WEECHAT_BRANCH == scm ]]; then
-    ./autogen.sh
-  fi &&
-  default_build
-fi
+cmake_build
diff --git a/chat-irc/weechat/CONFIGURE b/chat-irc/weechat/CONFIGURE
new file mode 100755
index 0000000000..d47cefce6f
--- /dev/null
+++ b/chat-irc/weechat/CONFIGURE
@@ -0,0 +1,50 @@
+config_query_option WEECHAT_OPTS \
+  "enable Alias plugin?" \
+  y \
+  "-DENABLE_ALIAS=ON" \
+  "-DENABLE_ALIAS=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable Charset plugin?" \
+  y \
+  "-DENABLE_CHARSET=ON" \
+  "-DENABLE_CHARSET=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable Exec plugin?" \
+  y \
+  "-DENABLE_EXEC=ON" \
+  "-DENABLE_EXEC=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable FIFO plugin?" \
+  y \
+  "-DENABLE_FIFO=ON" \
+  "-DENABLE_FIFO=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable IRC plugin?" \
+  y \
+  "-DENABLE_IRC=ON" \
+  "-DENABLE_IRC=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable Logger plugin?" \
+  y \
+  "-DENABLE_LOGGER=ON" \
+  "-DENABLE_LOGGER=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable native language support?" \
+  y \
+  "-DENABLE_NLS=ON" \
+  "-DENABLE_NLS=OFF"
+config_query_option WEECHAT_OPTS \
+  "enable relay plugin?" \
+  y \
+  "-DENABLE_RELAY=ON" \
+  "-DENABLE_RELAY=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable script manager?" \
+  y \
+  "-DENABLE_SCRIPT=ON" \
+  "-DENABLE_SCRIPT=OFF" &&
+config_query_option WEECHAT_OPTS \
+  "enable Xfer plugin?" \
+  y \
+  "-DENABLE_XFER=ON" \
+  "-DENABLE_XFER=OFF"
diff --git a/chat-irc/weechat/DEPENDS b/chat-irc/weechat/DEPENDS
index ea20145b2a..dfe3c6f2a8 100755
--- a/chat-irc/weechat/DEPENDS
+++ b/chat-irc/weechat/DEPENDS
@@ -1,24 +1,41 @@
 if [[ $WEECHAT_BRANCH == scm ]]; then
-  depends git &&
-  depends gettext &&
+  depends git
+fi &&
+
+depends cmake &&
+depends curl &&
+depends zlib &&
+depends libgcrypt &&
+depends gettext &&
 
-  if [[ $WEECHAT_CMAKE != y ]]; then
-    depends autoconf &&
-    depends automake &&
-    depends libtool
-  fi
+optional_depends gnutls "-DENABLE_GNUTLS=ON" "-DENABLE_GNUTLS=OFF" "Turn on gnutls support" &&
+if is_depends_enabled $SPELL gnutls; then
+  depends ca-certificates
 fi &&
 
-if [[ $WEECHAT_CMAKE == y ]]; then
-  depends cmake
+optional_depends asciidoc "-DENABLE_DOC=ON" "-DENABLE_DOC=OFF" "build documentation?" &&
+if is_depends_enabled asciidoc; then
+  depends source-highlight
 fi &&
 
-depends ncurses &&
-depends libgcrypt &&
+optional_depends xsltproc "-DENABLE_MAN=ON" "-DENABLE_MAN=OFF" "build manpages" &&
+if is_depends_enabled xsltproc; then
+  depends docbook-xml &&
+  depends docbook-xsl
+fi &&
+
+
+optional_depends perl "-DENABLE_PERL=ON" "-DENABLE_PERL=ON" "Turns on Perl script plugin" &&
+optional_depends python "-DENABLE_PYTHON=ON" "-DENABLE_PYTHON=OFF" "Turns on Python script plugin" &&
+optional_depends python3 "-DENABLE_PYTHON3=ON" "-DENABLE_PYTHON3=OFF" "Turns on Python 3 script plugin" &&
+optional_depends RUBY "-DENABLE_RUBY=ON" "-DENABLE_RUBY=OFF" "Turns on Ruby script plugin" &&
+optional_depends LUA "-DENABLE_LUA=ON" "-DENABLE_LUA=OFF" "Turn on Lua script plugin" &&
+optional_depends aspell "-DENABLE_ASPELL=ON" "-DENABLE_ASPELL=OFF" "Turn on Aspell plugin" &&
+optional_depends guile "-DENABLE_GUILE=ON" "-DENABLE_GUILE=OFF" "Turn on Scheme script plugin" &&
+optional_depends libv8 "-DENABLE_JAVASCRIPT=ON" "-DENABLE_JAVASCRIPT=OFF" "Turn on JavaScript script plugin" &&
+optional_depends ncurses "-DENABLE_NCURSES=ON" "-DENABLE_NCURSES=OFF" "Enable ncurses interface" &&
+optional_depends tcl "-DENABLE_TCL=ON" "-DENABLE_TCL=OFF" "Enable tcl script plugin" &&
 
-optional_depends gnutls "" "--disable-gnutls" "Turn on gnutls support" &&
-optional_depends perl "" "--disable-perl" "Turns on Perl script plugin" &&
-optional_depends python "" "--disable-python" "Turns on Python script plugin" &&
-optional_depends RUBY "" "--disable-ruby" "Turns on Ruby script plugin" &&
-optional_depends LUA "" "--disable-lua" "Turn on Lua script plugin" &&
-optional_depends aspell "" "--disable-aspell" "Turn on Aspell plugin"
+if is_depends_enabled $SPELL aspell; then
+  optional_depends enchant "-DENABLE_ENCHANT=ON" "-DENABLE_ENCHANT=OFF" "enable Enchant lib for Aspell plugin"
+fi
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index f8f86d6d07..8d76f54071 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -9,15 +9,15 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-$WEECHAT_BRANCH
    SOURCE_URL[0]=git://git.sv.gnu.org/weechat.git:$SPELL
 else
   if [ "$WEECHAT_BRANCH" == "devel" ]; then
-         VERSION=0.4.4-dev
+         VERSION=1.3-dev
           SOURCE=$SPELL-devel.tar.bz2
-     SOURCE_HASH=sha512:54e8792379d8f0dc8b9f753b09a9ca22a387f707bf9c109e169f4685e953cc026b6f78fa31e0bbcffa483e21f51c1ff23769fd4eab3a53f7a2cff88db35b1a6d
+     SOURCE_HASH=sha512:
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-devel
   else
-         VERSION=0.4.3
+         VERSION=1.2
   SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:0d049626e6a5fb44bc368d732c395d7135ad8869d9368cb95487662c4c738c9a44052db6e40a7fa08db9798916de0c466c24531f94993e91b7b19519b1d7cfc2
+     SOURCE_HASH=sha512:dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
   fi
    SOURCE_URL[0]=http://www.weechat.org/files/src/$SOURCE
@@ -30,3 +30,4 @@ fi
 cat << EOF
 Weechat is an ncurses based IRC Chat program.
 EOF
+dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9  /var/spool/sorcery/weechat-1.2.tar.bz2
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index fe6fe6d5e1..c3bdaf2a68 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,11 @@
+2015-07-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS, DEPENDS: version 1.2
+	* CONFIGURE: expose all configuration options
+	* BUILD, DEPENDS, PREPARE: remove option to build with
+	  autotools, it is a maintainance nightmare to support
+	  both and upstream discourage use of autotools. Fix
+	  optional dependencies so they work with cmake.
+
 2014-07-03 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: Use get_scm_version
 
diff --git a/chat-irc/weechat/PREPARE b/chat-irc/weechat/PREPARE
index 8b96ab05b4..40600f7d24 100755
--- a/chat-irc/weechat/PREPARE
+++ b/chat-irc/weechat/PREPARE
@@ -1,12 +1,2 @@
 . ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable devel scm &&
-case "$WEECHAT_BRANCH" in
-  scm|devel)
-    config_query WEECHAT_DEBUG "Enable debug messages?" n &&
-    if [ "$WEECHAT_DEBUG" == "y" ]; then
-      config_query WEECHAT_DEBUG_FULL "Print debug messages to the window?" n
-    fi 
-    ;;
-esac &&
-
-config_query WEECHAT_CMAKE "Use cmake instead of autotools? (recommended)" y
+prepare_select_branch stable devel scm