aboutsummaryrefslogtreecommitdiffstats
path: root/net-p2p/transmission-cli
diff options
context:
space:
mode:
authormezz <mezz@FreeBSD.org>2008-09-23 12:34:52 +0800
committermezz <mezz@FreeBSD.org>2008-09-23 12:34:52 +0800
commit8fa4c31cc8abb1cc8a19f7f59441662bb56c3538 (patch)
tree7660584edf2dc2614b1c5c2626a0dde88c157eb3 /net-p2p/transmission-cli
parent796b4a4670e13efa5cf51e54949e8fb52ce6a89a (diff)
downloadfreebsd-ports-gnome-8fa4c31cc8abb1cc8a19f7f59441662bb56c3538.tar.gz
freebsd-ports-gnome-8fa4c31cc8abb1cc8a19f7f59441662bb56c3538.tar.zst
freebsd-ports-gnome-8fa4c31cc8abb1cc8a19f7f59441662bb56c3538.zip
Update to 1.34.
Diffstat (limited to 'net-p2p/transmission-cli')
-rw-r--r--net-p2p/transmission-cli/Makefile6
-rw-r--r--net-p2p/transmission-cli/distinfo6
-rw-r--r--net-p2p/transmission-cli/files/patch-check-ssl.m411
-rw-r--r--net-p2p/transmission-cli/files/transmission-cli-configure.ac22
-rw-r--r--net-p2p/transmission-cli/files/transmission-daemon-configure.ac22
-rw-r--r--net-p2p/transmission-cli/files/transmission-gtk2-configure.ac24
-rw-r--r--net-p2p/transmission-cli/files/transmission-web-configure.ac28
7 files changed, 62 insertions, 57 deletions
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 9f41afa7c401..b6ac36e8ef2c 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= transmission
-PORTVERSION= 1.33
+PORTVERSION= 1.34
PORTREVISION?= 0
CATEGORIES?= net-p2p
MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/
@@ -25,6 +25,7 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/t
USE_GNOME?= pkgconfig
USE_OPENSSL= yes
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
MAN1?= transmissioncli.1
.endif
@@ -43,8 +44,7 @@ general-patch:
@${REINPLACE_CMD} -e 's|SUBDIRS = . sample.*|SUBDIRS = .|g' \
${WRKSRC}/third-party/libevent/Makefile.*
@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$$(OPENSSL_CFLAGS)||g ; s|$$(OPENSSL_LIBS)||g ; \
- s|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
+ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
post-patch: general-patch
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index 078d42ccc521..8b8b0af2e48b 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-MD5 (transmission-1.33.tar.bz2) = 097a538a10e41c9e631ef23b11a2ddfa
-SHA256 (transmission-1.33.tar.bz2) = 71b03fbb6759321fc89948ebc5006a601aa46c96d013b7e02f9ac5e5b6175981
-SIZE (transmission-1.33.tar.bz2) = 4884148
+MD5 (transmission-1.34.tar.bz2) = c4ef93639bcb895c1b3d279b2f4e27b3
+SHA256 (transmission-1.34.tar.bz2) = a293c00e0eb99c84bc81b276d5de1eb18ed09659ac2e613814900b6634d971c2
+SIZE (transmission-1.34.tar.bz2) = 5401733
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