5 files changed, 56 insertions, 51 deletions

diff --git a/net-p2p/transmission-cli/files/patch-check-ssl.m4 b/net-p2p/transmission-cli/files/patch-check-ssl.m4
new file mode 100644
index 000000000000..492f4e86ac0f
--- /dev/null
+++ b/net-p2p/transmission-cli/files/patch-check-ssl.m4
@@ -0,0 +1,11 @@
+--- m4/check-ssl.m4.orig	2008-09-17 10:41:08.000000000 -0500
++++ m4/check-ssl.m4	2008-09-17 10:41:45.000000000 -0500
+@@ -45,7 +45,7 @@
+ [
+     AC_MSG_CHECKING([for OpenSSL])
+ 
+-    for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
++    for dir in $with_ssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
+         ssldir="$dir"
+         if test -f "$dir/include/openssl/ssl.h"; then
+             found_ssl="yes";
diff --git a/net-p2p/transmission-cli/files/transmission-cli-configure.ac b/net-p2p/transmission-cli/files/transmission-cli-configure.ac
index a0219150d8c0..97b25d93da9e 100644
--- a/net-p2p/transmission-cli/files/transmission-cli-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-cli-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2008-07-13 22:42:28.000000000 -0500
-+++ configure.ac	2008-07-14 01:47:22.000000000 -0500
+--- configure.ac.orig	2008-09-16 20:37:42.000000000 -0500
++++ configure.ac	2008-09-17 00:00:48.000000000 -0500
 @@ -10,22 +10,8 @@
  AM_INIT_AUTOMAKE([1.9 tar-ustar])
  AC_PROG_LIBTOOL
@@ -23,17 +23,16 @@
  
  AC_PROG_CC
  AC_PROG_CXX
-@@ -44,7 +30,8 @@
+@@ -44,7 +30,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM])
-+AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
-+AC_CHECK_LIB([ssl],[SSL_library_init])
+-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
++CHECK_SSL()
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  
  AC_SYS_LARGEFILE
-@@ -76,237 +63,19 @@
+@@ -76,237 +62,19 @@
  AC_SUBST(LIBEVENT_CPPFLAGS)
  
  
@@ -273,7 +272,7 @@
  
  ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
  AC_OUTPUT
-@@ -318,13 +87,5 @@
+@@ -318,13 +86,5 @@
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
          Build Command-Line client:  ${build_cli}
@@ -287,9 +286,9 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-07-14 14:03:14.000000000 -0500
-+++ Makefile.am	2008-07-14 14:07:06.000000000 -0500
-@@ -1,104 +1,6 @@
+--- Makefile.am.orig	2008-09-16 20:37:42.000000000 -0500
++++ Makefile.am	2008-09-16 23:59:44.000000000 -0500
+@@ -1,103 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -if BUILD_BEOS
@@ -354,7 +353,6 @@
 -
 -clutch_jquerydir = $(clutch_jsdir)/jquery
 -clutch_jquery_DATA = \
--  web/javascript/jquery \
 -  web/javascript/jquery/json.min.js \
 -  web/javascript/jquery/jquery.contextmenu.min.js \
 -  web/javascript/jquery/jquery.min.js \
diff --git a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
index c6bda5f3a485..8ef57bd0cf8b 100644
--- a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2008-07-14 14:13:26.000000000 -0500
-+++ configure.ac	2008-07-14 14:17:17.000000000 -0500
+--- configure.ac.orig	2008-09-17 12:18:44.000000000 -0500
++++ configure.ac	2008-09-17 12:21:54.000000000 -0500
 @@ -10,22 +10,8 @@
  AM_INIT_AUTOMAKE([1.9 tar-ustar])
  AC_PROG_LIBTOOL
@@ -23,17 +23,16 @@
  
  AC_PROG_CC
  AC_PROG_CXX
-@@ -44,7 +30,8 @@
+@@ -44,7 +30,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM])
-+AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
-+AC_CHECK_LIB([ssl],[SSL_library_init])
+-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
++CHECK_SSL()
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  
  AC_SYS_LARGEFILE
-@@ -76,237 +63,19 @@
+@@ -76,237 +62,19 @@
  AC_SUBST(LIBEVENT_CPPFLAGS)
  
  
@@ -273,7 +272,7 @@
  
  ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
  AC_OUTPUT
-@@ -317,14 +86,6 @@
+@@ -317,14 +85,6 @@
  
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
@@ -288,9 +287,9 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-07-14 14:13:34.000000000 -0500
-+++ Makefile.am	2008-07-14 14:17:56.000000000 -0500
-@@ -1,104 +1,6 @@
+--- Makefile.am.orig	2008-09-17 12:18:52.000000000 -0500
++++ Makefile.am	2008-09-17 12:22:33.000000000 -0500
+@@ -1,103 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -if BUILD_BEOS
@@ -355,7 +354,6 @@
 -
 -clutch_jquerydir = $(clutch_jsdir)/jquery
 -clutch_jquery_DATA = \
--  web/javascript/jquery \
 -  web/javascript/jquery/json.min.js \
 -  web/javascript/jquery/jquery.contextmenu.min.js \
 -  web/javascript/jquery/jquery.min.js \
