6 files changed, 267 insertions, 311 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 494c0c036ce2..4256c0e9204f 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	1.42
-PORTREVISION?=	1
+PORTVERSION=	1.51
+PORTREVISION?=	0
 CATEGORIES?=	net-p2p
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 PKGNAMESUFFIX?=	-cli
@@ -20,7 +20,7 @@ SLAVEPORT?=
 LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
 # General dependencies
-GEN_LIB_DEPENDS=curl.5:${PORTSDIR}/ftp/curl
+GEN_LIB_DEPENDS=curl.4:${PORTSDIR}/ftp/curl
 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
 
 USE_GNOME?=	pkgconfig
@@ -46,9 +46,6 @@ general-patch:
 		${WRKSRC}/third-party/libevent/Makefile.*
 	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|g ; \
-		s|%%CXXFLAGS%%|${CXXFLAGS}|g' \
-			${WRKSRC}/configure.ac
 .if ${SLAVEPORT}!="gtk2"
 	@${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \
 		${WRKSRC}/libtransmission/utils.h
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index 556ec68011a3..d068d4484c12 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-MD5 (transmission-1.42.tar.bz2) = c083bdcb01426466e80ee339bccd9351
-SHA256 (transmission-1.42.tar.bz2) = e7e17f29a166794017c6d94362159337f14008c414d1f8da5f7c2c1c05c7d543
-SIZE (transmission-1.42.tar.bz2) = 4630409
+MD5 (transmission-1.51.tar.bz2) = b93439fbd0040ad6eb448f70a48355f5
+SHA256 (transmission-1.51.tar.bz2) = 507775f0c2fb962597a2433edb5a83e15ba3ac5624ba5b4b04a97c523ff17a6e
+SIZE (transmission-1.51.tar.bz2) = 4574671
diff --git a/net-p2p/transmission-cli/files/transmission-cli-configure.ac b/net-p2p/transmission-cli/files/transmission-cli-configure.ac
index f68d44cc6fb4..edfe5935a2ae 100644
--- a/net-p2p/transmission-cli/files/transmission-cli-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-cli-configure.ac
@@ -1,8 +1,26 @@
---- configure.ac.orig	2008-12-26 12:01:10.000000000 -0600
-+++ configure.ac	2008-12-26 12:05:35.000000000 -0600
-@@ -23,28 +23,14 @@
+--- configure.ac.orig	2009-02-27 22:27:39.000000000 -0600
++++ configure.ac	2009-02-27 22:30:26.000000000 -0600
+@@ -21,17 +21,9 @@
+ 
+ if test m4_substr(peer_id_prefix,6,1) = "0"; then
+   supported_build=yes
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
+-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
+-  fi
+   AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+ else
+   supported_build=no
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O0"
+-    CXXFLAGS="$CXXFLAGS -g -O0"
+-  fi
+   if test m4_substr(peer_id_prefix,6,1) = "X"; then
+     AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+   else
+@@ -40,28 +32,14 @@
  fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$TR_UNSTABLE" = "xyes")
+ AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
  
 -OPENSSL_MINIMUM=0.9.4
  CURL_MINIMUM=7.16.3
@@ -10,7 +28,7 @@
 -GLIB_MINIMUM=2.6.0
 -GTK_MINIMUM=2.6.0
 -WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.4
+-LIBNOTIFY_MINIMUM=0.4.3
 -DBUS_GLIB_MINIMUM=0.70
 -AC_SUBST(OPENSSL_MINIMUM)
  AC_SUBST(CURL_MINIMUM)
@@ -23,15 +41,14 @@
  
  AC_PROG_CC
  AC_PROG_CXX
+ AC_C_INLINE
  if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops"
-+    CFLAGS="-Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement"
-+    CXXFLAGS="-Wall -Wformat-security -W"
+-  CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
++  CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
  fi
  
  AC_HEADER_STDC
-@@ -63,7 +49,7 @@
+@@ -80,7 +58,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
@@ -40,7 +57,7 @@
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  AC_PATH_ZLIB
  
-@@ -96,214 +82,9 @@
+@@ -112,189 +90,9 @@
  AC_SUBST(LIBEVENT_CPPFLAGS)
  
  
@@ -56,7 +73,7 @@
 -                  [have_gtk=yes],
 -                  [have_gtk=no])
 -AC_ARG_ENABLE([gtk],
--              AC_HELP_STRING([--enable-gtk],[build gtk client]),
+-              AS_HELP_STRING([--enable-gtk],[build gtk client]),
 -              [want_gtk=${enableval}],
 -              [want_gtk=${have_gtk}])
 -build_gtk=no
@@ -121,15 +138,26 @@
 -    fi
 -fi
 -
--AC_CHECK_HEADERS([libintl.h])
--IT_PROG_INTLTOOL([0.23],[no-xml])
--GETTEXT_PACKAGE=transmission
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--AM_GLIB_GNU_GETTEXT
--transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
--AC_SUBST(transmissionlocaledir)
+-AC_ARG_ENABLE([nls], 
+-              AS_HELP_STRING([--enable-nls],[enable native language support]),,
+-              [enable_nls=yes])
+-
+-if test "x$build_gtk" = "xyes" -a  "x$enable_nls" = "xno" ; then
+-    AC_MSG_ERROR("The gtk client cannot be built without nls support.  Try adding either --enable-nls or --disable-gtk" )
+-fi
 -
