diff options
author | mezz <mezz@FreeBSD.org> | 2009-05-10 01:25:24 +0800 |
---|---|---|
committer | mezz <mezz@FreeBSD.org> | 2009-05-10 01:25:24 +0800 |
commit | b329e385857ce1ea8ca4486c23febf9c7f4b668d (patch) | |
tree | c60f33d17f99080cc2967c8b60701c3b8bd951f8 | |
parent | 1dd9c284c126bdbc5a25950d4f1f3696ed292758 (diff) | |
download | freebsd-ports-gnome-b329e385857ce1ea8ca4486c23febf9c7f4b668d.tar.gz freebsd-ports-gnome-b329e385857ce1ea8ca4486c23febf9c7f4b668d.tar.zst freebsd-ports-gnome-b329e385857ce1ea8ca4486c23febf9c7f4b668d.zip |
Update to 1.60.
-rw-r--r-- | net-p2p/transmission-cli/Makefile | 4 | ||||
-rw-r--r-- | net-p2p/transmission-cli/distinfo | 6 | ||||
-rw-r--r-- | net-p2p/transmission-cli/files/transmission-cli-configure.ac | 110 | ||||
-rw-r--r-- | net-p2p/transmission-cli/files/transmission-daemon-configure.ac | 110 | ||||
-rw-r--r-- | net-p2p/transmission-cli/files/transmission-gtk2-configure.ac | 121 | ||||
-rw-r--r-- | net-p2p/transmission-cli/files/transmission-web-configure.ac | 132 | ||||
-rw-r--r-- | net-p2p/transmission-daemon/Makefile | 2 | ||||
-rw-r--r-- | net-p2p/transmission-gtk2/Makefile | 2 | ||||
-rw-r--r-- | net-p2p/transmission-gtk2/pkg-plist | 6 | ||||
-rw-r--r-- | net-p2p/transmission/Makefile | 2 | ||||
-rw-r--r-- | www/transmission-web/pkg-plist | 4 |
11 files changed, 289 insertions, 210 deletions
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile index 7c2c58a6ff01..fbb570138997 100644 --- a/net-p2p/transmission-cli/Makefile +++ b/net-p2p/transmission-cli/Makefile @@ -6,8 +6,8 @@ # PORTNAME= transmission -PORTVERSION= 1.51 -PORTREVISION?= 1 +PORTVERSION= 1.60 +PORTREVISION?= 0 CATEGORIES?= net-p2p MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ PKGNAMESUFFIX?= -cli diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo index d068d4484c12..ae02f27bbb7c 100644 --- a/net-p2p/transmission-cli/distinfo +++ b/net-p2p/transmission-cli/distinfo @@ -1,3 +1,3 @@ -MD5 (transmission-1.51.tar.bz2) = b93439fbd0040ad6eb448f70a48355f5 -SHA256 (transmission-1.51.tar.bz2) = 507775f0c2fb962597a2433edb5a83e15ba3ac5624ba5b4b04a97c523ff17a6e -SIZE (transmission-1.51.tar.bz2) = 4574671 +MD5 (transmission-1.60.tar.bz2) = 8b30cf189240f0c50ccd11c618a6906a +SHA256 (transmission-1.60.tar.bz2) = a1f1dad64022fd3c5f820cc6175e26323a1eb70d8c6d79bcde82f956666489f2 +SIZE (transmission-1.60.tar.bz2) = 4772222 diff --git a/net-p2p/transmission-cli/files/transmission-cli-configure.ac b/net-p2p/transmission-cli/files/transmission-cli-configure.ac index edfe5935a2ae..600628452b63 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 2009-02-27 22:27:39.000000000 -0600 -+++ configure.ac 2009-02-27 22:30:26.000000000 -0600 +--- 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 @@ -18,7 +18,7 @@ if test m4_substr(peer_id_prefix,6,1) = "X"; then AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission]) else -@@ -40,28 +32,14 @@ +@@ -40,22 +32,8 @@ fi AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno") @@ -41,14 +41,20 @@ AC_PROG_CC AC_PROG_CXX - AC_C_INLINE - if test "x$GCC" = "xyes" ; then -- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" -+ CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" - fi - +@@ -81,12 +59,6 @@ AC_HEADER_STDC -@@ -80,7 +58,7 @@ + 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]) @@ -57,7 +63,38 @@ PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM]) AC_PATH_ZLIB -@@ -112,189 +90,9 @@ +@@ -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) @@ -159,27 +196,6 @@ - AC_SUBST(transmissionlocaledir) -fi - --dnl ---------------------------------------------------------------------------- --dnl --dnl wxWidgets detection for the wxWidgets client -- --build_wx=no --AC_ARG_ENABLE([wx], -- AS_HELP_STRING([--enable-wx],[build wxWidgets client]), -- [want_wx=${enableval}], -- [want_wx=no]) --if test "x$want_wx" != "xno"; then -- AM_OPTIONS_WXCONFIG -- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no]) -- if test "x$have_wx" = "xyes"; then -- build_wx=yes -- elif test "x$want_wx" = "xyes"; then -- AC_MSG_ERROR("wxWidgets not found!") -- fi --fi --AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"]) -- -- - -dnl ---------------------------------------------------------------------------- -dnl @@ -190,7 +206,7 @@ +build_cli="yes" have_msw="no" -case $host_os in - +- - *cygwin|*mingw32*) - have_msw="yes" - CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows" @@ -248,7 +264,7 @@ if test "x$have_msw" = "xyes"; then AC_DEFINE([HAVE_MSW], 1) fi -@@ -305,20 +103,11 @@ +@@ -347,18 +142,11 @@ dnl Generate the output AC_CONFIG_FILES([Makefile @@ -261,8 +277,6 @@ third-party/miniupnp/Makefile - third-party/libnatpmp/Makefile - macosx/Makefile -- wx/Makefile -- wx/images/Makefile - gtk/Makefile - gtk/icons/Makefile - po/Makefile.in]) @@ -270,7 +284,7 @@ ac_configure_args="$ac_configure_args --enable-static --disable-shared -q" AC_OUTPUT -@@ -330,12 +119,5 @@ +@@ -370,11 +158,5 @@ Source code location: ${srcdir} Compiler: ${CXX} Build Command-Line client: ${build_cli} @@ -280,12 +294,11 @@ - ... dbus-glib support: ${use_dbus_glib} - ... libnotify support: ${use_libnotify} - Build OS X client: ${build_mac} -- Build wxWidgets client: ${build_wx} " ---- Makefile.am.orig 2009-02-27 22:27:44.000000000 -0600 -+++ Makefile.am 2009-02-27 22:31:09.000000000 -0600 -@@ -1,104 +1,6 @@ +--- 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 @@ -302,9 +315,6 @@ -if BUILD_MAC - MAC_DIR = macosx -endif --if BUILD_WX -- WX_DIR = wx --endif - SUBDIRS = \ - doc \ @@ -314,11 +324,11 @@ - $(CLI_DIR) \ - $(BEOS_DIR) \ - $(GTK_DIR) \ -- $(MAC_DIR) \ -- $(WX_DIR) +- $(MAC_DIR) - -EXTRA_DIST = \ - web \ +- qt \ - NEWS \ - AUTHORS \ - COPYING \ @@ -356,8 +366,7 @@ - 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 \ -- web/javascript/jquery/jquery.dimensions.min.js +- web/javascript/jquery/jquery.transmenu.min.js - -clutch_imagesdir = $(clutchdir)/images -clutch_images_DATA = \ @@ -384,7 +393,10 @@ - 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/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 \ diff --git a/net-p2p/transmission-cli/files/transmission-daemon-configure.ac b/net-p2p/transmission-cli/files/transmission-daemon-configure.ac index e1b54df34167..0158b236a10b 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 2009-02-27 22:32:08.000000000 -0600 -+++ configure.ac 2009-02-27 22:34:39.000000000 -0600 +--- 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 @@ -18,7 +18,7 @@ if test m4_substr(peer_id_prefix,6,1) = "X"; then AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission]) else -@@ -40,28 +32,14 @@ +@@ -40,22 +32,8 @@ fi AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno") @@ -41,14 +41,20 @@ AC_PROG_CC AC_PROG_CXX - AC_C_INLINE - if test "x$GCC" = "xyes" ; then -- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" -+ CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" - fi - +@@ -81,12 +59,6 @@ AC_HEADER_STDC -@@ -80,7 +58,7 @@ + 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]) @@ -57,7 +63,38 @@ PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM]) AC_PATH_ZLIB -@@ -112,189 +90,9 @@ +@@ -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) @@ -159,27 +196,6 @@ - AC_SUBST(transmissionlocaledir) -fi - --dnl ---------------------------------------------------------------------------- --dnl --dnl wxWidgets detection for the wxWidgets client -- --build_wx=no --AC_ARG_ENABLE([wx], -- AS_HELP_STRING([--enable-wx],[build wxWidgets client]), -- [want_wx=${enableval}], -- [want_wx=no]) --if test "x$want_wx" != "xno"; then -- AM_OPTIONS_WXCONFIG -- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no]) -- if test "x$have_wx" = "xyes"; then -- build_wx=yes -- elif test "x$want_wx" = "xyes"; then -- AC_MSG_ERROR("wxWidgets not found!") -- fi --fi --AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"]) -- -- - -dnl ---------------------------------------------------------------------------- -dnl @@ -190,7 +206,7 @@ +build_daemon="yes" have_msw="no" -case $host_os in - +- - *cygwin|*mingw32*) - have_msw="yes" - CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows" @@ -248,7 +264,7 @@ if test "x$have_msw" = "xyes"; then AC_DEFINE([HAVE_MSW], 1) fi -@@ -305,20 +103,11 @@ +@@ -347,18 +142,11 @@ dnl Generate the output AC_CONFIG_FILES([Makefile @@ -261,8 +277,6 @@ third-party/miniupnp/Makefile - third-party/libnatpmp/Makefile - macosx/Makefile -- wx/Makefile -- wx/images/Makefile - gtk/Makefile - gtk/icons/Makefile - po/Makefile.in]) @@ -270,7 +284,7 @@ ac_configure_args="$ac_configure_args --enable-static --disable-shared -q" AC_OUTPUT -@@ -329,13 +118,6 @@ +@@ -369,12 +157,6 @@ Source code location: ${srcdir} Compiler: ${CXX} @@ -281,12 +295,11 @@ - ... dbus-glib support: ${use_dbus_glib} - ... libnotify support: ${use_libnotify} - Build OS X client: ${build_mac} -- Build wxWidgets client: ${build_wx} " ---- Makefile.am.orig 2009-02-27 22:32:11.000000000 -0600 -+++ Makefile.am 2009-02-27 22:35:04.000000000 -0600 -@@ -1,104 +1,6 @@ +--- 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 @@ -303,9 +316,6 @@ -if BUILD_MAC - MAC_DIR = macosx -endif --if BUILD_WX -- WX_DIR = wx --endif - SUBDIRS = \ - doc \ @@ -315,11 +325,11 @@ - $(CLI_DIR) \ - $(BEOS_DIR) \ - $(GTK_DIR) \ -- $(MAC_DIR) \ -- $(WX_DIR) +- $(MAC_DIR) - -EXTRA_DIST = \ - web \ +- qt \ - NEWS \ - AUTHORS \ - COPYING \ @@ -357,8 +367,7 @@ - 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 \ -- web/javascript/jquery/jquery.dimensions.min.js +- web/javascript/jquery/jquery.transmenu.min.js - -clutch_imagesdir = $(clutchdir)/images -clutch_images_DATA = \ @@ -385,7 +394,10 @@ - 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/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 \ diff --git a/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac b/net-p2p/transmission-cli/files/transmission-gtk2-configure.ac index 1fbe149d7ad0..f7443fe1185a 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 2009-02-27 22:36:03.000000000 -0600 -+++ configure.ac 2009-02-27 22:40:32.000000000 -0600 +--- 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 @@ -39,16 +39,20 @@ AC_SUBST(LIBNOTIFY_MINIMUM) AC_SUBST(DBUS_GLIB_MINIMUM) -@@ -61,7 +49,7 @@ - AC_PROG_CXX - AC_C_INLINE - if test "x$GCC" = "xyes" ; then -- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" -+ CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" - fi - +@@ -81,12 +69,6 @@ AC_HEADER_STDC -@@ -80,7 +68,7 @@ + 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]) @@ -57,7 +61,38 @@ PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM]) AC_PATH_ZLIB -@@ -123,20 +111,14 @@ +@@ -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]) @@ -82,7 +117,7 @@ fi AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"]) AC_SUBST(GTK_LIBS) -@@ -189,112 +171,18 @@ +@@ -252,91 +211,22 @@ fi fi @@ -106,27 +141,7 @@ - transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(transmissionlocaledir) -fi -- --dnl ---------------------------------------------------------------------------- --dnl --dnl wxWidgets detection for the wxWidgets client -- --build_wx=no --AC_ARG_ENABLE([wx], -- AS_HELP_STRING([--enable-wx],[build wxWidgets client]), -- [want_wx=${enableval}], -- [want_wx=no]) --if test "x$want_wx" != "xno"; then -- AM_OPTIONS_WXCONFIG -- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no]) -- if test "x$have_wx" = "xyes"; then -- build_wx=yes -- elif test "x$want_wx" = "xyes"; then -- AC_MSG_ERROR("wxWidgets not found!") -- fi --fi --AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"]) -- ++use_nls=yes +IT_PROG_INTLTOOL([0.23],[no-xml]) +AC_CHECK_HEADERS([libintl.h]) +GETTEXT_PACKAGE=transmission @@ -137,15 +152,15 @@ +AC_SUBST(transmissionlocaledir) --dnl ---------------------------------------------------------------------------- --dnl --dnl platform-specific stuff. -- + 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" @@ -203,7 +218,7 @@ if test "x$have_msw" = "xyes"; then AC_DEFINE([HAVE_MSW], 1) fi -@@ -305,17 +193,10 @@ +@@ -347,15 +237,10 @@ dnl Generate the output AC_CONFIG_FILES([Makefile @@ -216,12 +231,10 @@ third-party/miniupnp/Makefile third-party/libnatpmp/Makefile - macosx/Makefile -- wx/Makefile -- wx/images/Makefile gtk/Makefile gtk/icons/Makefile po/Makefile.in]) -@@ -329,13 +210,9 @@ +@@ -369,12 +254,9 @@ Source code location: ${srcdir} Compiler: ${CXX} @@ -232,12 +245,11 @@ ... dbus-glib support: ${use_dbus_glib} ... libnotify support: ${use_libnotify} - Build OS X client: ${build_mac} -- Build wxWidgets client: ${build_wx} " ---- Makefile.am.orig 2009-02-27 22:36:05.000000000 -0600 -+++ Makefile.am 2009-02-27 22:41:04.000000000 -0600 -@@ -1,104 +1,6 @@ +--- 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 @@ -254,9 +266,6 @@ -if BUILD_MAC - MAC_DIR = macosx -endif --if BUILD_WX -- WX_DIR = wx --endif - SUBDIRS = \ - doc \ @@ -266,11 +275,11 @@ - $(CLI_DIR) \ - $(BEOS_DIR) \ - $(GTK_DIR) \ -- $(MAC_DIR) \ -- $(WX_DIR) +- $(MAC_DIR) - -EXTRA_DIST = \ - web \ +- qt \ - NEWS \ - AUTHORS \ - COPYING \ @@ -308,8 +317,7 @@ - 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 \ -- web/javascript/jquery/jquery.dimensions.min.js +- web/javascript/jquery/jquery.transmenu.min.js - -clutch_imagesdir = $(clutchdir)/images -clutch_images_DATA = \ @@ -336,7 +344,10 @@ - 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/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 \ diff --git a/net-p2p/transmission-cli/files/transmission-web-configure.ac b/net-p2p/transmission-cli/files/transmission-web-configure.ac index 061806b6e4d1..ac117736da77 100644 --- a/net-p2p/transmission-cli/files/transmission-web-configure.ac +++ b/net-p2p/transmission-cli/files/transmission-web-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2009-02-27 22:42:08.000000000 -0600 -+++ configure.ac 2009-02-27 22:44:26.000000000 -0600 +--- 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]) @@ -24,7 +24,7 @@ if test m4_substr(peer_id_prefix,6,1) = "X"; then AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission]) else -@@ -40,302 +30,13 @@ +@@ -40,341 +30,13 @@ fi AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno") @@ -49,7 +49,21 @@ -AC_PROG_CXX -AC_C_INLINE -if test "x$GCC" = "xyes" ; then -- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" +- +- CFLAGS="$CFLAGS -std=gnu99 -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 @@ -65,7 +79,7 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET -ACX_PTHREAD - +- -AC_SEARCH_LIBS([socket], [socket net]) -AC_SEARCH_LIBS([gethostbyname], [nsl bind]) -PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()]) @@ -74,6 +88,55 @@ - -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 @@ -197,31 +260,10 @@ - transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(transmissionlocaledir) -fi -- --dnl ---------------------------------------------------------------------------- --dnl --dnl wxWidgets detection for the wxWidgets client -- --build_wx=no --AC_ARG_ENABLE([wx], -- AS_HELP_STRING([--enable-wx],[build wxWidgets client]), -- [want_wx=${enableval}], -- [want_wx=no]) --if test "x$want_wx" != "xno"; then -- AM_OPTIONS_WXCONFIG -- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no]) -- if test "x$have_wx" = "xyes"; then -- build_wx=yes -- elif test "x$want_wx" = "xyes"; then -- AC_MSG_ERROR("wxWidgets not found!") -- fi --fi --AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"]) -- -- -- --dnl ---------------------------------------------------------------------------- --dnl + + + dnl ---------------------------------------------------------------------------- + dnl -dnl platform-specific stuff. - -AC_CANONICAL_HOST @@ -287,9 +329,9 @@ - AC_DEFINE([HAVE_MSW], 1) -fi -AM_CONDITIONAL(WIN32, test "x$have_msw" = "xyes") - - dnl ---------------------------------------------------------------------------- - dnl +- +-dnl ---------------------------------------------------------------------------- +-dnl dnl Generate the output -AC_CONFIG_FILES([Makefile @@ -302,8 +344,6 @@ - third-party/miniupnp/Makefile - third-party/libnatpmp/Makefile - macosx/Makefile -- wx/Makefile -- wx/images/Makefile - gtk/Makefile - gtk/icons/Makefile - po/Makefile.in]) @@ -325,12 +365,11 @@ - ... dbus-glib support: ${use_dbus_glib} - ... libnotify support: ${use_libnotify} - Build OS X client: ${build_mac} -- Build wxWidgets client: ${build_wx} - -" ---- Makefile.am.orig 2009-02-27 22:42:11.000000000 -0600 -+++ Makefile.am 2009-02-27 22:44:55.000000000 -0600 -@@ -1,46 +1,5 @@ +--- 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 @@ -347,9 +386,6 @@ -if BUILD_MAC - MAC_DIR = macosx -endif --if BUILD_WX -- WX_DIR = wx --endif - -SUBDIRS = \ - doc \ @@ -359,11 +395,11 @@ - $(CLI_DIR) \ - $(BEOS_DIR) \ - $(GTK_DIR) \ -- $(MAC_DIR) \ -- $(WX_DIR) +- $(MAC_DIR) - -EXTRA_DIST = \ - web \ +- qt \ - NEWS \ - AUTHORS \ - COPYING \ @@ -377,10 +413,10 @@ clutchdir = $(datadir)/transmission/web clutch_DATA = \ web/index.html \ -@@ -97,8 +56,3 @@ - web/images/buttons/info_general.png \ - web/images/buttons/torrent_buttons.png \ - web/images/buttons/info_activity.png +@@ -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 \ diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile index bf96203f3139..a713037ad5eb 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 diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile index 3539a59c6e36..e430b3bc84ab 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 diff --git a/net-p2p/transmission-gtk2/pkg-plist b/net-p2p/transmission-gtk2/pkg-plist index fb3d375f60cb..d5ef17d5b84c 100644 --- a/net-p2p/transmission-gtk2/pkg-plist +++ b/net-p2p/transmission-gtk2/pkg-plist @@ -11,6 +11,8 @@ share/icons/hicolor/32x32/apps/transmission.png share/icons/hicolor/48x48/apps/transmission.png share/icons/hicolor/scalable/apps/transmission.svg share/locale/ar/LC_MESSAGES/transmission.mo +share/locale/ast/LC_MESSAGES/transmission.mo +share/locale/be@latin/LC_MESSAGES/transmission.mo share/locale/bg/LC_MESSAGES/transmission.mo share/locale/br/LC_MESSAGES/transmission.mo share/locale/ca/LC_MESSAGES/transmission.mo @@ -76,6 +78,10 @@ share/pixmaps/transmission.png @dirrmtry share/locale/kk @dirrmtry share/locale/ckb/LC_MESSAGES @dirrmtry share/locale/ckb +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile index 2f4970bf5818..858047ca1439 100644 --- a/net-p2p/transmission/Makefile +++ b/net-p2p/transmission/Makefile @@ -6,7 +6,7 @@ # PORTNAME= transmission -PORTVERSION= 1.51 +PORTVERSION= 1.60 CATEGORIES= net-p2p MASTER_SITES= # empty DISTFILES= # empty diff --git a/www/transmission-web/pkg-plist b/www/transmission-web/pkg-plist index 9cc1580211b0..198c97bff7da 100644 --- a/www/transmission-web/pkg-plist +++ b/www/transmission-web/pkg-plist @@ -3,7 +3,10 @@ %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/web/LICENSE +%%DATADIR%%/web/images/buttons/file_priority_buttons.png +%%DATADIR%%/web/images/buttons/file_wanted_buttons.png %%DATADIR%%/web/images/buttons/info_activity.png +%%DATADIR%%/web/images/buttons/info_files.png %%DATADIR%%/web/images/buttons/info_general.png %%DATADIR%%/web/images/buttons/tab_backgrounds.png %%DATADIR%%/web/images/buttons/toolbar_buttons.png @@ -22,7 +25,6 @@ %%DATADIR%%/web/javascript/common.js %%DATADIR%%/web/javascript/dialog.js %%DATADIR%%/web/javascript/jquery/jquery.contextmenu.min.js -%%DATADIR%%/web/javascript/jquery/jquery.dimensions.min.js %%DATADIR%%/web/javascript/jquery/jquery.form.min.js %%DATADIR%%/web/javascript/jquery/jquery.min.js %%DATADIR%%/web/javascript/jquery/jquery.transmenu.min.js |