diff --git a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
index 6d104036afc4..a94d27d67680 100644
--- a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
+++ b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2008-07-14 14:20:59.000000000 -0500
-+++ configure.ac	2008-07-14 14:28:56.000000000 -0500
+--- configure.ac.orig	2008-09-17 12:23:52.000000000 -0500
++++ configure.ac	2008-09-17 12:28:32.000000000 -0500
 @@ -10,20 +10,16 @@
  AM_INIT_AUTOMAKE([1.9 tar-ustar])
  AC_PROG_LIBTOOL
@@ -21,17 +21,16 @@
  AC_SUBST(LIBNOTIFY_MINIMUM)
  AC_SUBST(DBUS_GLIB_MINIMUM)
  
-@@ -44,7 +40,8 @@
+@@ -44,7 +40,7 @@
  
  AC_SEARCH_LIBS([socket], [socket net])
  AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM])
-+AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
-+AC_CHECK_LIB([ssl],[SSL_library_init])
+-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
++CHECK_SSL()
  PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
  
  AC_SYS_LARGEFILE
-@@ -87,20 +84,14 @@
+@@ -87,20 +83,14 @@
                     gthread-2.0 >= $GLIB_MINIMUM],
                    [have_gtk=yes],
                    [have_gtk=no])
@@ -56,7 +55,7 @@
  fi
  AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
  AC_SUBST(GTK_LIBS)
-@@ -158,152 +149,14 @@
+@@ -158,152 +148,14 @@
  
  dnl ----------------------------------------------------------------------------
  dnl
@@ -209,7 +208,7 @@
                   gtk/Makefile
                   gtk/icons/Makefile
                   po/Makefile.in])
-@@ -317,14 +170,9 @@
+@@ -317,14 +169,9 @@
  
          Source code location:       ${srcdir}
          Compiler:                   ${CXX}
@@ -224,9 +223,9 @@
 -        Build wxWidgets client:     ${build_wx}
  
  "
---- Makefile.am.orig	2008-07-14 14:31:57.000000000 -0500
-+++ Makefile.am	2008-07-14 14:33:13.000000000 -0500
-@@ -1,104 +1,6 @@
+--- Makefile.am.orig	2008-09-17 12:23:56.000000000 -0500
++++ Makefile.am	2008-09-17 12:29:33.000000000 -0500
+@@ -1,103 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -if BUILD_BEOS
@@ -291,7 +290,6 @@
 -
 -clutch_jquerydir = $(clutch_jsdir)/jquery
 -clutch_jquery_DATA = \
--  web/javascript/jquery \
 -  web/javascript/jquery/json.min.js \
 -  web/javascript/jquery/jquery.contextmenu.min.js \
 -  web/javascript/jquery/jquery.min.js \
diff --git a/net-p2p/transmission-cli/files/transmission-web-configure.ac b/net-p2p/transmission-cli/files/transmission-web-configure.ac
index 95299987e7a5..fec68965551c 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-07-13 22:42:28.000000000 -0500
-+++ configure.ac	2008-07-14 16:12:09.000000000 -0500
-@@ -6,325 +6,10 @@
+--- configure.ac.orig	2008-09-17 12:30:29.000000000 -0500
++++ configure.ac	2008-09-17 12:33:50.000000000 -0500
+@@ -6,325 +6,15 @@
  
  AC_PREREQ(2.54)
  dnl AM_CONFIG_HEADER(config.h)
@@ -42,7 +42,7 @@
 -
 -AC_SEARCH_LIBS([socket], [socket net])
 -AC_SEARCH_LIBS([gethostbyname], [nsl bind])
--PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM])
+-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
 -PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
 -
 -AC_SYS_LARGEFILE
@@ -174,7 +174,7 @@
 -fi
 -AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
 -
- 
+-
 -
 -dnl ----------------------------------------------------------------------------
 -dnl
@@ -282,12 +282,12 @@
 -if test "x$have_msw" = "xyes"; then
 -    AC_DEFINE([HAVE_MSW], 1)
 -fi
--
--
--dnl ----------------------------------------------------------------------------
--dnl
--dnl  Generate the output
--
+ 
+ 
+ dnl ----------------------------------------------------------------------------
+ dnl
+ dnl  Generate the output
+ 
 -AC_CONFIG_FILES([Makefile
 -                 transmission.spec
 -                 beos/Makefile
@@ -327,8 +327,8 @@
 -        Build wxWidgets client:     ${build_wx}
 -
 -"
---- Makefile.am.orig	2008-07-14 16:11:59.000000000 -0500
-+++ Makefile.am	2008-07-14 16:11:59.000000000 -0500
+--- Makefile.am.orig	2008-09-17 12:30:32.000000000 -0500
++++ Makefile.am	2008-09-17 12:34:31.000000000 -0500
 @@ -1,46 +1,5 @@
  ACLOCAL_AMFLAGS = -I m4
  
@@ -376,7 +376,7 @@
  clutchdir = $(datadir)/transmission/web
  clutch_DATA = \
    web/index.html \
-@@ -97,8 +56,3 @@
+@@ -96,8 +55,3 @@
    web/images/buttons/info_general.png \
    web/images/buttons/torrent_buttons.png \
    web/images/buttons/info_activity.png