-Update to 1.72.

-Add rc script in transmission-daemon. [1]

Requested by:	many [1]
Submitted by:	a few (all of those are incomplete) [1]

17 files changed, 190 insertions, 1921 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 3e2bd61cd629..f7564dd4fd33 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	1.61
+PORTVERSION=	1.72
 PORTREVISION?=	0
 CATEGORIES?=	net-p2p
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
@@ -23,23 +23,28 @@ LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 GEN_LIB_DEPENDS=curl.5:${PORTSDIR}/ftp/curl
 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
 
+USE_GMAKE=	yes
 USE_GNOME?=	pkgconfig
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} \
-		--with-zlib=/usr
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=--with-ssl=${OPENSSLBASE} \
+		--with-zlib=/usr \
+		${EXTRA_CONF_ARGS}
+EXTRA_CONF_ARGS?=--enable-cli \
+		 --disable-daemon \
+		 --disable-gtk \
+		 --disable-libnotify \
+		 --disable-mac \
+		 --disable-nls
 
 MAN1?=		transmissioncli.1
+EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262:env aclocal:19:env automake:19:env libtool:15:env
-GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS COPYING NEWS README
-
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXTRA_PATCHES=	${PATCHDIR}/${PORTNAME}${PKGNAMESUFFIX}-configure.ac
 
 general-patch:
 	@${REINPLACE_CMD} -e 's|SUBDIRS = . sample.*|SUBDIRS = .|g' \
@@ -50,19 +55,16 @@ general-patch:
 	@${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \
 		${WRKSRC}/libtransmission/utils.h
 .endif
-
-post-patch: general-patch
-
-pre-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none)
-.if ${SLAVEPORT}=="gtk2"
-	@(cd ${WRKSRC} && intltoolize --copy --force --automake)
-.endif
 	@${REINPLACE_CMD} -e \
-		's|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g' \
+		's|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g ; \
+		s|libevent_source=system|libevent_source=bundled|g' \
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lrt||g' \
 		${WRKSRC}/third-party/libevent/configure