+-use_nls=no
+-if test "x$enable_nls" = "xyes" ; then
+-    use_nls=yes
+-    IT_PROG_INTLTOOL([0.23],[no-xml])
+-    AC_CHECK_HEADERS([libintl.h])
+-    GETTEXT_PACKAGE=transmission
+-    AC_SUBST(GETTEXT_PACKAGE)
+-    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-    AM_GLIB_GNU_GETTEXT
+-    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+-    AC_SUBST(transmissionlocaledir)
+-fi
 -
 -dnl ----------------------------------------------------------------------------
 -dnl
@@ -137,9 +165,9 @@
 -
 -build_wx=no
 -AC_ARG_ENABLE([wx],
--              AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
+-              AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
 -              [want_wx=${enableval}],
--              [want_wx=maybe])
+-              [want_wx=no])
 -if test "x$want_wx" != "xno"; then
 -    AM_OPTIONS_WXCONFIG
 -    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
@@ -158,12 +186,11 @@
 -dnl  platform-specific stuff.
 -
 -AC_CANONICAL_HOST
--have_beos="no"
 -have_darwin="no"
 +build_cli="yes"
  have_msw="no"
 -case $host_os in
--
+ 
 -   *cygwin|*mingw32*)
 -     have_msw="yes"
 -     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
@@ -178,32 +205,6 @@
 -     AC_CHECK_TOOL(WINDRES, windres)
 -     ;;
 -
--  *beos*)
--    have_beos="yes"
--    RELEASE=`uname -r`
--    case $RELEASE in
--      6.*|5.0.4) # Zeta or R5 / BONE beta 7
--        ;;
--      5.0*)       # R5 / net_server
--        CPPFLAGS="$CPPFLAGS -DBEOS_NETSERVER"
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported BeOS version")
--        ;;
--    esac
--    GCCVER=`$CC -dumpversion`
--    case $GCCVER in
--      2.95.3*|3*|4*)
--        ;;
--      2.9*)
--        BEOS_OLDCC=yes
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported gcc version")
--        ;;
--    esac
--    ;;
--
 -  *darwin*)
 -    have_darwin="yes"
 -    # Make sure the Universal SDK is installed
@@ -222,46 +223,36 @@
 -
 -esac
 -
--AC_ARG_ENABLE([beos],
--              [AC_HELP_STRING([--enable-beos],[build OS X client])],
--              [build_beos=${enableval}],
--              [build_beos=${have_beos}])
--AM_CONDITIONAL([BUILD_BEOS],[test "x$build_beos" = "xyes"])
--
 -AC_ARG_ENABLE([cli],
--              [AC_HELP_STRING([--enable-cli],[build command-line client])],
+-              [AS_HELP_STRING([--enable-cli],[build command-line client])],
 -              [build_cli=${enableval}],
 -              [build_cli="yes"])
 -AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
 -
 -AC_ARG_ENABLE([mac],
--              [AC_HELP_STRING([--enable-mac],[build OS X client])],
+-              [AS_HELP_STRING([--enable-mac],[build OS X client])],
 -              [build_mac=${enableval}],
 -              [build_mac=${have_darwin}])
 -AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
 -
 -AC_ARG_ENABLE([daemon],
--              [AC_HELP_STRING([--enable-daemon],[build daemon])],
+-              [AS_HELP_STRING([--enable-daemon],[build daemon])],
 -              [build_daemon=${enableval}],
 -              [build_daemon="yes"])
 -AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 -
- 
--if test "x$have_beos" = "xyes"; then
--    AC_DEFINE([HAVE_BEOS], 1)
--fi
+-
 -if test "x$have_darwin" = "xyes"; then
 -    AC_DEFINE([HAVE_DARWIN], 1)
 -fi
  if test "x$have_msw" = "xyes"; then
      AC_DEFINE([HAVE_MSW], 1)
  fi
-@@ -314,21 +95,11 @@
+@@ -305,20 +103,11 @@
  dnl  Generate the output
  
  AC_CONFIG_FILES([Makefile
 -                 transmission.spec
--                 beos/Makefile
                   cli/Makefile
 -                 daemon/Makefile
 -                 doc/Makefile
@@ -279,12 +270,11 @@
  
  ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
  AC_OUTPUT
-@@ -340,13 +111,5 @@
+@@ -330,12 +119,5 @@
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
          Build Command-Line client:  ${build_cli}
 -        Build Daemon:               ${build_daemon}
--        Build BeOS client:          ${build_beos}
 -        Build GTK+ client:          ${build_gtk}
 -          ... gio support:          ${use_gio}
 -          ... dbus-glib support:    ${use_dbus_glib}
@@ -293,14 +283,11 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-12-26 12:01:15.000000000 -0600
-+++ Makefile.am	2008-12-26 12:06:10.000000000 -0600
-@@ -1,108 +1,6 @@
+--- Makefile.am.orig	2009-02-27 22:27:44.000000000 -0600
++++ Makefile.am	2009-02-27 22:31:09.000000000 -0600
+@@ -1,104 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
--if BUILD_BEOS
--  BEOS_DIR = beos
--endif
 -if BUILD_CLI
 -  CLI_DIR = cli
 -endif
@@ -350,7 +337,9 @@
 -clutch_cssdir = $(clutchdir)/stylesheets
 -clutch_css_DATA = \
 -  web/stylesheets/iphone.css \
--  web/stylesheets/common.css
+-  web/stylesheets/common.css \
+-  web/stylesheets/ie6.css \
+-  web/stylesheets/ie7.css
 -
 -clutch_jsdir = $(clutchdir)/javascript
 -clutch_js_DATA = \
@@ -378,15 +367,12 @@
 -
 -clutch_graphicsdir = $(clutch_imagesdir)/graphics
 -clutch_graphics_DATA = \
--  web/images/graphics/browser_firefox.gif \
 -  web/images/graphics/logo.png \
 -  web/images/graphics/chrome.png \
 -  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/browser_opera.gif \
 -  web/images/graphics/filter_bar.png \
 -  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png \
--  web/images/graphics/browser_safari.gif
+-  web/images/graphics/transfer_arrows.png
 -
 -clutch_progressdir = $(clutch_imagesdir)/progress
 -clutch_progress_DATA = \
diff --git a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
index c86fa6e773c3..e1b54df34167 100644
--- a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
@@ -1,8 +1,26 @@
---- configure.ac.orig	2008-12-26 12:12:34.000000000 -0600
-+++ configure.ac	2008-12-26 12:15:38.000000000 -0600
-@@ -23,28 +23,14 @@
+--- configure.ac.orig	2009-02-27 22:32:08.000000000 -0600
++++ configure.ac	2009-02-27 22:34:39.000000000 -0600
+@@ -21,17 +21,9 @@
+ 
+ if test m4_substr(peer_id_prefix,6,1) = "0"; then
+   supported_build=yes
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
+-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
+-  fi
+   AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+ else
+   supported_build=no
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O0"
+-    CXXFLAGS="$CXXFLAGS -g -O0"
+-  fi
+   if test m4_substr(peer_id_prefix,6,1) = "X"; then
+     AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+   else
+@@ -40,28 +32,14 @@
  fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$TR_UNSTABLE" = "xyes")
+ AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
  
 -OPENSSL_MINIMUM=0.9.4
  CURL_MINIMUM=7.16.3
@@ -10,7 +28,7 @@
 -GLIB_MINIMUM=2.6.0
 -GTK_MINIMUM=2.6.0
 -WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.4
+-LIBNOTIFY_MINIMUM=0.4.3
 -DBUS_GLIB_MINIMUM=0.70
 -AC_SUBST(OPENSSL_MINIMUM)
  AC_SUBST(CURL_MINIMUM)
@@ -23,15 +41,14 @@
  
  AC_PROG_CC
  AC_PROG_CXX
+ AC_C_INLINE
  if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops"
-+    CFLAGS="-Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement"
-+    CXXFLAGS="-Wall -Wformat-security -W"
+-  CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
++  CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
  fi
  
  AC_HEADER_STDC
-@@ -63,7 +49,7 @@
+@@ -80,7 +58,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
@@ -40,7 +57,7 @@
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  AC_PATH_ZLIB
  
-@@ -96,214 +82,9 @@
+@@ -112,189 +90,9 @@
  AC_SUBST(LIBEVENT_CPPFLAGS)
  
  
@@ -56,7 +73,7 @@
 -                  [have_gtk=yes],
 -                  [have_gtk=no])
 -AC_ARG_ENABLE([gtk],
--              AC_HELP_STRING([--enable-gtk],[build gtk client]),
+-              AS_HELP_STRING([--enable-gtk],[build gtk client]),
 -              [want_gtk=${enableval}],
 -              [want_gtk=${have_gtk}])
 -build_gtk=no
@@ -121,15 +138,26 @@
 -    fi
 -fi
 -
--AC_CHECK_HEADERS([libintl.h])
--IT_PROG_INTLTOOL([0.23],[no-xml])
--GETTEXT_PACKAGE=transmission
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--AM_GLIB_GNU_GETTEXT
--transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
--AC_SUBST(transmissionlocaledir)
+-AC_ARG_ENABLE([nls], 
+-              AS_HELP_STRING([--enable-nls],[enable native language support]),,
+-              [enable_nls=yes])
+-
+-if test "x$build_gtk" = "xyes" -a  "x$enable_nls" = "xno" ; then
+-    AC_MSG_ERROR("The gtk client cannot be built without nls support.  Try adding either --enable-nls or --disable-gtk" )
+-fi
 -
+-use_nls=no
+-if test "x$enable_nls" = "xyes" ; then
+-    use_nls=yes
+-    IT_PROG_INTLTOOL([0.23],[no-xml])
+-    AC_CHECK_HEADERS([libintl.h])
+-    GETTEXT_PACKAGE=transmission
+-    AC_SUBST(GETTEXT_PACKAGE)
+-    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-    AM_GLIB_GNU_GETTEXT
+-    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+-    AC_SUBST(transmissionlocaledir)
+-fi
 -
 -dnl ----------------------------------------------------------------------------
 -dnl
@@ -137,9 +165,9 @@
 -
 -build_wx=no
 -AC_ARG_ENABLE([wx],
--              AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
+-              AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
 -              [want_wx=${enableval}],
--              [want_wx=maybe])
+-              [want_wx=no])
 -if test "x$want_wx" != "xno"; then
 -    AM_OPTIONS_WXCONFIG
 -    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