+	@${REINPLACE_CMD} -e 's|doc \\| \\|g' \
+		${WRKSRC}/Makefile.in
+
+post-patch: general-patch
 
 general-install:
 .ifndef (NOPORTDOCS)
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index ddeeaa27ee3b..07b2f883232f 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-MD5 (transmission-1.61.tar.bz2) = 0b0428f4a6237a64dc8b7d378ace3f06
-SHA256 (transmission-1.61.tar.bz2) = 3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
-SIZE (transmission-1.61.tar.bz2) = 4741686
+MD5 (transmission-1.72.tar.bz2) = 4ebbb9d4c27a019f5aced926818be4fa
+SHA256 (transmission-1.72.tar.bz2) = 71fa9f8a8c946111a991b7bc7ccc5182578dfc77a301b7e801791cc4b3c15353
+SIZE (transmission-1.72.tar.bz2) = 4810233
diff --git a/net-p2p/transmission-cli/files/disable-web b/net-p2p/transmission-cli/files/disable-web
new file mode 100644
index 000000000000..aaa3e1a2de19
--- /dev/null
+++ b/net-p2p/transmission-cli/files/disable-web
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	2009-06-17 00:54:15.000000000 -0500
++++ Makefile.in	2009-06-17 00:54:42.000000000 -0500
+@@ -878,10 +878,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-clutchDATA install-clutch_buttonsDATA \
+-	install-clutch_cssDATA install-clutch_graphicsDATA \
+-	install-clutch_imagesDATA install-clutch_jqueryDATA \
+-	install-clutch_jsDATA install-clutch_progressDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/net-p2p/transmission-cli/files/patch-libtransmission_platform.c b/net-p2p/transmission-cli/files/patch-libtransmission_platform.c
new file mode 100644
index 000000000000..1129f3add107
--- /dev/null
+++ b/net-p2p/transmission-cli/files/patch-libtransmission_platform.c
@@ -0,0 +1,33 @@
+--- libtransmission/platform.c.orig	2009-06-19 10:53:49.000000000 -0500
++++ libtransmission/platform.c	2009-06-19 10:55:52.000000000 -0500
+@@ -232,22 +232,17 @@
+ 
+     if( !home )
+     {
+-        home = tr_strdup( getenv( "HOME" ) );
+-
+-        if( !home )
+-        {
+ #ifdef WIN32
+-            char appdata[MAX_PATH]; /* SHGetFolderPath() requires MAX_PATH */
+-            *appdata = '\0';
+-            SHGetFolderPath( NULL, CSIDL_PERSONAL, NULL, 0, appdata );
+-            home = tr_strdup( appdata );
++        char appdata[MAX_PATH]; /* SHGetFolderPath() requires MAX_PATH */
++        *appdata = '\0';
++        SHGetFolderPath( NULL, CSIDL_PERSONAL, NULL, 0, appdata );
++        home = tr_strdup( appdata );
+ #else
+-            struct passwd * pw = getpwuid( getuid( ) );
+-            if( pw )
+-                home = tr_strdup( pw->pw_dir );
+-            endpwent( );
++        struct passwd * pw = getpwuid( getuid( ) );
++        if( pw )
++            home = tr_strdup( pw->pw_dir );
++        endpwent( );
+ #endif
+-        }
+ 
+         if( !home )
+             home = tr_strdup( "" );
diff --git a/net-p2p/transmission-cli/files/patch-libtransmission_rpc-server.c b/net-p2p/transmission-cli/files/patch-libtransmission_rpc-server.c
deleted file mode 100644
index 95916e645076..000000000000
--- a/net-p2p/transmission-cli/files/patch-libtransmission_rpc-server.c
+++ /dev/null
@@ -1,299 +0,0 @@
---- libtransmission/rpc-server.c.orig
-+++ libtransmission/rpc-server.c
-@@ -33,4 +33,5 @@
- #include "list.h"
- #include "platform.h"
-+#include "ptrarray.h"
- #include "rpcimpl.h"
- #include "rpc-server.h"
-@@ -84,4 +85,34 @@
- 
- 
-+/***
-+****
-+***/
-+
-+static char*
-+get_current_session_id( struct tr_rpc_server * server )
-+{
-+    const time_t now = time( NULL );
-+
-+    if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) )
-+    {
-+        int i;
-+        const int n = 48;
-+        const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-+        const size_t pool_size = strlen( pool );
-+        char * buf = tr_new( char, n+1 );
-+
-+        for( i=0; i<n; ++i )
-+            buf[i] = pool[ tr_cryptoRandInt( pool_size ) ];
-+        buf[n] = '\0';
-+
-+        tr_free( server->sessionId );
-+        server->sessionId = buf;
-+        server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */
-+    }
-+
-+    return server->sessionId;
-+}
-+
-+
- /**
- ***
-@@ -105,8 +136,6 @@
- 
- static const char*
--tr_memmem( const char * s1,
--           size_t       l1,
--           const char * s2,
--           size_t       l2 )
-+tr_memmem( const char * s1, size_t l1, /* haystack */
-+           const char * s2, size_t l2 ) /* needle */
- {
-     if( !l2 ) return s1;
-@@ -122,4 +151,65 @@
- }
- 
-+struct tr_mimepart
-+{
-+    char * headers;
-+    int headers_len;
-+    char * body;
-+    int body_len;
-+};
-+
-+static void
-+tr_mimepart_free( struct tr_mimepart * p )
-+{
-+    tr_free( p->body );
-+    tr_free( p->headers );
-+    tr_free( p );
-+}
-+
-+static void
-+extract_parts_from_multipart( const struct evkeyvalq * headers,
-+                              const struct evbuffer * body,
-+                              tr_ptrArray * setme_parts )
-+{
-+    const char * content_type = evhttp_find_header( headers, "Content-Type" );
-+    const char * in = (const char*) EVBUFFER_DATA( body );
-+    size_t inlen = EVBUFFER_LENGTH( body );
-+
-+    const char * boundary_key = "boundary=";
-+    const char * boundary_key_begin = strstr( content_type, boundary_key );
-+    const char * boundary_val = boundary_key_begin ? boundary_key_begin + strlen( boundary_key ) : "arglebargle";
-+    char * boundary = tr_strdup_printf( "--%s", boundary_val );
-+    const size_t boundary_len = strlen( boundary );
-+
-+    const char * delim = tr_memmem( in, inlen, boundary, boundary_len );
-+    while( delim )
-+    {
-+        size_t part_len;
-+        const char * part = delim + boundary_len;
-+
-+        inlen -= ( part - in );
-+        in = part;
-+
-+        delim = tr_memmem( in, inlen, boundary, boundary_len );
-+        part_len = delim ? (size_t)( delim - part ) : inlen;
-+
-+        if( part_len )
-+        {
-+            const char * rnrn = tr_memmem( part, part_len, "\r\n\r\n", 4 );
-+            if( rnrn )
-+            {
-+                struct tr_mimepart * p = tr_new( struct tr_mimepart, 1 );
-+                p->headers_len = rnrn - part;
-+                p->headers = tr_strndup( part, p->headers_len );
-+                p->body_len = (part+part_len) - (rnrn + 4);
-+                p->body = tr_strndup( rnrn+4, p->body_len );
-+                tr_ptrArrayAppend( setme_parts, p );
-+            }
-+        }
-+    }
-+
-+    tr_free( boundary );
-+}
-+
- static void
- handle_upload( struct evhttp_request * req,
-@@ -132,74 +222,65 @@
-     else
-     {
--        const char * content_type = evhttp_find_header( req->input_headers,
--                                                        "Content-Type" );
-+        int i;
-+        int n;
-+        tr_bool hasSessionId = FALSE;
-+        tr_ptrArray parts = TR_PTR_ARRAY_INIT;
- 
-         const char * query = strchr( req->uri, '?' );
--        const int    paused = query && strstr( query + 1, "paused=true" );
--
--        const char * in = (const char *) EVBUFFER_DATA( req->input_buffer );
--        size_t       inlen = EVBUFFER_LENGTH( req->input_buffer );
--
--        const char * boundary_key = "boundary=";
--        const char * boundary_key_begin = strstr( content_type,
--                                                  boundary_key );
--        const char * boundary_val =
--            boundary_key_begin ? boundary_key_begin +
--            strlen( boundary_key ) : "arglebargle";
--
--        char *       boundary = tr_strdup_printf( "--%s", boundary_val );
--        const size_t boundary_len = strlen( boundary );
--
--        const char * delim = tr_memmem( in, inlen, boundary, boundary_len );
--        while( delim )
--        {
--            size_t       part_len;
--            const char * part = delim + boundary_len;
--            inlen -= ( part - in );
--            in = part;
--            delim = tr_memmem( in, inlen, boundary, boundary_len );
--            part_len = delim ? (size_t)( delim - part ) : inlen;
--
--            if( part_len )
-+        const tr_bool paused = query && strstr( query + 1, "paused=true" );
-+
-+        extract_parts_from_multipart( req->input_headers, req->input_buffer, &parts );
-+        n = tr_ptrArraySize( &parts );
-+
-+        /* first look for the session id */
-+        for( i=0; i<n; ++i ) {
-+            struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
-+            if( tr_memmem( p->headers, p->headers_len, TR_RPC_SESSION_ID_HEADER, strlen( TR_RPC_SESSION_ID_HEADER ) ) )
-+                break;
-+        }
-+        if( i<n ) {
-+            const struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
-+            const char * ours = get_current_session_id( server );
-+            const int ourlen = strlen( ours );
-+            hasSessionId = ourlen<=p->body_len && !memcmp( p->body, ours, ourlen );
-+        }
-+
-+        if( !hasSessionId )
-+        {
-+            send_simple_response( req, 409, NULL );
-+        }
-+        else for( i=0; i<n; ++i )
-+        {
-+            struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
-+            if( strstr( p->headers, "filename=\"" ) )
-             {
--                char * text = tr_strndup( part, part_len );
--                if( strstr( text, "filename=\"" ) )
--                {
--                    const char * body = strstr( text, "\r\n\r\n" );
--                    if( body )
--                    {
--                        char * b64;
--                        size_t  body_len;
--                        tr_benc top, *args;
--                        struct evbuffer * json = tr_getBuffer( );
--
--                        body += 4; /* walk past the \r\n\r\n */
--                        body_len = part_len - ( body - text );
--                        if( body_len >= 2
--                          && !memcmp( &body[body_len - 2], "\r\n", 2 ) )
--                            body_len -= 2;
--
--                        tr_bencInitDict( &top, 2 );
--                        args = tr_bencDictAddDict( &top, "arguments", 2 );
--                        tr_bencDictAddStr( &top, "method", "torrent-add" );
--                        b64 = tr_base64_encode( body, body_len, NULL );
--                        tr_bencDictAddStr( args, "metainfo", b64 );
--                        tr_bencDictAddBool( args, "paused", paused );
--                        tr_bencSaveAsJSON( &top, json );
--                        tr_rpc_request_exec_json( server->session,
--                                                  EVBUFFER_DATA( json ),
--                                                  EVBUFFER_LENGTH( json ),
--                                                  NULL, NULL );
--
--                        tr_releaseBuffer( json );
--                        tr_free( b64 );
--                        tr_bencFree( &top );
--                    }
--                }
--                tr_free( text );
-+                char * b64;
-+                int body_len = p->body_len;
-+                tr_benc top, *args;
-+                const char * body = p->body;
-+                struct evbuffer * json = evbuffer_new( );
-+
-+                if( body_len >= 2 && !memcmp( &body[body_len - 2], "\r\n", 2 ) )
-+                    body_len -= 2;
-+
-+                tr_bencInitDict( &top, 2 );
-+                args = tr_bencDictAddDict( &top, "arguments", 2 );
-+                tr_bencDictAddStr( &top, "method", "torrent-add" );
-+                b64 = tr_base64_encode( body, body_len, NULL );
-+                tr_bencDictAddStr( args, "metainfo", b64 );
-+                tr_bencDictAddBool( args, "paused", paused );
-+                tr_bencSaveAsJSON( &top, json );
-+                tr_rpc_request_exec_json( server->session,
-+                                          EVBUFFER_DATA( json ),
-+                                          EVBUFFER_LENGTH( json ),
-+                                          NULL, NULL );
-+
-+                evbuffer_free( json );
-+                tr_free( b64 );
-+                tr_bencFree( &top );
-             }
-         }
- 
--        tr_free( boundary );
-+        tr_ptrArrayDestruct( &parts, (PtrArrayForeachFunc)tr_mimepart_free );
- 
-         /* use xml here because json responses to file uploads is trouble.
-@@ -474,30 +555,4 @@
- }
- 
--static char*
--get_current_session_id( struct tr_rpc_server * server )
--{
--    const time_t now = time( NULL );
--
--    if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) )
--    {
--        int i;
--        const int n = 48;
--        const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
--        const size_t pool_size = strlen( pool );
--        char * buf = tr_new( char, n+1 );
--
--        for( i=0; i<n; ++i )
--            buf[i] = pool[ tr_cryptoRandInt( pool_size ) ];
--        buf[n] = '\0';
--
--        tr_free( server->sessionId );
--        server->sessionId = buf;
--        server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */
--    }
--
--    return server->sessionId;
--}
--
--
- static tr_bool
- test_session_id( struct tr_rpc_server * server, struct evhttp_request * req )
-@@ -567,4 +622,8 @@
-         {
-             handle_clutch( req, server );
-+        }
-+        else if( !strncmp( req->uri, "/transmission/upload", 20 ) )
-+        {
-+            handle_upload( req, server );
-         }
- #ifdef REQUIRE_SESSION_ID
-@@ -594,8 +653,4 @@
-             handle_rpc( req, server );
-         }
--        else if( !strncmp( req->uri, "/transmission/upload", 20 ) )
--        {
--            handle_upload( req, server );
--        }
-         else
-         {
diff --git a/net-p2p/transmission-cli/files/patch-web_javascript_transmission.js b/net-p2p/transmission-cli/files/patch-web_javascript_transmission.js
deleted file mode 100644
index af537413f2bf..000000000000
--- a/net-p2p/transmission-cli/files/patch-web_javascript_transmission.js
+++ /dev/null
@@ -1,8 +0,0 @@
---- web/javascript/transmission.js.orig
-+++ web/javascript/transmission.js
-@@ -1248,4 +1248,5 @@
-                                 args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true');
-                                 args.type = 'POST';
-+                                args.data = { 'X-Transmission-Session-Id' : tr.remote._token };
-                                 args.dataType = 'xml';
-                                 args.iframe = true;
diff --git a/net-p2p/transmission-cli/files/transmission-cli-configure.ac b/net-p2p/transmission-cli/files/transmission-cli-configure.ac
deleted file mode 100644
index 600628452b63..000000000000
--- a/net-p2p/transmission-cli/files/transmission-cli-configure.ac
+++ /dev/null
@@ -1,405 +0,0 @@
---- configure.ac.orig	2009-05-09 11:13:34.000000000 -0500
-+++ configure.ac	2009-05-09 11:14:10.000000000 -0500
-@@ -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,22 +32,8 @@
- fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
- 
--OPENSSL_MINIMUM=0.9.4
- CURL_MINIMUM=7.16.3
--GIO_MINIMUM=2.15.5
--GLIB_MINIMUM=2.6.0
--GTK_MINIMUM=2.6.0
--WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.3
--DBUS_GLIB_MINIMUM=0.70
--AC_SUBST(OPENSSL_MINIMUM)
- AC_SUBST(CURL_MINIMUM)
--AC_SUBST(GIO_MINIMUM)
--AC_SUBST(GLIB_MINIMUM)
--AC_SUBST(GTK_MINIMUM)
--AC_SUBST(WX_MINIMUM)
--AC_SUBST(LIBNOTIFY_MINIMUM)
--AC_SUBST(DBUS_GLIB_MINIMUM)
- 
- AC_PROG_CC
- AC_PROG_CXX
-@@ -81,12 +59,6 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- 
--AC_MSG_CHECKING([for fallocate])
--AC_TRY_LINK([#include <linux/falloc.h>],
--            [return fallocate(-1,0,0,0);],
--            [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
--             AC_MSG_RESULT([yes])],
--            [AC_MSG_RESULT([no])])
- AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
-@@ -94,7 +66,7 @@
- 
- AC_SEARCH_LIBS([socket], [socket net])
- AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
-+CHECK_SSL()
- PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
- AC_PATH_ZLIB
- 
-@@ -116,21 +88,6 @@
- dnl
- dnl file monitoring for the daemon
- 
--AC_CHECK_HEADER([sys/inotify.h], 
--                [AC_CHECK_FUNC([inotify_init],[have_inotify="yes"],[have_inotify="no"])], 
--                [have_inotify="no"]) 
--AC_ARG_WITH([inotify], 
--            [AS_HELP_STRING([--with-inotify],[Enable inotify support (default=auto)])], 
--            [want_inotify=${enableval}], 
--            [want_inotify=${have_inotify}]) 
--if test "x$want_inotify" = "xyes" ; then 
--    if test "x$have_inotify" = "xyes"; then 
--      AC_DEFINE([WITH_INOTIFY],[1]) 
--    else 
--      AC_MSG_ERROR("inotify not found!") 
--    fi 
--fi 
-- 
- AC_CHECK_HEADER([sys/event.h], 
-                 [AC_CHECK_FUNC([kqueue],[have_kqueue="yes"],[have_kqueue="no"])], 
-                 [have_kqueue="no"]) 
-@@ -146,8 +103,6 @@
-     fi 
- fi 
- 
--AC_CHECK_HEADERS([xfs/xfs.h])
--
- 
- dnl ----------------------------------------------------------------------------
- dnl
-@@ -175,168 +130,8 @@
- AC_SUBST(LIBEVENT_CPPFLAGS)
- 
- 
--dnl ----------------------------------------------------------------------------
--dnl
--dnl  detection for the GTK+ client
--
--PKG_CHECK_MODULES(GTK,
--                  [gtk+-2.0 >= $GTK_MINIMUM
--                   glib-2.0 >= $GLIB_MINIMUM
--                   gmodule-2.0 >= $GLIB_MINIMUM
--                   gthread-2.0 >= $GLIB_MINIMUM],
--                  [have_gtk=yes],
--                  [have_gtk=no])
--AC_ARG_ENABLE([gtk],
--              AS_HELP_STRING([--enable-gtk],[build gtk client]),
--              [want_gtk=${enableval}],
--              [want_gtk=${have_gtk}])
--build_gtk=no
--use_gio=no
--use_libnotify=no
--use_dbus_glib=no
--if test "x$want_gtk" = "xyes" ; then
--    if test "x$have_gtk" = "xyes"; then
--      build_gtk=yes
--    else
--      AC_MSG_ERROR("GTK+ not found!")
--    fi
--fi
--AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
--AC_SUBST(GTK_LIBS)
--AC_SUBST(GTK_CFLAGS)
--
--if test "x$build_gtk" = "xyes"; then
--
--    PKG_CHECK_MODULES([GIO],
--                      [gio-2.0 >= $GIO_MINIMUM],
--                      [use_gio=yes],
--                      [use_gio=no])
--    AC_SUBST(GIO_LIBS)
--    AC_SUBST(GIO_CFLAGS)
--    if test "x$use_gio" = "xyes"; then
--        AC_DEFINE([HAVE_GIO], 1)
--    fi
--
--    PKG_CHECK_MODULES([LIBNOTIFY],
--                      [libnotify >= $LIBNOTIFY_MINIMUM],
--                      [have_libnotify=yes],
--                      [have_libnotify=no])
--    AC_ARG_ENABLE([libnotify], 
--                  AS_HELP_STRING([--enable-libnotify],[enable notifications]),, 
--                  [enable_libnotify=yes]) 
--    use_libnotify=no
--    if test "x$enable_libnotify" = "xyes" ; then
--        if test "x$have_libnotify" = "xyes"; then
--            use_libnotify=yes
--            AC_SUBST(LIBNOTIFY_LIBS) 
--            AC_SUBST(LIBNOTIFY_CFLAGS) 
--            AC_DEFINE([HAVE_LIBNOTIFY], 1) 
--        fi
--    fi
--
--    PKG_CHECK_MODULES([DBUS_GLIB],
--                      [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
--                      [use_dbus_glib=yes],
--                      [use_dbus_glib=no])
--    AC_SUBST(DBUS_GLIB_LIBS)
--    AC_SUBST(DBUS_GLIB_CFLAGS)
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_DEFINE([HAVE_DBUS_GLIB], 1)
--    fi
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
--        if test "x$DBUS_BINDING_TOOL" = xno; then
--          AC_MSG_WARN([Cannot find dbus-binding-tool])
--          use_dbus_glib="no (dbus-binding-tool not found)"
--        fi
--    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  platform-specific stuff.
--
--AC_CANONICAL_HOST
--have_darwin="no"
-+build_cli="yes"
- have_msw="no"
--case $host_os in
--
--   *cygwin|*mingw32*)
--     have_msw="yes"
--     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
--     CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
--     LIBS="$LIBS -lshell32 -lws2_32"
--     transmissionlocaledir="locale"
--     if test -z "$host_alias"; then
--       hostaliaswindres=
--     else
--       hostaliaswindres="$host_alias-windres";
--     fi
--     AC_CHECK_TOOL(WINDRES, windres)
--     ;;
--
--  *darwin*)
--    have_darwin="yes"
--    # Make sure the Universal SDK is installed
--    if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
--      cat << EOF
--You need to install the Universal SDK in order to build Transmission:
--  Get your Xcode CD or package
--  Restart the install
--  When it gets to "Installation Type", select "Customize"
--  Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
--  Finish the install.
--EOF
--      exit 1
--    fi
--    ;;
--
--esac
--
--AC_ARG_ENABLE([cli],
--              [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],
--              [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],
--              [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_darwin" = "xyes"; then
--    AC_DEFINE([HAVE_DARWIN], 1)
--fi
- if test "x$have_msw" = "xyes"; then
-     AC_DEFINE([HAVE_MSW], 1)
- fi
-@@ -347,18 +142,11 @@
- dnl  Generate the output
- 
- AC_CONFIG_FILES([Makefile
--                 transmission.spec
-                  cli/Makefile
--                 daemon/Makefile
--                 doc/Makefile
-                  libtransmission/Makefile
-                  third-party/Makefile
-                  third-party/miniupnp/Makefile
--                 third-party/libnatpmp/Makefile
--                 macosx/Makefile
--                 gtk/Makefile
--                 gtk/icons/Makefile
--                 po/Makefile.in])
-+                 third-party/libnatpmp/Makefile])
- 
- ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
- AC_OUTPUT
-@@ -370,11 +158,5 @@
-         Source code location:       ${srcdir}
-         Compiler:                   ${CXX}
-         Build Command-Line client:  ${build_cli}
--        Build Daemon:               ${build_daemon}
--        Build GTK+ client:          ${build_gtk}
--          ... gio support:          ${use_gio}
--          ... dbus-glib support:    ${use_dbus_glib}
--          ... libnotify support:    ${use_libnotify}
--        Build OS X client:          ${build_mac}
- 
- "
---- Makefile.am.orig	2009-05-09 11:13:42.000000000 -0500
-+++ Makefile.am	2009-05-09 11:14:35.000000000 -0500
-@@ -1,103 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
- 
--if BUILD_CLI
--  CLI_DIR = cli
--endif
--if BUILD_DAEMON
--if !WIN32
--  DAEMON_DIR = daemon
--endif
--endif
--if BUILD_GTK
--  GTK_DIR = gtk po
--endif
--if BUILD_MAC
--  MAC_DIR = macosx
--endif
--
- SUBDIRS = \
--  doc \
-   third-party \
-   libtransmission \
--  $(DAEMON_DIR) \
--  $(CLI_DIR) \
--  $(BEOS_DIR) \
--  $(GTK_DIR) \
--  $(MAC_DIR)
--
--EXTRA_DIST = \
--  web \
--  qt \
--  NEWS \
--  AUTHORS \
--  COPYING \
--  README \
--  autogen.sh \
--  Transmission.xcodeproj/project.pbxproj \
--  intltool-extract.in \
--  intltool-merge.in \
--  intltool-update.in
--
--clutchdir = $(datadir)/transmission/web
--clutch_DATA = \
--  web/index.html \
--  web/LICENSE
--
--clutch_cssdir = $(clutchdir)/stylesheets
--clutch_css_DATA = \
--  web/stylesheets/iphone.css \
--  web/stylesheets/common.css \
--  web/stylesheets/ie6.css \
--  web/stylesheets/ie7.css
--
--clutch_jsdir = $(clutchdir)/javascript
--clutch_js_DATA = \
--  web/javascript/menu.js \
--  web/javascript/dialog.js \
--  web/javascript/transmission.js \
--  web/javascript/transmission.remote.js \
--  web/javascript/common.js \
--  web/javascript/torrent.js
--
--clutch_jquerydir = $(clutch_jsdir)/jquery
--clutch_jquery_DATA = \
--  web/javascript/jquery/json.min.js \
--  web/javascript/jquery/jquery.contextmenu.min.js \
--  web/javascript/jquery/jquery.min.js \
--  web/javascript/jquery/jquery.form.min.js \
--  web/javascript/jquery/jquery.transmenu.min.js
--
--clutch_imagesdir = $(clutchdir)/images
--clutch_images_DATA = \
--  web/images/favicon.ico \
--  web/images/favicon.png \
--  web/images/webclip-icon.png
--
--clutch_graphicsdir = $(clutch_imagesdir)/graphics
--clutch_graphics_DATA = \
--  web/images/graphics/logo.png \
--  web/images/graphics/chrome.png \
--  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/filter_bar.png \
--  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png
--
--clutch_progressdir = $(clutch_imagesdir)/progress
--clutch_progress_DATA = \
--  web/images/progress/progress.png
--
--clutch_buttonsdir = $(clutch_imagesdir)/buttons
--clutch_buttons_DATA = \
--  web/images/buttons/tab_backgrounds.png \
--  web/images/buttons/toolbar_buttons.png \
--  web/images/buttons/info_general.png \
--  web/images/buttons/torrent_buttons.png \
--  web/images/buttons/info_activity.png \
--  web/images/buttons/file_priority_buttons.png \
--  web/images/buttons/file_wanted_buttons.png \
--  web/images/buttons/info_files.png
--
--DISTCLEANFILES = \
--  intltool-extract \
--  intltool-merge \
--  intltool-update 
-+  cli
diff --git a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
deleted file mode 100644
index 0158b236a10b..000000000000
--- a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
+++ /dev/null
@@ -1,406 +0,0 @@
---- configure.ac.orig	2009-05-09 11:17:16.000000000 -0500
-+++ configure.ac	2009-05-09 11:21:09.000000000 -0500
-@@ -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,22 +32,8 @@
- fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
- 
--OPENSSL_MINIMUM=0.9.4
- CURL_MINIMUM=7.16.3
--GIO_MINIMUM=2.15.5
--GLIB_MINIMUM=2.6.0
--GTK_MINIMUM=2.6.0
--WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.3
--DBUS_GLIB_MINIMUM=0.70
--AC_SUBST(OPENSSL_MINIMUM)
- AC_SUBST(CURL_MINIMUM)
--AC_SUBST(GIO_MINIMUM)
--AC_SUBST(GLIB_MINIMUM)
--AC_SUBST(GTK_MINIMUM)
--AC_SUBST(WX_MINIMUM)
--AC_SUBST(LIBNOTIFY_MINIMUM)
--AC_SUBST(DBUS_GLIB_MINIMUM)
- 
- AC_PROG_CC
- AC_PROG_CXX
-@@ -81,12 +59,6 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- 
--AC_MSG_CHECKING([for fallocate])
--AC_TRY_LINK([#include <linux/falloc.h>],
--            [return fallocate(-1,0,0,0);],
--            [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
--             AC_MSG_RESULT([yes])],
--            [AC_MSG_RESULT([no])])
- AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
-@@ -94,7 +66,7 @@
- 
- AC_SEARCH_LIBS([socket], [socket net])
- AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
-+CHECK_SSL()
- PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
- AC_PATH_ZLIB
- 
-@@ -116,21 +88,6 @@
- dnl
- dnl file monitoring for the daemon
- 
--AC_CHECK_HEADER([sys/inotify.h], 
--                [AC_CHECK_FUNC([inotify_init],[have_inotify="yes"],[have_inotify="no"])], 
--                [have_inotify="no"]) 
--AC_ARG_WITH([inotify], 
--            [AS_HELP_STRING([--with-inotify],[Enable inotify support (default=auto)])], 
--            [want_inotify=${enableval}], 
--            [want_inotify=${have_inotify}]) 
--if test "x$want_inotify" = "xyes" ; then 
--    if test "x$have_inotify" = "xyes"; then 
--      AC_DEFINE([WITH_INOTIFY],[1]) 
--    else 
--      AC_MSG_ERROR("inotify not found!") 
--    fi 
--fi 
-- 
- AC_CHECK_HEADER([sys/event.h], 
-                 [AC_CHECK_FUNC([kqueue],[have_kqueue="yes"],[have_kqueue="no"])], 
-                 [have_kqueue="no"]) 
-@@ -146,8 +103,6 @@
-     fi 
- fi 
- 
--AC_CHECK_HEADERS([xfs/xfs.h])
--
- 
- dnl ----------------------------------------------------------------------------
- dnl
-@@ -175,168 +130,8 @@
- AC_SUBST(LIBEVENT_CPPFLAGS)
- 
- 
--dnl ----------------------------------------------------------------------------
--dnl
--dnl  detection for the GTK+ client
--
--PKG_CHECK_MODULES(GTK,
--                  [gtk+-2.0 >= $GTK_MINIMUM
--                   glib-2.0 >= $GLIB_MINIMUM
--                   gmodule-2.0 >= $GLIB_MINIMUM
--                   gthread-2.0 >= $GLIB_MINIMUM],
--                  [have_gtk=yes],
--                  [have_gtk=no])
--AC_ARG_ENABLE([gtk],
--              AS_HELP_STRING([--enable-gtk],[build gtk client]),
--              [want_gtk=${enableval}],
--              [want_gtk=${have_gtk}])
--build_gtk=no
--use_gio=no
--use_libnotify=no
--use_dbus_glib=no
--if test "x$want_gtk" = "xyes" ; then
--    if test "x$have_gtk" = "xyes"; then
--      build_gtk=yes
--    else
--      AC_MSG_ERROR("GTK+ not found!")
--    fi
--fi
--AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
--AC_SUBST(GTK_LIBS)
--AC_SUBST(GTK_CFLAGS)
--
--if test "x$build_gtk" = "xyes"; then
--
--    PKG_CHECK_MODULES([GIO],
--                      [gio-2.0 >= $GIO_MINIMUM],
--                      [use_gio=yes],
--                      [use_gio=no])
--    AC_SUBST(GIO_LIBS)
--    AC_SUBST(GIO_CFLAGS)
--    if test "x$use_gio" = "xyes"; then
--        AC_DEFINE([HAVE_GIO], 1)
--    fi
--
--    PKG_CHECK_MODULES([LIBNOTIFY],
--                      [libnotify >= $LIBNOTIFY_MINIMUM],
--                      [have_libnotify=yes],
--                      [have_libnotify=no])
--    AC_ARG_ENABLE([libnotify], 
--                  AS_HELP_STRING([--enable-libnotify],[enable notifications]),, 
--                  [enable_libnotify=yes]) 
--    use_libnotify=no
--    if test "x$enable_libnotify" = "xyes" ; then
--        if test "x$have_libnotify" = "xyes"; then
--            use_libnotify=yes
--            AC_SUBST(LIBNOTIFY_LIBS) 
--            AC_SUBST(LIBNOTIFY_CFLAGS) 
--            AC_DEFINE([HAVE_LIBNOTIFY], 1) 
--        fi
--    fi
--
--    PKG_CHECK_MODULES([DBUS_GLIB],
--                      [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
--                      [use_dbus_glib=yes],
--                      [use_dbus_glib=no])
--    AC_SUBST(DBUS_GLIB_LIBS)
--    AC_SUBST(DBUS_GLIB_CFLAGS)
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_DEFINE([HAVE_DBUS_GLIB], 1)
--    fi
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
--        if test "x$DBUS_BINDING_TOOL" = xno; then
--          AC_MSG_WARN([Cannot find dbus-binding-tool])
--          use_dbus_glib="no (dbus-binding-tool not found)"
--        fi
--    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  platform-specific stuff.
--
--AC_CANONICAL_HOST
--have_darwin="no"
-+build_daemon="yes"
- have_msw="no"
--case $host_os in
--
--   *cygwin|*mingw32*)
--     have_msw="yes"
--     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
--     CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
--     LIBS="$LIBS -lshell32 -lws2_32"
--     transmissionlocaledir="locale"
--     if test -z "$host_alias"; then
--       hostaliaswindres=
--     else
--       hostaliaswindres="$host_alias-windres";
--     fi
--     AC_CHECK_TOOL(WINDRES, windres)
--     ;;
--
--  *darwin*)
--    have_darwin="yes"
--    # Make sure the Universal SDK is installed
--    if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
--      cat << EOF
--You need to install the Universal SDK in order to build Transmission:
--  Get your Xcode CD or package
--  Restart the install
--  When it gets to "Installation Type", select "Customize"
--  Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
--  Finish the install.
--EOF
--      exit 1
--    fi
--    ;;
--
--esac
--
--AC_ARG_ENABLE([cli],
--              [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],
--              [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],
--              [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_darwin" = "xyes"; then
--    AC_DEFINE([HAVE_DARWIN], 1)
--fi
- if test "x$have_msw" = "xyes"; then
-     AC_DEFINE([HAVE_MSW], 1)
- fi
-@@ -347,18 +142,11 @@
- dnl  Generate the output
- 
- AC_CONFIG_FILES([Makefile
--                 transmission.spec
--                 cli/Makefile
-                  daemon/Makefile
--                 doc/Makefile
-                  libtransmission/Makefile
-                  third-party/Makefile
-                  third-party/miniupnp/Makefile
--                 third-party/libnatpmp/Makefile
--                 macosx/Makefile
--                 gtk/Makefile
--                 gtk/icons/Makefile
--                 po/Makefile.in])
-+                 third-party/libnatpmp/Makefile])
- 
- ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
- AC_OUTPUT
-@@ -369,12 +157,6 @@
- 
-         Source code location:       ${srcdir}
-         Compiler:                   ${CXX}
--        Build Command-Line client:  ${build_cli}
-         Build Daemon:               ${build_daemon}
--        Build GTK+ client:          ${build_gtk}
--          ... gio support:          ${use_gio}
--          ... dbus-glib support:    ${use_dbus_glib}
--          ... libnotify support:    ${use_libnotify}
--        Build OS X client:          ${build_mac}
- 
- "
---- Makefile.am.orig	2009-05-09 11:17:19.000000000 -0500
-+++ Makefile.am	2009-05-09 11:22:37.000000000 -0500
-@@ -1,103 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
- 
--if BUILD_CLI
--  CLI_DIR = cli
--endif
--if BUILD_DAEMON
--if !WIN32
--  DAEMON_DIR = daemon
--endif
--endif
--if BUILD_GTK
--  GTK_DIR = gtk po
--endif
--if BUILD_MAC
--  MAC_DIR = macosx
--endif
--
- SUBDIRS = \
--  doc \
-   third-party \
-   libtransmission \
--  $(DAEMON_DIR) \
--  $(CLI_DIR) \
--  $(BEOS_DIR) \
--  $(GTK_DIR) \
--  $(MAC_DIR)
--
--EXTRA_DIST = \
--  web \
--  qt \
--  NEWS \
--  AUTHORS \
--  COPYING \
--  README \
--  autogen.sh \
--  Transmission.xcodeproj/project.pbxproj \
--  intltool-extract.in \
--  intltool-merge.in \
--  intltool-update.in
--
--clutchdir = $(datadir)/transmission/web
--clutch_DATA = \
--  web/index.html \
--  web/LICENSE
--
--clutch_cssdir = $(clutchdir)/stylesheets
--clutch_css_DATA = \
--  web/stylesheets/iphone.css \
--  web/stylesheets/common.css \
--  web/stylesheets/ie6.css \
--  web/stylesheets/ie7.css
--
--clutch_jsdir = $(clutchdir)/javascript
--clutch_js_DATA = \
--  web/javascript/menu.js \
--  web/javascript/dialog.js \
--  web/javascript/transmission.js \
--  web/javascript/transmission.remote.js \
--  web/javascript/common.js \
--  web/javascript/torrent.js
--
--clutch_jquerydir = $(clutch_jsdir)/jquery
--clutch_jquery_DATA = \
--  web/javascript/jquery/json.min.js \
--  web/javascript/jquery/jquery.contextmenu.min.js \
--  web/javascript/jquery/jquery.min.js \
--  web/javascript/jquery/jquery.form.min.js \
--  web/javascript/jquery/jquery.transmenu.min.js
--
--clutch_imagesdir = $(clutchdir)/images
--clutch_images_DATA = \
--  web/images/favicon.ico \
--  web/images/favicon.png \
--  web/images/webclip-icon.png
--
--clutch_graphicsdir = $(clutch_imagesdir)/graphics
--clutch_graphics_DATA = \
--  web/images/graphics/logo.png \
--  web/images/graphics/chrome.png \
--  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/filter_bar.png \
--  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png
--
--clutch_progressdir = $(clutch_imagesdir)/progress
--clutch_progress_DATA = \
--  web/images/progress/progress.png
--
--clutch_buttonsdir = $(clutch_imagesdir)/buttons
--clutch_buttons_DATA = \
--  web/images/buttons/tab_backgrounds.png \
--  web/images/buttons/toolbar_buttons.png \
--  web/images/buttons/info_general.png \
--  web/images/buttons/torrent_buttons.png \
--  web/images/buttons/info_activity.png \
--  web/images/buttons/file_priority_buttons.png \
--  web/images/buttons/file_wanted_buttons.png \
--  web/images/buttons/info_files.png
--
--DISTCLEANFILES = \
--  intltool-extract \
--  intltool-merge \
--  intltool-update 
-+  daemon
diff --git a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
deleted file mode 100644
index f7443fe1185a..000000000000
--- a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
+++ /dev/null
@@ -1,356 +0,0 @@
---- configure.ac.orig	2009-05-09 11:23:34.000000000 -0500
-+++ configure.ac	2009-05-09 11:28:00.000000000 -0500
-@@ -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$supported_build" = "xno")
- 
--OPENSSL_MINIMUM=0.9.4
- CURL_MINIMUM=7.16.3
- GIO_MINIMUM=2.15.5
- GLIB_MINIMUM=2.6.0
- GTK_MINIMUM=2.6.0
--WX_MINIMUM=2.6.0
- LIBNOTIFY_MINIMUM=0.4.3
- DBUS_GLIB_MINIMUM=0.70
--AC_SUBST(OPENSSL_MINIMUM)
- AC_SUBST(CURL_MINIMUM)
- AC_SUBST(GIO_MINIMUM)
- AC_SUBST(GLIB_MINIMUM)
- AC_SUBST(GTK_MINIMUM)
--AC_SUBST(WX_MINIMUM)
- AC_SUBST(LIBNOTIFY_MINIMUM)
- AC_SUBST(DBUS_GLIB_MINIMUM)
- 
-@@ -81,12 +69,6 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- 
--AC_MSG_CHECKING([for fallocate])
--AC_TRY_LINK([#include <linux/falloc.h>],
--            [return fallocate(-1,0,0,0);],
--            [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
--             AC_MSG_RESULT([yes])],
--            [AC_MSG_RESULT([no])])
- AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
-@@ -94,7 +76,7 @@
- 
- AC_SEARCH_LIBS([socket], [socket net])
- AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
-+CHECK_SSL()
- PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
- AC_PATH_ZLIB
- 
-@@ -116,21 +98,6 @@
- dnl
- dnl file monitoring for the daemon
- 
--AC_CHECK_HEADER([sys/inotify.h], 
--                [AC_CHECK_FUNC([inotify_init],[have_inotify="yes"],[have_inotify="no"])], 
--                [have_inotify="no"]) 
--AC_ARG_WITH([inotify], 
--            [AS_HELP_STRING([--with-inotify],[Enable inotify support (default=auto)])], 
--            [want_inotify=${enableval}], 
--            [want_inotify=${have_inotify}]) 
--if test "x$want_inotify" = "xyes" ; then 
--    if test "x$have_inotify" = "xyes"; then 
--      AC_DEFINE([WITH_INOTIFY],[1]) 
--    else 
--      AC_MSG_ERROR("inotify not found!") 
--    fi 
--fi 
-- 
- AC_CHECK_HEADER([sys/event.h], 
-                 [AC_CHECK_FUNC([kqueue],[have_kqueue="yes"],[have_kqueue="no"])], 
-                 [have_kqueue="no"]) 
-@@ -146,8 +113,6 @@
-     fi 
- fi 
- 
--AC_CHECK_HEADERS([xfs/xfs.h])
--
- 
- dnl ----------------------------------------------------------------------------
- dnl
-@@ -186,20 +151,14 @@
-                    gthread-2.0 >= $GLIB_MINIMUM],
-                   [have_gtk=yes],
-                   [have_gtk=no])
--AC_ARG_ENABLE([gtk],
--              AS_HELP_STRING([--enable-gtk],[build gtk client]),
--              [want_gtk=${enableval}],
--              [want_gtk=${have_gtk}])
- build_gtk=no
- use_gio=no
- use_libnotify=no
- use_dbus_glib=no
--if test "x$want_gtk" = "xyes" ; then
--    if test "x$have_gtk" = "xyes"; then
--      build_gtk=yes
--    else
--      AC_MSG_ERROR("GTK+ not found!")
--    fi
-+if test "x$have_gtk" = "xyes"; then
-+    build_gtk=yes
-+else
-+    AC_MSG_ERROR("GTK+ not found!")
- fi
- AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
- AC_SUBST(GTK_LIBS)
-@@ -252,91 +211,22 @@
-     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
-+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)
- 
- 
- dnl ----------------------------------------------------------------------------
- dnl
- dnl  platform-specific stuff.
- 
--AC_CANONICAL_HOST
--have_darwin="no"
- have_msw="no"
--case $host_os in
--
--   *cygwin|*mingw32*)
--     have_msw="yes"
--     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
--     CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
--     LIBS="$LIBS -lshell32 -lws2_32"
--     transmissionlocaledir="locale"
--     if test -z "$host_alias"; then
--       hostaliaswindres=
--     else
--       hostaliaswindres="$host_alias-windres";
--     fi
--     AC_CHECK_TOOL(WINDRES, windres)
--     ;;
--
--  *darwin*)
--    have_darwin="yes"
--    # Make sure the Universal SDK is installed
--    if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
--      cat << EOF
--You need to install the Universal SDK in order to build Transmission:
--  Get your Xcode CD or package
--  Restart the install
--  When it gets to "Installation Type", select "Customize"
--  Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
--  Finish the install.
--EOF
--      exit 1
--    fi
--    ;;
--
--esac
--
--AC_ARG_ENABLE([cli],
--              [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],
--              [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],
--              [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_darwin" = "xyes"; then
--    AC_DEFINE([HAVE_DARWIN], 1)
--fi
- if test "x$have_msw" = "xyes"; then
-     AC_DEFINE([HAVE_MSW], 1)
- fi
-@@ -347,15 +237,10 @@
- dnl  Generate the output
- 
- AC_CONFIG_FILES([Makefile
--                 transmission.spec
--                 cli/Makefile
--                 daemon/Makefile
--                 doc/Makefile
-                  libtransmission/Makefile
-                  third-party/Makefile
-                  third-party/miniupnp/Makefile
-                  third-party/libnatpmp/Makefile
--                 macosx/Makefile
-                  gtk/Makefile
-                  gtk/icons/Makefile
-                  po/Makefile.in])
-@@ -369,12 +254,9 @@
- 
-         Source code location:       ${srcdir}
-         Compiler:                   ${CXX}
--        Build Command-Line client:  ${build_cli}
--        Build Daemon:               ${build_daemon}
-         Build GTK+ client:          ${build_gtk}
-           ... gio support:          ${use_gio}
-           ... dbus-glib support:    ${use_dbus_glib}
-           ... libnotify support:    ${use_libnotify}
--        Build OS X client:          ${build_mac}
- 
- "
---- Makefile.am.orig	2009-05-09 11:23:38.000000000 -0500
-+++ Makefile.am	2009-05-09 11:28:23.000000000 -0500
-@@ -1,103 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
- 
--if BUILD_CLI
--  CLI_DIR = cli
--endif
--if BUILD_DAEMON
--if !WIN32
--  DAEMON_DIR = daemon
--endif
--endif
--if BUILD_GTK
--  GTK_DIR = gtk po
--endif
--if BUILD_MAC
--  MAC_DIR = macosx
--endif
--
- SUBDIRS = \
--  doc \
-   third-party \
-   libtransmission \
--  $(DAEMON_DIR) \
--  $(CLI_DIR) \
--  $(BEOS_DIR) \
--  $(GTK_DIR) \
--  $(MAC_DIR)
--
--EXTRA_DIST = \
--  web \
--  qt \
--  NEWS \
--  AUTHORS \
--  COPYING \
--  README \
--  autogen.sh \
--  Transmission.xcodeproj/project.pbxproj \
--  intltool-extract.in \
--  intltool-merge.in \
--  intltool-update.in
--
--clutchdir = $(datadir)/transmission/web
--clutch_DATA = \
--  web/index.html \
--  web/LICENSE
--
--clutch_cssdir = $(clutchdir)/stylesheets
--clutch_css_DATA = \
--  web/stylesheets/iphone.css \
--  web/stylesheets/common.css \
--  web/stylesheets/ie6.css \
--  web/stylesheets/ie7.css
--
--clutch_jsdir = $(clutchdir)/javascript
--clutch_js_DATA = \
--  web/javascript/menu.js \
--  web/javascript/dialog.js \
--  web/javascript/transmission.js \
--  web/javascript/transmission.remote.js \
--  web/javascript/common.js \
--  web/javascript/torrent.js
--
--clutch_jquerydir = $(clutch_jsdir)/jquery
--clutch_jquery_DATA = \
--  web/javascript/jquery/json.min.js \
--  web/javascript/jquery/jquery.contextmenu.min.js \
--  web/javascript/jquery/jquery.min.js \
--  web/javascript/jquery/jquery.form.min.js \
--  web/javascript/jquery/jquery.transmenu.min.js
--
--clutch_imagesdir = $(clutchdir)/images
--clutch_images_DATA = \
--  web/images/favicon.ico \
--  web/images/favicon.png \
--  web/images/webclip-icon.png
--
--clutch_graphicsdir = $(clutch_imagesdir)/graphics
--clutch_graphics_DATA = \
--  web/images/graphics/logo.png \
--  web/images/graphics/chrome.png \
--  web/images/graphics/iphone_chrome.png \
--  web/images/graphics/filter_bar.png \
--  web/images/graphics/filter_icon.png \
--  web/images/graphics/transfer_arrows.png
--
--clutch_progressdir = $(clutch_imagesdir)/progress
--clutch_progress_DATA = \
--  web/images/progress/progress.png
--
--clutch_buttonsdir = $(clutch_imagesdir)/buttons
--clutch_buttons_DATA = \
--  web/images/buttons/tab_backgrounds.png \
--  web/images/buttons/toolbar_buttons.png \
--  web/images/buttons/info_general.png \
--  web/images/buttons/torrent_buttons.png \
--  web/images/buttons/info_activity.png \
--  web/images/buttons/file_priority_buttons.png \
--  web/images/buttons/file_wanted_buttons.png \
--  web/images/buttons/info_files.png
--
--DISTCLEANFILES = \
--  intltool-extract \
--  intltool-merge \
--  intltool-update 
-+  gtk po
diff --git a/net-p2p/transmission-cli/files/transmission-web-configure.ac b/net-p2p/transmission-cli/files/transmission-web-configure.ac
deleted file mode 100644
index ac117736da77..000000000000
--- a/net-p2p/transmission-cli/files/transmission-web-configure.ac
+++ /dev/null
@@ -1,424 +0,0 @@
---- configure.ac.orig	2009-05-09 11:29:09.000000000 -0500
-+++ configure.ac	2009-05-09 11:32:08.000000000 -0500
-@@ -15,23 +15,13 @@
- AC_CONFIG_MACRO_DIR([m4])
- 
- dnl AM_CONFIG_HEADER(config.h)
--AC_CONFIG_SRCDIR(libtransmission/transmission.h)
- AM_INIT_AUTOMAKE([1.9 tar-ustar])
--AC_PROG_LIBTOOL
- 
- 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,341 +30,13 @@
- fi
- AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
- 
--OPENSSL_MINIMUM=0.9.4
--CURL_MINIMUM=7.16.3
--GIO_MINIMUM=2.15.5
--GLIB_MINIMUM=2.6.0
--GTK_MINIMUM=2.6.0
--WX_MINIMUM=2.6.0
--LIBNOTIFY_MINIMUM=0.4.3
--DBUS_GLIB_MINIMUM=0.70
--AC_SUBST(OPENSSL_MINIMUM)
--AC_SUBST(CURL_MINIMUM)
--AC_SUBST(GIO_MINIMUM)
--AC_SUBST(GLIB_MINIMUM)
--AC_SUBST(GTK_MINIMUM)
--AC_SUBST(WX_MINIMUM)
--AC_SUBST(LIBNOTIFY_MINIMUM)
--AC_SUBST(DBUS_GLIB_MINIMUM)
--
--AC_PROG_CC
--AC_PROG_CXX
--AC_C_INLINE
--if test "x$GCC" = "xyes" ; then
--
--    CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings"
--
--    dnl figure out gcc version
--    AC_MSG_CHECKING([gcc version])
--    GCC_VERSION=`$CC -dumpversion`
--    GCC_MAJOR=`echo $GCC_VERSION | cut -d . -f1`
--    GCC_MINOR=`echo $GCC_VERSION | cut -d . -f2`
--    GCC_VERSION_NUM=`(expr $GCC_MAJOR "*" 100 + $GCC_MINOR) 2>/dev/null`
--
--    AC_MSG_RESULT($GCC_VERSION)
--    if test $GCC_VERSION_NUM -ge 304; then
--        dnl these were added in 3.4
--        CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement -Winit-self"
--    fi
--fi
--
--AC_HEADER_STDC
--AC_HEADER_TIME
--
--AC_MSG_CHECKING([for fallocate])
--AC_TRY_LINK([#include <linux/falloc.h>],
--            [return fallocate(-1,0,0,0);],
--            [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
--             AC_MSG_RESULT([yes])],
--            [AC_MSG_RESULT([no])])
--AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
- 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()])
--PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
--AC_PATH_ZLIB
--
--AC_SYS_LARGEFILE
--
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl posix_fadvise
--
--dnl can posix_fadvise be used
--AC_CHECK_DECLS(posix_fadvise, [], [], [
--#define _XOPEN_SOURCE 600
--#include <fcntl.h>])
--AC_CHECK_FUNCS([posix_fadvise])
--
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl file monitoring for the daemon
--
--AC_CHECK_HEADER([sys/inotify.h], 
--                [AC_CHECK_FUNC([inotify_init],[have_inotify="yes"],[have_inotify="no"])], 
--                [have_inotify="no"]) 
--AC_ARG_WITH([inotify], 
--            [AS_HELP_STRING([--with-inotify],[Enable inotify support (default=auto)])], 
--            [want_inotify=${enableval}], 
--            [want_inotify=${have_inotify}]) 
--if test "x$want_inotify" = "xyes" ; then 
--    if test "x$have_inotify" = "xyes"; then 
--      AC_DEFINE([WITH_INOTIFY],[1]) 
--    else 
--      AC_MSG_ERROR("inotify not found!") 
--    fi 
--fi 
-- 
--AC_CHECK_HEADER([sys/event.h], 
--                [AC_CHECK_FUNC([kqueue],[have_kqueue="yes"],[have_kqueue="no"])], 
--                [have_kqueue="no"]) 
--AC_ARG_WITH([kqueue], 
--            [AS_HELP_STRING([--with-kqueue],[Enable kqueue support (default=auto)])], 
--            [want_kqueue=${enableval}], 
--            [want_kqueue=${have_kqueue}]) 
--if test "x$want_kqueue" = "xyes" ; then 
--    if test "x$have_kqueue" = "xyes"; then 
--      AC_DEFINE([WITH_KQUEUE],[1]) 
--    else 
--      AC_MSG_ERROR("kqueue not found!") 
--    fi 
--fi 
--
--AC_CHECK_HEADERS([xfs/xfs.h])
--
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl va_copy
--
--AC_MSG_CHECKING([how to copy va_list])
--AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
--    AC_MSG_RESULT([va_copy]),
--        [ AH_TEMPLATE([va_copy], [define if va_copy is not available])
--        AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; __va_copy(ap1, ap2);],
--        [ AC_DEFINE([va_copy], [__va_copy])
--        AC_MSG_RESULT([__va_copy])],
--        [ AC_DEFINE([va_copy(dest,src)], [memcpy(&dest,&src,sizeof(va_list))])
--        AC_MSG_RESULT([memcpy])]
--    )
--])
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl  libevent fun
--
--AC_CONFIG_SUBDIRS([third-party/libevent])
--AC_MSG_NOTICE([invoking libevent's configure script])
--LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
--AC_SUBST(LIBEVENT_CPPFLAGS)
--
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl  detection for the GTK+ client
--
--PKG_CHECK_MODULES(GTK,
--                  [gtk+-2.0 >= $GTK_MINIMUM
--                   glib-2.0 >= $GLIB_MINIMUM
--                   gmodule-2.0 >= $GLIB_MINIMUM
--                   gthread-2.0 >= $GLIB_MINIMUM],
--                  [have_gtk=yes],
--                  [have_gtk=no])
--AC_ARG_ENABLE([gtk],
--              AS_HELP_STRING([--enable-gtk],[build gtk client]),
--              [want_gtk=${enableval}],
--              [want_gtk=${have_gtk}])
--build_gtk=no
--use_gio=no
--use_libnotify=no
--use_dbus_glib=no
--if test "x$want_gtk" = "xyes" ; then
--    if test "x$have_gtk" = "xyes"; then
--      build_gtk=yes
--    else
--      AC_MSG_ERROR("GTK+ not found!")
--    fi
--fi
--AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
--AC_SUBST(GTK_LIBS)
--AC_SUBST(GTK_CFLAGS)
--
--if test "x$build_gtk" = "xyes"; then
--
--    PKG_CHECK_MODULES([GIO],
--                      [gio-2.0 >= $GIO_MINIMUM],
--                      [use_gio=yes],
--                      [use_gio=no])
--    AC_SUBST(GIO_LIBS)
--    AC_SUBST(GIO_CFLAGS)
--    if test "x$use_gio" = "xyes"; then
--        AC_DEFINE([HAVE_GIO], 1)
--    fi
--
--    PKG_CHECK_MODULES([LIBNOTIFY],
--                      [libnotify >= $LIBNOTIFY_MINIMUM],
--                      [have_libnotify=yes],
--                      [have_libnotify=no])
--    AC_ARG_ENABLE([libnotify], 
--                  AS_HELP_STRING([--enable-libnotify],[enable notifications]),, 
--                  [enable_libnotify=yes]) 
--    use_libnotify=no
--    if test "x$enable_libnotify" = "xyes" ; then
--        if test "x$have_libnotify" = "xyes"; then
--            use_libnotify=yes
--            AC_SUBST(LIBNOTIFY_LIBS) 
--            AC_SUBST(LIBNOTIFY_CFLAGS) 
--            AC_DEFINE([HAVE_LIBNOTIFY], 1) 
--        fi
--    fi
--
--    PKG_CHECK_MODULES([DBUS_GLIB],
--                      [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
--                      [use_dbus_glib=yes],
--                      [use_dbus_glib=no])
--    AC_SUBST(DBUS_GLIB_LIBS)
--    AC_SUBST(DBUS_GLIB_CFLAGS)
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_DEFINE([HAVE_DBUS_GLIB], 1)
--    fi
--    if test "x$use_dbus_glib" = "xyes"; then
--        AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
--        if test "x$DBUS_BINDING_TOOL" = xno; then
--          AC_MSG_WARN([Cannot find dbus-binding-tool])
--          use_dbus_glib="no (dbus-binding-tool not found)"
--        fi
--    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  platform-specific stuff.
--
--AC_CANONICAL_HOST
--have_darwin="no"
--have_msw="no"
--case $host_os in
--
--   *cygwin|*mingw32*)
--     have_msw="yes"
--     CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
--     CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
--     LIBS="$LIBS -lshell32 -lws2_32"
--     transmissionlocaledir="locale"
--     if test -z "$host_alias"; then
--       hostaliaswindres=
--     else
--       hostaliaswindres="$host_alias-windres";
--     fi
--     AC_CHECK_TOOL(WINDRES, windres)
--     ;;
--
--  *darwin*)
--    have_darwin="yes"
--    # Make sure the Universal SDK is installed
--    if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
--      cat << EOF
--You need to install the Universal SDK in order to build Transmission:
--  Get your Xcode CD or package
--  Restart the install
--  When it gets to "Installation Type", select "Customize"
--  Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
--  Finish the install.
--EOF
--      exit 1
--    fi
--    ;;
--
--esac
--
--AC_ARG_ENABLE([cli],
--              [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],
--              [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],
--              [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_darwin" = "xyes"; then
--    AC_DEFINE([HAVE_DARWIN], 1)
--fi
--if test "x$have_msw" = "xyes"; then
--    AC_DEFINE([HAVE_MSW], 1)
--fi
--AM_CONDITIONAL(WIN32, test "x$have_msw" = "xyes")
--
--dnl ----------------------------------------------------------------------------
--dnl
- dnl  Generate the output
- 
--AC_CONFIG_FILES([Makefile
--                 transmission.spec
--                 cli/Makefile
--                 daemon/Makefile
--                 doc/Makefile
--                 libtransmission/Makefile
--                 third-party/Makefile
--                 third-party/miniupnp/Makefile
--                 third-party/libnatpmp/Makefile
--                 macosx/Makefile
--                 gtk/Makefile
--                 gtk/icons/Makefile
--                 po/Makefile.in])
--
--ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
-+AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
--
--echo "
--
--Configuration:
--
--        Source code location:       ${srcdir}
--        Compiler:                   ${CXX}
--        Build Command-Line client:  ${build_cli}
--        Build Daemon:               ${build_daemon}
--        Build GTK+ client:          ${build_gtk}
--          ... gio support:          ${use_gio}
--          ... dbus-glib support:    ${use_dbus_glib}
--          ... libnotify support:    ${use_libnotify}
--        Build OS X client:          ${build_mac}
--
--"
---- Makefile.am.orig	2009-05-09 11:29:11.000000000 -0500
-+++ Makefile.am	2009-05-09 11:32:44.000000000 -0500
-@@ -1,43 +1,5 @@
- ACLOCAL_AMFLAGS = -I m4
- 
--if BUILD_CLI
--  CLI_DIR = cli
--endif
--if BUILD_DAEMON
--if !WIN32
--  DAEMON_DIR = daemon
--endif
--endif
--if BUILD_GTK
--  GTK_DIR = gtk po
--endif
--if BUILD_MAC
--  MAC_DIR = macosx
--endif
--
--SUBDIRS = \
--  doc \
--  third-party \
--  libtransmission \
--  $(DAEMON_DIR) \
--  $(CLI_DIR) \
--  $(BEOS_DIR) \
--  $(GTK_DIR) \
--  $(MAC_DIR)
--
--EXTRA_DIST = \
--  web \
--  qt \
--  NEWS \
--  AUTHORS \
--  COPYING \
--  README \
--  autogen.sh \
--  Transmission.xcodeproj/project.pbxproj \
--  intltool-extract.in \
--  intltool-merge.in \
--  intltool-update.in
--
- clutchdir = $(datadir)/transmission/web
- clutch_DATA = \
-   web/index.html \
-@@ -96,8 +58,3 @@
-   web/images/buttons/file_priority_buttons.png \
-   web/images/buttons/file_wanted_buttons.png \
-   web/images/buttons/info_files.png
--
--DISTCLEANFILES = \
--  intltool-extract \
--  intltool-merge \
--  intltool-update 
diff --git a/net-p2p/transmission-cli/files/transmission.in b/net-p2p/transmission-cli/files/transmission.in
new file mode 100644
index 000000000000..ce6aaaca6a49
--- /dev/null
+++ b/net-p2p/transmission-cli/files/transmission.in
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: transmission
+# REQUIRE: DAEMON 
+#
+# Add the following lines to /etc/rc.conf to enable this service:
+#
+# transmission_enable:	     Set to NO by default. Set it to YES to enable it.
+# transmission_watch_dir:    Directory for torrent files to download
+#			     automatically. Off by default unless you add
+#			     a path.
+# transmission_conf_dir:     Directory where transmission configuration
+#			     data is stored.
+#			     Default: %%PREFIX%%/etc/transmission/home/.config
+# transmission_download_dir: Directory to store downloaded data.
+#			     Default: %%PREFIX%%/etc/transmission/home/Downloads
+# transmission_user:	     The user account transmission daemon runs as what
+#			     you want it to be. It uses 'transmission' user by
+#			     default. Do not sets it as empty or it will run
+#			     as root.
+#
+
+. %%RC_SUBR%%
+
+name="transmission"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/bin/transmission-daemon
+
+load_rc_config ${name}
+
+: ${transmission_enable:="NO"}
+: ${transmission_user:="transmission"}
+
+transmission_flags=" \
+	${transmission_watch_dir:+-c ${transmission_watch_dir}} \
+	${transmission_conf_dir:+-g ${transmission_conf_dir}} \
+	${transmission_download_dir:+-w ${transmission_download_dir}} \
+	${transmission_flags}"
+
+run_rc_command "$1"
diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile
index bf96203f3139..028cdb46ed5c 100644
--- a/net-p2p/transmission-daemon/Makefile
+++ b/net-p2p/transmission-daemon/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-daemon
 
 MAINTAINER=	mezz@FreeBSD.org
@@ -14,8 +14,24 @@ COMMENT=	A fast and lightweight daemon BitTorrent client
 DESCR=		${.CURDIR}/pkg-descr
 MASTERDIR=	${.CURDIR}/../transmission-cli
 PLIST=		${.CURDIR}/pkg-plist
+PKGINSTALL=	${.CURDIR}/pkg-install
 SLAVEPORT=	daemon
 
+USE_RC_SUBR=	transmission
+
+EXTRA_CONF_ARGS=--disable-cli \
+		--enable-daemon \
+		--disable-gtk \
+		--disable-libnotify \
+		--disable-mac \
+		--disable-nls
+
 MAN1=		transmission-daemon.1 transmission-remote.1
 
+post-install: general-install
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/transmission-daemon/pkg-install b/net-p2p/transmission-daemon/pkg-install
new file mode 100644
index 000000000000..310e1cc32f47
--- /dev/null
+++ b/net-p2p/transmission-daemon/pkg-install
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=transmission
+	GROUP=${USER}
+	UID=919
+	GID=${UID}
+	PW=/usr/sbin/pw
+	CHMOD=/bin/chmod
+	CHOWN=/usr/sbin/chown
+	MKDIR=/bin/mkdir
+	THOME=${PKG_PREFIX}/etc/${USER}/home
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "${THOME}" -s /usr/sbin/nologin -c "Transmission Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	${MKDIR} -p ${THOME}/Downloads
+	${CHOWN} root:${GROUP} ${THOME}
+	${CHOWN} ${USER}:${GROUP} ${THOME}/Downloads
+	${CHMOD} 1770 ${THOME}
+
+	exit 0
+	;;
+esac
diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist
index 88b8d022681f..e7cb3d4f583f 100644
--- a/net-p2p/transmission-daemon/pkg-plist
+++ b/net-p2p/transmission-daemon/pkg-plist
@@ -5,3 +5,6 @@ bin/transmission-remote
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry etc/transmission/home/Downloads
+@dirrmtry etc/transmission/home
+@dirrmtry etc/transmission
diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile
index 3539a59c6e36..bb585899b55c 100644
--- a/net-p2p/transmission-gtk2/Makefile
+++ b/net-p2p/transmission-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	mezz@FreeBSD.org
@@ -29,6 +29,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
+EXTRA_CONF_ARGS=--disable-cli \
+		--disable-daemon \
+		--enable-gtk \
+		--enable-libnotify \
+		--disable-mac \
+		--enable-nls
+
 MAN1=		transmission.1
 
 post-patch: general-patch
diff --git a/net-p2p/transmission-gtk2/pkg-plist b/net-p2p/transmission-gtk2/pkg-plist
index 1d034bdb5da7..35bb14661373 100644
--- a/net-p2p/transmission-gtk2/pkg-plist
+++ b/net-p2p/transmission-gtk2/pkg-plist
@@ -31,6 +31,7 @@ share/locale/et/LC_MESSAGES/transmission.mo
 share/locale/eu/LC_MESSAGES/transmission.mo
 share/locale/fa/LC_MESSAGES/transmission.mo
 share/locale/fi/LC_MESSAGES/transmission.mo
+share/locale/fil/LC_MESSAGES/transmission.mo
 share/locale/fr/LC_MESSAGES/transmission.mo
 share/locale/ga/LC_MESSAGES/transmission.mo
 share/locale/gl/LC_MESSAGES/transmission.mo
@@ -78,6 +79,8 @@ share/pixmaps/transmission.png
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
+@dirrmtry share/locale/fil/LC_MESSAGES
+@dirrmtry share/locale/fil
 @dirrmtry share/locale/ckb/LC_MESSAGES
 @dirrmtry share/locale/ckb
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 9babe46e5a96..7441d8ce7005 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	1.61
+PORTVERSION=	1.72
 CATEGORIES=	net-p2p
 MASTER_SITES=	# empty
 DISTFILES=	# empty