@@ -158,12 +186,11 @@
 -dnl  platform-specific stuff.
 -
 -AC_CANONICAL_HOST
--have_beos="no"
 -have_darwin="no"
 +build_daemon="yes"
  have_msw="no"
 -case $host_os in
--
+ 
 -   *cygwin|*mingw32*)
 -     have_msw="yes"
 -     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
@@ -178,32 +205,6 @@
 -     AC_CHECK_TOOL(WINDRES, windres)
 -     ;;
 -
--  *beos*)
--    have_beos="yes"
--    RELEASE=`uname -r`
--    case $RELEASE in
--      6.*|5.0.4) # Zeta or R5 / BONE beta 7
--        ;;
--      5.0*)       # R5 / net_server
--        CPPFLAGS="$CPPFLAGS -DBEOS_NETSERVER"
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported BeOS version")
--        ;;
--    esac
--    GCCVER=`$CC -dumpversion`
--    case $GCCVER in
--      2.95.3*|3*|4*)
--        ;;
--      2.9*)
--        BEOS_OLDCC=yes
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported gcc version")
--        ;;
--    esac
--    ;;
--
 -  *darwin*)
 -    have_darwin="yes"
 -    # Make sure the Universal SDK is installed
@@ -222,46 +223,36 @@
 -
 -esac
 -
--AC_ARG_ENABLE([beos],
--              [AC_HELP_STRING([--enable-beos],[build OS X client])],
--              [build_beos=${enableval}],
--              [build_beos=${have_beos}])
--AM_CONDITIONAL([BUILD_BEOS],[test "x$build_beos" = "xyes"])
--
 -AC_ARG_ENABLE([cli],
--              [AC_HELP_STRING([--enable-cli],[build command-line client])],
+-              [AS_HELP_STRING([--enable-cli],[build command-line client])],
 -              [build_cli=${enableval}],
 -              [build_cli="yes"])
 -AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
 -
 -AC_ARG_ENABLE([mac],
--              [AC_HELP_STRING([--enable-mac],[build OS X client])],
+-              [AS_HELP_STRING([--enable-mac],[build OS X client])],
 -              [build_mac=${enableval}],
 -              [build_mac=${have_darwin}])
 -AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
 -
 -AC_ARG_ENABLE([daemon],
--              [AC_HELP_STRING([--enable-daemon],[build daemon])],
+-              [AS_HELP_STRING([--enable-daemon],[build daemon])],
 -              [build_daemon=${enableval}],
 -              [build_daemon="yes"])
 -AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 -
- 
--if test "x$have_beos" = "xyes"; then
--    AC_DEFINE([HAVE_BEOS], 1)
--fi
+-
 -if test "x$have_darwin" = "xyes"; then
 -    AC_DEFINE([HAVE_DARWIN], 1)
 -fi
  if test "x$have_msw" = "xyes"; then
      AC_DEFINE([HAVE_MSW], 1)
  fi
-@@ -314,21 +95,11 @@
+@@ -305,20 +103,11 @@
  dnl  Generate the output
  
  AC_CONFIG_FILES([Makefile
 -                 transmission.spec
--                 beos/Makefile
 -                 cli/Makefile
                   daemon/Makefile
 -                 doc/Makefile
@@ -279,13 +270,12 @@
  
  ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
  AC_OUTPUT
-@@ -339,14 +110,6 @@
+@@ -329,13 +118,6 @@
  
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
 -        Build Command-Line client:  ${build_cli}
          Build Daemon:               ${build_daemon}
--        Build BeOS client:          ${build_beos}
 -        Build GTK+ client:          ${build_gtk}
 -          ... gio support:          ${use_gio}
 -          ... dbus-glib support:    ${use_dbus_glib}
@@ -294,14 +284,11 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-12-26 12:12:37.000000000 -0600
-+++ Makefile.am	2008-12-26 12:16:13.000000000 -0600
-@@ -1,108 +1,6 @@
+--- Makefile.am.orig	2009-02-27 22:32:11.000000000 -0600
++++ Makefile.am	2009-02-27 22:35:04.000000000 -0600
+@@ -1,104 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
--if BUILD_BEOS
--  BEOS_DIR = beos
--endif
 -if BUILD_CLI
 -  CLI_DIR = cli
 -endif
@@ -351,7 +338,9 @@
 -clutch_cssdir = $(clutchdir)/stylesheets
 -clutch_css_DATA = \
 -  web/stylesheets/iphone.css \
--  web/stylesheets/common.css
+-  web/stylesheets/common.css \
+-  web/stylesheets/ie6.css \
+-  web/stylesheets/ie7.css
 -
 -clutch_jsdir = $(clutchdir)/javascript
 -clutch_js_DATA = \
@@ -379,15 +368,12 @@
 -
 -clutch_graphicsdir = $(clutch_imagesdir)/graphics
 -clutch_graphics_DATA = \
--  web/images/graphics/browser_firefox.gif \
 -  web/images/graphics/logo.png \
 -  web/images/graphics/chrome.png \
 -  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/browser_opera.gif \
 -  web/images/graphics/filter_bar.png \
 -  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png \
--  web/images/graphics/browser_safari.gif
+-  web/images/graphics/transfer_arrows.png
 -
 -clutch_progressdir = $(clutch_imagesdir)/progress
 -clutch_progress_DATA = \
diff --git a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
index b48bc9b1534b..1fbe149d7ad0 100644
--- a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
@@ -1,8 +1,26 @@
---- configure.ac.orig	2008-12-26 12:17:00.000000000 -0600
-+++ configure.ac	2008-12-26 12:20:53.000000000 -0600
-@@ -23,28 +23,24 @@
+--- configure.ac.orig	2009-02-27 22:36:03.000000000 -0600
++++ configure.ac	2009-02-27 22:40:32.000000000 -0600
+@@ -21,17 +21,9 @@
+ 
+ if test m4_substr(peer_id_prefix,6,1) = "0"; then
+   supported_build=yes
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
+-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
+-  fi
+   AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+ else
+   supported_build=no
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O0"
+-    CXXFLAGS="$CXXFLAGS -g -O0"
+-  fi
+   if test m4_substr(peer_id_prefix,6,1) = "X"; then
+     AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+   else
+@@ -40,20 +32,16 @@
  fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$TR_UNSTABLE" = "xyes")
+ AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
  
 -OPENSSL_MINIMUM=0.9.4
  CURL_MINIMUM=7.16.3
@@ -10,7 +28,7 @@
  GLIB_MINIMUM=2.6.0
  GTK_MINIMUM=2.6.0
 -WX_MINIMUM=2.6.0
- LIBNOTIFY_MINIMUM=0.4.4
+ LIBNOTIFY_MINIMUM=0.4.3
  DBUS_GLIB_MINIMUM=0.70
 -AC_SUBST(OPENSSL_MINIMUM)
  AC_SUBST(CURL_MINIMUM)
@@ -21,17 +39,16 @@
  AC_SUBST(LIBNOTIFY_MINIMUM)
  AC_SUBST(DBUS_GLIB_MINIMUM)
  
- AC_PROG_CC
+@@ -61,7 +49,7 @@
  AC_PROG_CXX
+ AC_C_INLINE
  if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops"
-+    CFLAGS="-Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement"
-+    CXXFLAGS="-Wall -Wformat-security -W"
+-  CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
++  CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
  fi
  
  AC_HEADER_STDC
-@@ -63,7 +59,7 @@
+@@ -80,7 +68,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
@@ -40,12 +57,12 @@
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  AC_PATH_ZLIB
  
-@@ -107,20 +103,14 @@
+@@ -123,20 +111,14 @@
                     gthread-2.0 >= $GLIB_MINIMUM],
                    [have_gtk=yes],
                    [have_gtk=no])
 -AC_ARG_ENABLE([gtk],
--              AC_HELP_STRING([--enable-gtk],[build gtk client]),
+-              AS_HELP_STRING([--enable-gtk],[build gtk client]),
 -              [want_gtk=${enableval}],
 -              [want_gtk=${have_gtk}])
  build_gtk=no
@@ -65,19 +82,40 @@
  fi
  AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
  AC_SUBST(GTK_LIBS)
-@@ -183,127 +173,8 @@
- AC_SUBST(transmissionlocaledir)
- 
+@@ -189,112 +171,18 @@
+     fi
+ fi
  
+-AC_ARG_ENABLE([nls], 
+-              AS_HELP_STRING([--enable-nls],[enable native language support]),,
+-              [enable_nls=yes])
+-
+-if test "x$build_gtk" = "xyes" -a  "x$enable_nls" = "xno" ; then
+-    AC_MSG_ERROR("The gtk client cannot be built without nls support.  Try adding either --enable-nls or --disable-gtk" )
+-fi
+-
+-use_nls=no
+-if test "x$enable_nls" = "xyes" ; then
+-    use_nls=yes
+-    IT_PROG_INTLTOOL([0.23],[no-xml])
+-    AC_CHECK_HEADERS([libintl.h])
+-    GETTEXT_PACKAGE=transmission
+-    AC_SUBST(GETTEXT_PACKAGE)
+-    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-    AM_GLIB_GNU_GETTEXT
+-    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+-    AC_SUBST(transmissionlocaledir)
+-fi
+-
 -dnl ----------------------------------------------------------------------------
 -dnl
 -dnl  wxWidgets detection for the wxWidgets client
 -
 -build_wx=no
 -AC_ARG_ENABLE([wx],
--              AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
+-              AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
 -              [want_wx=${enableval}],
--              [want_wx=maybe])
+-              [want_wx=no])
 -if test "x$want_wx" != "xno"; then
 -    AM_OPTIONS_WXCONFIG
 -    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
@@ -89,18 +127,25 @@
 -fi
 -AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
 -
--
--
++IT_PROG_INTLTOOL([0.23],[no-xml])
++AC_CHECK_HEADERS([libintl.h])
++GETTEXT_PACKAGE=transmission
++AC_SUBST(GETTEXT_PACKAGE)
++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
++AM_GLIB_GNU_GETTEXT
++transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
++AC_SUBST(transmissionlocaledir)
+ 
+ 
 -dnl ----------------------------------------------------------------------------
 -dnl
 -dnl  platform-specific stuff.
 -
 -AC_CANONICAL_HOST
--have_beos="no"
 -have_darwin="no"
  have_msw="no"
 -case $host_os in
--
+ 
 -   *cygwin|*mingw32*)
 -     have_msw="yes"
 -     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
@@ -115,32 +160,6 @@
 -     AC_CHECK_TOOL(WINDRES, windres)
 -     ;;
 -
--  *beos*)
--    have_beos="yes"
--    RELEASE=`uname -r`
--    case $RELEASE in
--      6.*|5.0.4) # Zeta or R5 / BONE beta 7
--        ;;
--      5.0*)       # R5 / net_server
--        CPPFLAGS="$CPPFLAGS -DBEOS_NETSERVER"
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported BeOS version")
--        ;;
--    esac
--    GCCVER=`$CC -dumpversion`
--    case $GCCVER in
--      2.95.3*|3*|4*)
--        ;;
--      2.9*)
--        BEOS_OLDCC=yes
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported gcc version")
--        ;;
--    esac
--    ;;
--
 -  *darwin*)
 -    have_darwin="yes"
 -    # Make sure the Universal SDK is installed
@@ -158,47 +177,37 @@
 -    ;;
 -
 -esac
- 
--AC_ARG_ENABLE([beos],
--              [AC_HELP_STRING([--enable-beos],[build OS X client])],
--              [build_beos=${enableval}],
--              [build_beos=${have_beos}])
--AM_CONDITIONAL([BUILD_BEOS],[test "x$build_beos" = "xyes"])
 -
 -AC_ARG_ENABLE([cli],
--              [AC_HELP_STRING([--enable-cli],[build command-line client])],
+-              [AS_HELP_STRING([--enable-cli],[build command-line client])],
 -              [build_cli=${enableval}],
 -              [build_cli="yes"])
 -AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
 -
 -AC_ARG_ENABLE([mac],
--              [AC_HELP_STRING([--enable-mac],[build OS X client])],
+-              [AS_HELP_STRING([--enable-mac],[build OS X client])],
 -              [build_mac=${enableval}],
 -              [build_mac=${have_darwin}])
 -AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
 -
 -AC_ARG_ENABLE([daemon],
--              [AC_HELP_STRING([--enable-daemon],[build daemon])],
+-              [AS_HELP_STRING([--enable-daemon],[build daemon])],
 -              [build_daemon=${enableval}],
 -              [build_daemon="yes"])
 -AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 -
 -
--if test "x$have_beos" = "xyes"; then
--    AC_DEFINE([HAVE_BEOS], 1)
--fi
 -if test "x$have_darwin" = "xyes"; then
 -    AC_DEFINE([HAVE_DARWIN], 1)
 -fi
  if test "x$have_msw" = "xyes"; then
      AC_DEFINE([HAVE_MSW], 1)
  fi
-@@ -314,18 +185,10 @@
+@@ -305,17 +193,10 @@
  dnl  Generate the output
  
  AC_CONFIG_FILES([Makefile
 -                 transmission.spec
--                 beos/Makefile
 -                 cli/Makefile
 -                 daemon/Makefile
 -                 doc/Makefile
@@ -212,13 +221,12 @@
                   gtk/Makefile
                   gtk/icons/Makefile
                   po/Makefile.in])
-@@ -339,14 +202,9 @@
+@@ -329,13 +210,9 @@
  
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
 -        Build Command-Line client:  ${build_cli}
 -        Build Daemon:               ${build_daemon}
--        Build BeOS client:          ${build_beos}
          Build GTK+ client:          ${build_gtk}
            ... gio support:          ${use_gio}
            ... dbus-glib support:    ${use_dbus_glib}
@@ -227,14 +235,11 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-12-26 12:17:02.000000000 -0600
-+++ Makefile.am	2008-12-26 12:21:26.000000000 -0600
-@@ -1,108 +1,6 @@
+--- Makefile.am.orig	2009-02-27 22:36:05.000000000 -0600
++++ Makefile.am	2009-02-27 22:41:04.000000000 -0600
+@@ -1,104 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
--if BUILD_BEOS
--  BEOS_DIR = beos
--endif
 -if BUILD_CLI
 -  CLI_DIR = cli
 -endif
@@ -284,7 +289,9 @@
 -clutch_cssdir = $(clutchdir)/stylesheets
 -clutch_css_DATA = \
 -  web/stylesheets/iphone.css \
--  web/stylesheets/common.css
+-  web/stylesheets/common.css \
+-  web/stylesheets/ie6.css \
+-  web/stylesheets/ie7.css
 -
 -clutch_jsdir = $(clutchdir)/javascript
 -clutch_js_DATA = \
@@ -312,15 +319,12 @@
 -
 -clutch_graphicsdir = $(clutch_imagesdir)/graphics
 -clutch_graphics_DATA = \
--  web/images/graphics/browser_firefox.gif \
 -  web/images/graphics/logo.png \
 -  web/images/graphics/chrome.png \
 -  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/browser_opera.gif \
 -  web/images/graphics/filter_bar.png \
 -  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png \
--  web/images/graphics/browser_safari.gif
+-  web/images/graphics/transfer_arrows.png
 -
 -clutch_progressdir = $(clutch_imagesdir)/progress
 -clutch_progress_DATA = \
diff --git a/net-p2p/transmission-cli/files/transmission-web-configure.ac b/net-p2p/transmission-cli/files/transmission-web-configure.ac
index 8c40075e151a..061806b6e4d1 100644
--- a/net-p2p/transmission-cli/files/transmission-web-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-web-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2008-12-26 12:22:16.000000000 -0600
-+++ configure.ac	2008-12-26 12:24:42.000000000 -0600
-@@ -13,9 +13,7 @@
+--- configure.ac.orig	2009-02-27 22:42:08.000000000 -0600
++++ configure.ac	2009-02-27 22:44:26.000000000 -0600
+@@ -15,23 +15,13 @@
  AC_CONFIG_MACRO_DIR([m4])
  
  dnl AM_CONFIG_HEADER(config.h)
@@ -8,11 +8,25 @@
  AM_INIT_AUTOMAKE([1.9 tar-ustar])
 -AC_PROG_LIBTOOL
  
- if test m4_substr(peer_id_prefix,6,1) = "Z"; then
-   AC_DEFINE(TR_UNSTABLE, 1, [Define to 1 if this is an unstable version of Transmission])
-@@ -23,330 +21,12 @@
+ if test m4_substr(peer_id_prefix,6,1) = "0"; then
+   supported_build=yes
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O3 -funroll-loops "
+-    CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
+-  fi
+   AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+ else
+   supported_build=no
+-  if test "x$GCC" = "xyes" ; then
+-    CFLAGS="$CFLAGS -g -O0"
+-    CXXFLAGS="$CXXFLAGS -g -O0"
+-  fi
+   if test m4_substr(peer_id_prefix,6,1) = "X"; then
+     AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+   else
+@@ -40,302 +30,13 @@
  fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$TR_UNSTABLE" = "xyes")
+ AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
  
 -OPENSSL_MINIMUM=0.9.4
 -CURL_MINIMUM=7.16.3
@@ -20,7 +34,7 @@
 -GLIB_MINIMUM=2.6.0
 -GTK_MINIMUM=2.6.0
 -WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.4
+-LIBNOTIFY_MINIMUM=0.4.3
 -DBUS_GLIB_MINIMUM=0.70
 -AC_SUBST(OPENSSL_MINIMUM)
 -AC_SUBST(CURL_MINIMUM)
@@ -33,9 +47,9 @@
 -
 -AC_PROG_CC
 -AC_PROG_CXX
+-AC_C_INLINE
 -if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops"
+-  CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
 -fi
 -
 -AC_HEADER_STDC
@@ -51,7 +65,7 @@
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
 -ACX_PTHREAD
--
+ 
 -AC_SEARCH_LIBS([socket], [socket net])
 -AC_SEARCH_LIBS([gethostbyname], [nsl bind])
 -PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
@@ -76,7 +90,6 @@
 -    )
 -])
 -
--
 -dnl ----------------------------------------------------------------------------
 -dnl
 -dnl  libevent fun
@@ -99,7 +112,7 @@
 -                  [have_gtk=yes],
 -                  [have_gtk=no])
 -AC_ARG_ENABLE([gtk],
--              AC_HELP_STRING([--enable-gtk],[build gtk client]),
+-              AS_HELP_STRING([--enable-gtk],[build gtk client]),
 -              [want_gtk=${enableval}],
 -              [want_gtk=${have_gtk}])
 -build_gtk=no
@@ -164,15 +177,26 @@
 -    fi
 -fi
 -
--AC_CHECK_HEADERS([libintl.h])
--IT_PROG_INTLTOOL([0.23],[no-xml])
--GETTEXT_PACKAGE=transmission
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--AM_GLIB_GNU_GETTEXT
--transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
--AC_SUBST(transmissionlocaledir)
+-AC_ARG_ENABLE([nls], 
+-              AS_HELP_STRING([--enable-nls],[enable native language support]),,
+-              [enable_nls=yes])
 -
+-if test "x$build_gtk" = "xyes" -a  "x$enable_nls" = "xno" ; then
+-    AC_MSG_ERROR("The gtk client cannot be built without nls support.  Try adding either --enable-nls or --disable-gtk" )
+-fi
+-
+-use_nls=no
+-if test "x$enable_nls" = "xyes" ; then
+-    use_nls=yes
+-    IT_PROG_INTLTOOL([0.23],[no-xml])
+-    AC_CHECK_HEADERS([libintl.h])
+-    GETTEXT_PACKAGE=transmission
+-    AC_SUBST(GETTEXT_PACKAGE)
+-    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-    AM_GLIB_GNU_GETTEXT
+-    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+-    AC_SUBST(transmissionlocaledir)
+-fi
 -
 -dnl ----------------------------------------------------------------------------
 -dnl
@@ -180,9 +204,9 @@
 -
 -build_wx=no
 -AC_ARG_ENABLE([wx],
--              AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
+-              AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
 -              [want_wx=${enableval}],
--              [want_wx=maybe])
+-              [want_wx=no])
 -if test "x$want_wx" != "xno"; then
 -    AM_OPTIONS_WXCONFIG
 -    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
@@ -201,7 +225,6 @@
 -dnl  platform-specific stuff.
 -
 -AC_CANONICAL_HOST
--have_beos="no"
 -have_darwin="no"
 -have_msw="no"
 -case $host_os in
@@ -220,32 +243,6 @@
 -     AC_CHECK_TOOL(WINDRES, windres)
 -     ;;
 -
--  *beos*)
--    have_beos="yes"
--    RELEASE=`uname -r`
--    case $RELEASE in
--      6.*|5.0.4) # Zeta or R5 / BONE beta 7
--        ;;
--      5.0*)       # R5 / net_server
--        CPPFLAGS="$CPPFLAGS -DBEOS_NETSERVER"
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported BeOS version")
--        ;;
--    esac
--    GCCVER=`$CC -dumpversion`
--    case $GCCVER in
--      2.95.3*|3*|4*)
--        ;;
--      2.9*)
--        BEOS_OLDCC=yes
--        ;;
--      *)
--        AC_MSG_ERROR("Unsupported gcc version")
--        ;;
--    esac
--    ;;
--
 -  *darwin*)
 -    have_darwin="yes"
 -    # Make sure the Universal SDK is installed
@@ -264,34 +261,25 @@
 -
 -esac
 -
--AC_ARG_ENABLE([beos],
--              [AC_HELP_STRING([--enable-beos],[build OS X client])],
--              [build_beos=${enableval}],
--              [build_beos=${have_beos}])
--AM_CONDITIONAL([BUILD_BEOS],[test "x$build_beos" = "xyes"])
--
 -AC_ARG_ENABLE([cli],
--              [AC_HELP_STRING([--enable-cli],[build command-line client])],
+-              [AS_HELP_STRING([--enable-cli],[build command-line client])],
 -              [build_cli=${enableval}],
 -              [build_cli="yes"])
 -AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
 -
 -AC_ARG_ENABLE([mac],
--              [AC_HELP_STRING([--enable-mac],[build OS X client])],
+-              [AS_HELP_STRING([--enable-mac],[build OS X client])],
 -              [build_mac=${enableval}],
 -              [build_mac=${have_darwin}])
 -AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
 -
 -AC_ARG_ENABLE([daemon],
--              [AC_HELP_STRING([--enable-daemon],[build daemon])],
+-              [AS_HELP_STRING([--enable-daemon],[build daemon])],
 -              [build_daemon=${enableval}],
 -              [build_daemon="yes"])
 -AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 -
 -
--if test "x$have_beos" = "xyes"; then
--    AC_DEFINE([HAVE_BEOS], 1)
--fi
 -if test "x$have_darwin" = "xyes"; then
 -    AC_DEFINE([HAVE_DARWIN], 1)
 -fi
@@ -306,7 +294,6 @@
  
 -AC_CONFIG_FILES([Makefile
 -                 transmission.spec
--                 beos/Makefile
 -                 cli/Makefile
 -                 daemon/Makefile
 -                 doc/Makefile
@@ -333,7 +320,6 @@
 -        Compiler:                   ${CXX}
 -        Build Command-Line client:  ${build_cli}
 -        Build Daemon:               ${build_daemon}
--        Build BeOS client:          ${build_beos}
 -        Build GTK+ client:          ${build_gtk}
 -          ... gio support:          ${use_gio}
 -          ... dbus-glib support:    ${use_dbus_glib}
@@ -342,14 +328,11 @@
 -        Build wxWidgets client:     ${build_wx}
 -
 -"
---- Makefile.am.orig	2008-12-26 12:22:19.000000000 -0600
-+++ Makefile.am	2008-12-26 12:25:23.000000000 -0600
-@@ -1,49 +1,5 @@
+--- Makefile.am.orig	2009-02-27 22:42:11.000000000 -0600
++++ Makefile.am	2009-02-27 22:44:55.000000000 -0600
+@@ -1,46 +1,5 @@
  ACLOCAL_AMFLAGS = -I m4
  
--if BUILD_BEOS
--  BEOS_DIR = beos
--endif
 -if BUILD_CLI
 -  CLI_DIR = cli
 -endif
@@ -394,7 +377,7 @@
  clutchdir = $(datadir)/transmission/web
  clutch_DATA = \
    web/index.html \
-@@ -101,8 +57,3 @@
+@@ -97,8 +56,3 @@
    web/images/buttons/info_general.png \
    web/images/buttons/torrent_buttons.png \
    web/images/buttons/info_activity.png