Date: Tue, 28 Apr 2009 09:21:01 GMT From: "Anatoly Y." <snelius@tsu.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/134060: UPDATE net-p2p/transmission Message-ID: <200904280921.n3S9L129051329@www.freebsd.org> Resent-Message-ID: <200904280930.n3S9U3XI047065@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134060
>Category: ports
>Synopsis: UPDATE net-p2p/transmission
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 28 09:30:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Anatoly Y.
>Release: 7.1-RELEASE-p5
>Organization:
TSUNet
>Environment:
FreeBSD netadmin.tsu.ru 7.1-RELEASE-p5 FreeBSD 7.1-RELEASE-p5 #3: Fri Apr 24 09:50:40 NOVST 2009 root@netadmin.tsu.ru:/usr/obj/usr/src/sys/netadmin i386
>Description:
Update for net-p2p/transmission-cli
1.51 -> 1.52
And + patch for net-p2p/transmission
>How-To-Repeat:
>Fix:
--- Makefile- 2009-04-28 16:17:31.000000000 +0700
+++ Makefile 2009-04-28 16:06:42.000000000 +0700
@@ -6,7 +6,7 @@
#
PORTNAME= transmission
-PORTVERSION= 1.51
+PORTVERSION= 1.52
CATEGORIES= net-p2p
MASTER_SITES= # empty
DISTFILES= # empty
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# transmission-cli
# transmission-cli/files
# transmission-cli/files/transmission-cli-configure.ac
# transmission-cli/files/transmission-daemon-configure.ac
# transmission-cli/files/transmission-gtk2-configure.ac
# transmission-cli/files/transmission-web-configure.ac
# transmission-cli/Makefile
# transmission-cli/distinfo
# transmission-cli/pkg-descr
# transmission-cli/pkg-plist
#
echo c - transmission-cli
mkdir -p transmission-cli > /dev/null 2>&1
echo c - transmission-cli/files
mkdir -p transmission-cli/files > /dev/null 2>&1
echo x - transmission-cli/files/transmission-cli-configure.ac
sed 's/^X//' >transmission-cli/files/transmission-cli-configure.ac << '1ad620710826c3f84423cff6fbc83010'
X--- configure.ac 2009-04-13 08:55:57.000000000 +0700
X+++ configure-cli.ac 2009-04-28 15:46:48.000000000 +0700
X@@ -21,17 +21,9 @@
X
X if test m4_substr(peer_id_prefix,6,1) = "0"; then
X supported_build=yes
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O3 -funroll-loops "
X- CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
X- fi
X AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
X else
X supported_build=no
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O0"
X- CXXFLAGS="$CXXFLAGS -g -O0"
X- fi
X if test m4_substr(peer_id_prefix,6,1) = "X"; then
X AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
X else
X@@ -40,28 +32,14 @@
X fi
X AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
X
X-OPENSSL_MINIMUM=0.9.4
X CURL_MINIMUM=7.16.3
X-GIO_MINIMUM=2.15.5
X-GLIB_MINIMUM=2.6.0
X-GTK_MINIMUM=2.6.0
X-WX_MINIMUM=2.6.0
X-LIBNOTIFY_MINIMUM=0.4.3
X-DBUS_GLIB_MINIMUM=0.70
X-AC_SUBST(OPENSSL_MINIMUM)
X AC_SUBST(CURL_MINIMUM)
X-AC_SUBST(GIO_MINIMUM)
X-AC_SUBST(GLIB_MINIMUM)
X-AC_SUBST(GTK_MINIMUM)
X-AC_SUBST(WX_MINIMUM)
X-AC_SUBST(LIBNOTIFY_MINIMUM)
X-AC_SUBST(DBUS_GLIB_MINIMUM)
X
X AC_PROG_CC
X AC_PROG_CXX
X AC_C_INLINE
X if test "x$GCC" = "xyes" ; then
X- 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"
X+ 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"
X fi
X
X AC_HEADER_STDC
X@@ -80,7 +58,7 @@
X
X AC_SEARCH_LIBS([socket], [socket net])
X AC_SEARCH_LIBS([gethostbyname], [nsl bind])
X-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
X+CHECK_SSL()
X PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
X AC_PATH_ZLIB
X
X@@ -112,189 +90,9 @@
X AC_SUBST(LIBEVENT_CPPFLAGS)
X
X
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl detection for the GTK+ client
X-
X-PKG_CHECK_MODULES(GTK,
X- [gtk+-2.0 >= $GTK_MINIMUM
X- glib-2.0 >= $GLIB_MINIMUM
X- gmodule-2.0 >= $GLIB_MINIMUM
X- gthread-2.0 >= $GLIB_MINIMUM],
X- [have_gtk=yes],
X- [have_gtk=no])
X-AC_ARG_ENABLE([gtk],
X- AS_HELP_STRING([--enable-gtk],[build gtk client]),
X- [want_gtk=${enableval}],
X- [want_gtk=${have_gtk}])
X-build_gtk=no
X-use_gio=no
X-use_libnotify=no
X-use_dbus_glib=no
X-if test "x$want_gtk" = "xyes" ; then
X- if test "x$have_gtk" = "xyes"; then
X- build_gtk=yes
X- else
X- AC_MSG_ERROR("GTK+ not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
X-AC_SUBST(GTK_LIBS)
X-AC_SUBST(GTK_CFLAGS)
X-
X-if test "x$build_gtk" = "xyes"; then
X-
X- PKG_CHECK_MODULES([GIO],
X- [gio-2.0 >= $GIO_MINIMUM],
X- [use_gio=yes],
X- [use_gio=no])
X- AC_SUBST(GIO_LIBS)
X- AC_SUBST(GIO_CFLAGS)
X- if test "x$use_gio" = "xyes"; then
X- AC_DEFINE([HAVE_GIO], 1)
X- fi
X-
X- PKG_CHECK_MODULES([LIBNOTIFY],
X- [libnotify >= $LIBNOTIFY_MINIMUM],
X- [have_libnotify=yes],
X- [have_libnotify=no])
X- AC_ARG_ENABLE([libnotify],
X- AS_HELP_STRING([--enable-libnotify],[enable notifications]),,
X- [enable_libnotify=yes])
X- use_libnotify=no
X- if test "x$enable_libnotify" = "xyes" ; then
X- if test "x$have_libnotify" = "xyes"; then
X- use_libnotify=yes
X- AC_SUBST(LIBNOTIFY_LIBS)
X- AC_SUBST(LIBNOTIFY_CFLAGS)
X- AC_DEFINE([HAVE_LIBNOTIFY], 1)
X- fi
X- fi
X-
X- PKG_CHECK_MODULES([DBUS_GLIB],
X- [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
X- [use_dbus_glib=yes],
X- [use_dbus_glib=no])
X- AC_SUBST(DBUS_GLIB_LIBS)
X- AC_SUBST(DBUS_GLIB_CFLAGS)
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_DEFINE([HAVE_DBUS_GLIB], 1)
X- fi
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
X- if test "x$DBUS_BINDING_TOOL" = xno; then
X- AC_MSG_WARN([Cannot find dbus-binding-tool])
X- use_dbus_glib="no (dbus-binding-tool not found)"
X- fi
X- fi
X-fi
X-
X-AC_ARG_ENABLE([nls],
X- AS_HELP_STRING([--enable-nls],[enable native language support]),,
X- [enable_nls=yes])
X-
X-if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
X- AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
X-fi
X-
X-use_nls=no
X-if test "x$enable_nls" = "xyes" ; then
X- use_nls=yes
X- IT_PROG_INTLTOOL([0.23],[no-xml])
X- AC_CHECK_HEADERS([libintl.h])
X- GETTEXT_PACKAGE=transmission
X- AC_SUBST(GETTEXT_PACKAGE)
X- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
X- AM_GLIB_GNU_GETTEXT
X- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
X- AC_SUBST(transmissionlocaledir)
X-fi
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl wxWidgets detection for the wxWidgets client
X-
X-build_wx=no
X-AC_ARG_ENABLE([wx],
X- AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
X- [want_wx=${enableval}],
X- [want_wx=no])
X-if test "x$want_wx" != "xno"; then
X- AM_OPTIONS_WXCONFIG
X- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
X- if test "x$have_wx" = "xyes"; then
X- build_wx=yes
X- elif test "x$want_wx" = "xyes"; then
X- AC_MSG_ERROR("wxWidgets not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
X-
X-
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl platform-specific stuff.
X-
X-AC_CANONICAL_HOST
X-have_darwin="no"
X+build_cli="yes"
X have_msw="no"
X-case $host_os in
X
X- *cygwin|*mingw32*)
X- have_msw="yes"
X- CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
X- CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
X- LIBS="$LIBS -lshell32 -lws2_32"
X- transmissionlocaledir="locale"
X- if test -z "$host_alias"; then
X- hostaliaswindres=
X- else
X- hostaliaswindres="$host_alias-windres";
X- fi
X- AC_CHECK_TOOL(WINDRES, windres)
X- ;;
X-
X- *darwin*)
X- have_darwin="yes"
X- # Make sure the Universal SDK is installed
X- if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
X- cat << EOF
X-You need to install the Universal SDK in order to build Transmission:
X- Get your Xcode CD or package
X- Restart the install
X- When it gets to "Installation Type", select "Customize"
X- Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
X- Finish the install.
X-EOF
X- exit 1
X- fi
X- ;;
X-
X-esac
X-
X-AC_ARG_ENABLE([cli],
X- [AS_HELP_STRING([--enable-cli],[build command-line client])],
X- [build_cli=${enableval}],
X- [build_cli="yes"])
X-AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
X-
X-AC_ARG_ENABLE([mac],
X- [AS_HELP_STRING([--enable-mac],[build OS X client])],
X- [build_mac=${enableval}],
X- [build_mac=${have_darwin}])
X-AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
X-
X-AC_ARG_ENABLE([daemon],
X- [AS_HELP_STRING([--enable-daemon],[build daemon])],
X- [build_daemon=${enableval}],
X- [build_daemon="yes"])
X-AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
X-
X-
X-if test "x$have_darwin" = "xyes"; then
X- AC_DEFINE([HAVE_DARWIN], 1)
X-fi
X if test "x$have_msw" = "xyes"; then
X AC_DEFINE([HAVE_MSW], 1)
X fi
X@@ -305,20 +103,11 @@
X dnl Generate the output
X
X AC_CONFIG_FILES([Makefile
X- transmission.spec
X cli/Makefile
X- daemon/Makefile
X- doc/Makefile
X libtransmission/Makefile
X third-party/Makefile
X third-party/miniupnp/Makefile
X- third-party/libnatpmp/Makefile
X- macosx/Makefile
X- wx/Makefile
X- wx/images/Makefile
X- gtk/Makefile
X- gtk/icons/Makefile
X- po/Makefile.in])
X+ third-party/libnatpmp/Makefile])
X
X ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
X AC_OUTPUT
X@@ -330,12 +119,5 @@
X Source code location: ${srcdir}
X Compiler: ${CXX}
X Build Command-Line client: ${build_cli}
X- Build Daemon: ${build_daemon}
X- Build GTK+ client: ${build_gtk}
X- ... gio support: ${use_gio}
X- ... dbus-glib support: ${use_dbus_glib}
X- ... libnotify support: ${use_libnotify}
X- Build OS X client: ${build_mac}
X- Build wxWidgets client: ${build_wx}
X
X "
X--- Makefile.am 2009-04-13 08:55:57.000000000 +0700
X+++ Makefile-cli.am 2009-04-28 15:30:09.000000000 +0700
X@@ -1,103 +1,6 @@
X ACLOCAL_AMFLAGS = -I m4
X
X-if BUILD_CLI
X- CLI_DIR = cli
X-endif
X-if BUILD_DAEMON
X-if !WIN32
X- DAEMON_DIR = daemon
X-endif
X-endif
X-if BUILD_GTK
X- GTK_DIR = gtk po
X-endif
X-if BUILD_MAC
X- MAC_DIR = macosx
X-endif
X-if BUILD_WX
X- WX_DIR = wx
X-endif
X-
X SUBDIRS = \
X- doc \
X third-party \
X libtransmission \
X- $(DAEMON_DIR) \
X- $(CLI_DIR) \
X- $(BEOS_DIR) \
X- $(GTK_DIR) \
X- $(MAC_DIR) \
X- $(WX_DIR)
X-
X-EXTRA_DIST = \
X- web \
X- NEWS \
X- AUTHORS \
X- COPYING \
X- README \
X- autogen.sh \
X- Transmission.xcodeproj/project.pbxproj \
X- intltool-extract.in \
X- intltool-merge.in \
X- intltool-update.in
X-
X-clutchdir = $(datadir)/transmission/web
X-clutch_DATA = \
X- web/index.html \
X- web/LICENSE
X-
X-clutch_cssdir = $(clutchdir)/stylesheets
X-clutch_css_DATA = \
X- web/stylesheets/iphone.css \
X- web/stylesheets/common.css \
X- web/stylesheets/ie6.css \
X- web/stylesheets/ie7.css
X-
X-clutch_jsdir = $(clutchdir)/javascript
X-clutch_js_DATA = \
X- web/javascript/menu.js \
X- web/javascript/dialog.js \
X- web/javascript/transmission.js \
X- web/javascript/transmission.remote.js \
X- web/javascript/common.js \
X- web/javascript/torrent.js
X-
X-clutch_jquerydir = $(clutch_jsdir)/jquery
X-clutch_jquery_DATA = \
X- web/javascript/jquery/json.min.js \
X- web/javascript/jquery/jquery.contextmenu.min.js \
X- web/javascript/jquery/jquery.min.js \
X- web/javascript/jquery/jquery.form.min.js \
X- web/javascript/jquery/jquery.transmenu.min.js
X-
X-clutch_imagesdir = $(clutchdir)/images
X-clutch_images_DATA = \
X- web/images/favicon.ico \
X- web/images/favicon.png \
X- web/images/webclip-icon.png
X-
X-clutch_graphicsdir = $(clutch_imagesdir)/graphics
X-clutch_graphics_DATA = \
X- web/images/graphics/logo.png \
X- web/images/graphics/chrome.png \
X- web/images/graphics/iphone_chrome.png \
X- web/images/graphics/filter_bar.png \
X- web/images/graphics/filter_icon.png \
X- web/images/graphics/transfer_arrows.png
X-
X-clutch_progressdir = $(clutch_imagesdir)/progress
X-clutch_progress_DATA = \
X- web/images/progress/progress.png
X-
X-clutch_buttonsdir = $(clutch_imagesdir)/buttons
X-clutch_buttons_DATA = \
X- web/images/buttons/tab_backgrounds.png \
X- web/images/buttons/toolbar_buttons.png \
X- web/images/buttons/info_general.png \
X- web/images/buttons/torrent_buttons.png \
X- web/images/buttons/info_activity.png
X-
X-DISTCLEANFILES = \
X- intltool-extract \
X- intltool-merge \
X- intltool-update
X+ cli
1ad620710826c3f84423cff6fbc83010
echo x - transmission-cli/files/transmission-daemon-configure.ac
sed 's/^X//' >transmission-cli/files/transmission-daemon-configure.ac << '5401627c5d814003bd8e8372fa517f0b'
X--- configure.ac 2009-04-13 08:55:57.000000000 +0700
X+++ configure-daemon.ac 2009-04-28 15:48:30.000000000 +0700
X@@ -21,17 +21,9 @@
X
X if test m4_substr(peer_id_prefix,6,1) = "0"; then
X supported_build=yes
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O3 -funroll-loops "
X- CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
X- fi
X AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
X else
X supported_build=no
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O0"
X- CXXFLAGS="$CXXFLAGS -g -O0"
X- fi
X if test m4_substr(peer_id_prefix,6,1) = "X"; then
X AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
X else
X@@ -40,28 +32,14 @@
X fi
X AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
X
X-OPENSSL_MINIMUM=0.9.4
X CURL_MINIMUM=7.16.3
X-GIO_MINIMUM=2.15.5
X-GLIB_MINIMUM=2.6.0
X-GTK_MINIMUM=2.6.0
X-WX_MINIMUM=2.6.0
X-LIBNOTIFY_MINIMUM=0.4.3
X-DBUS_GLIB_MINIMUM=0.70
X-AC_SUBST(OPENSSL_MINIMUM)
X AC_SUBST(CURL_MINIMUM)
X-AC_SUBST(GIO_MINIMUM)
X-AC_SUBST(GLIB_MINIMUM)
X-AC_SUBST(GTK_MINIMUM)
X-AC_SUBST(WX_MINIMUM)
X-AC_SUBST(LIBNOTIFY_MINIMUM)
X-AC_SUBST(DBUS_GLIB_MINIMUM)
X
X AC_PROG_CC
X AC_PROG_CXX
X AC_C_INLINE
X if test "x$GCC" = "xyes" ; then
X- 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"
X+ 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"
X fi
X
X AC_HEADER_STDC
X@@ -80,7 +58,7 @@
X
X AC_SEARCH_LIBS([socket], [socket net])
X AC_SEARCH_LIBS([gethostbyname], [nsl bind])
X-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
X+CHECK_SSL()
X PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
X AC_PATH_ZLIB
X
X@@ -112,189 +90,9 @@
X AC_SUBST(LIBEVENT_CPPFLAGS)
X
X
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl detection for the GTK+ client
X-
X-PKG_CHECK_MODULES(GTK,
X- [gtk+-2.0 >= $GTK_MINIMUM
X- glib-2.0 >= $GLIB_MINIMUM
X- gmodule-2.0 >= $GLIB_MINIMUM
X- gthread-2.0 >= $GLIB_MINIMUM],
X- [have_gtk=yes],
X- [have_gtk=no])
X-AC_ARG_ENABLE([gtk],
X- AS_HELP_STRING([--enable-gtk],[build gtk client]),
X- [want_gtk=${enableval}],
X- [want_gtk=${have_gtk}])
X-build_gtk=no
X-use_gio=no
X-use_libnotify=no
X-use_dbus_glib=no
X-if test "x$want_gtk" = "xyes" ; then
X- if test "x$have_gtk" = "xyes"; then
X- build_gtk=yes
X- else
X- AC_MSG_ERROR("GTK+ not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
X-AC_SUBST(GTK_LIBS)
X-AC_SUBST(GTK_CFLAGS)
X-
X-if test "x$build_gtk" = "xyes"; then
X-
X- PKG_CHECK_MODULES([GIO],
X- [gio-2.0 >= $GIO_MINIMUM],
X- [use_gio=yes],
X- [use_gio=no])
X- AC_SUBST(GIO_LIBS)
X- AC_SUBST(GIO_CFLAGS)
X- if test "x$use_gio" = "xyes"; then
X- AC_DEFINE([HAVE_GIO], 1)
X- fi
X-
X- PKG_CHECK_MODULES([LIBNOTIFY],
X- [libnotify >= $LIBNOTIFY_MINIMUM],
X- [have_libnotify=yes],
X- [have_libnotify=no])
X- AC_ARG_ENABLE([libnotify],
X- AS_HELP_STRING([--enable-libnotify],[enable notifications]),,
X- [enable_libnotify=yes])
X- use_libnotify=no
X- if test "x$enable_libnotify" = "xyes" ; then
X- if test "x$have_libnotify" = "xyes"; then
X- use_libnotify=yes
X- AC_SUBST(LIBNOTIFY_LIBS)
X- AC_SUBST(LIBNOTIFY_CFLAGS)
X- AC_DEFINE([HAVE_LIBNOTIFY], 1)
X- fi
X- fi
X-
X- PKG_CHECK_MODULES([DBUS_GLIB],
X- [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
X- [use_dbus_glib=yes],
X- [use_dbus_glib=no])
X- AC_SUBST(DBUS_GLIB_LIBS)
X- AC_SUBST(DBUS_GLIB_CFLAGS)
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_DEFINE([HAVE_DBUS_GLIB], 1)
X- fi
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
X- if test "x$DBUS_BINDING_TOOL" = xno; then
X- AC_MSG_WARN([Cannot find dbus-binding-tool])
X- use_dbus_glib="no (dbus-binding-tool not found)"
X- fi
X- fi
X-fi
X-
X-AC_ARG_ENABLE([nls],
X- AS_HELP_STRING([--enable-nls],[enable native language support]),,
X- [enable_nls=yes])
X-
X-if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
X- AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
X-fi
X-
X-use_nls=no
X-if test "x$enable_nls" = "xyes" ; then
X- use_nls=yes
X- IT_PROG_INTLTOOL([0.23],[no-xml])
X- AC_CHECK_HEADERS([libintl.h])
X- GETTEXT_PACKAGE=transmission
X- AC_SUBST(GETTEXT_PACKAGE)
X- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
X- AM_GLIB_GNU_GETTEXT
X- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
X- AC_SUBST(transmissionlocaledir)
X-fi
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl wxWidgets detection for the wxWidgets client
X-
X-build_wx=no
X-AC_ARG_ENABLE([wx],
X- AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
X- [want_wx=${enableval}],
X- [want_wx=no])
X-if test "x$want_wx" != "xno"; then
X- AM_OPTIONS_WXCONFIG
X- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
X- if test "x$have_wx" = "xyes"; then
X- build_wx=yes
X- elif test "x$want_wx" = "xyes"; then
X- AC_MSG_ERROR("wxWidgets not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
X-
X-
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl platform-specific stuff.
X-
X-AC_CANONICAL_HOST
X-have_darwin="no"
X+build_daemon="yes"
X have_msw="no"
X-case $host_os in
X
X- *cygwin|*mingw32*)
X- have_msw="yes"
X- CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
X- CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
X- LIBS="$LIBS -lshell32 -lws2_32"
X- transmissionlocaledir="locale"
X- if test -z "$host_alias"; then
X- hostaliaswindres=
X- else
X- hostaliaswindres="$host_alias-windres";
X- fi
X- AC_CHECK_TOOL(WINDRES, windres)
X- ;;
X-
X- *darwin*)
X- have_darwin="yes"
X- # Make sure the Universal SDK is installed
X- if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
X- cat << EOF
X-You need to install the Universal SDK in order to build Transmission:
X- Get your Xcode CD or package
X- Restart the install
X- When it gets to "Installation Type", select "Customize"
X- Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
X- Finish the install.
X-EOF
X- exit 1
X- fi
X- ;;
X-
X-esac
X-
X-AC_ARG_ENABLE([cli],
X- [AS_HELP_STRING([--enable-cli],[build command-line client])],
X- [build_cli=${enableval}],
X- [build_cli="yes"])
X-AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
X-
X-AC_ARG_ENABLE([mac],
X- [AS_HELP_STRING([--enable-mac],[build OS X client])],
X- [build_mac=${enableval}],
X- [build_mac=${have_darwin}])
X-AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
X-
X-AC_ARG_ENABLE([daemon],
X- [AS_HELP_STRING([--enable-daemon],[build daemon])],
X- [build_daemon=${enableval}],
X- [build_daemon="yes"])
X-AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
X-
X-
X-if test "x$have_darwin" = "xyes"; then
X- AC_DEFINE([HAVE_DARWIN], 1)
X-fi
X if test "x$have_msw" = "xyes"; then
X AC_DEFINE([HAVE_MSW], 1)
X fi
X@@ -305,20 +103,11 @@
X dnl Generate the output
X
X AC_CONFIG_FILES([Makefile
X- transmission.spec
X- cli/Makefile
X daemon/Makefile
X- doc/Makefile
X libtransmission/Makefile
X third-party/Makefile
X third-party/miniupnp/Makefile
X- third-party/libnatpmp/Makefile
X- macosx/Makefile
X- wx/Makefile
X- wx/images/Makefile
X- gtk/Makefile
X- gtk/icons/Makefile
X- po/Makefile.in])
X+ third-party/libnatpmp/Makefile])
X
X ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
X AC_OUTPUT
X@@ -329,13 +118,6 @@
X
X Source code location: ${srcdir}
X Compiler: ${CXX}
X- Build Command-Line client: ${build_cli}
X Build Daemon: ${build_daemon}
X- Build GTK+ client: ${build_gtk}
X- ... gio support: ${use_gio}
X- ... dbus-glib support: ${use_dbus_glib}
X- ... libnotify support: ${use_libnotify}
X- Build OS X client: ${build_mac}
X- Build wxWidgets client: ${build_wx}
X
X "
X--- Makefile.am 2009-04-13 08:55:57.000000000 +0700
X+++ Makefile-deamon.am 2009-04-28 15:32:28.000000000 +0700
X@@ -1,103 +1,6 @@
X ACLOCAL_AMFLAGS = -I m4
X
X-if BUILD_CLI
X- CLI_DIR = cli
X-endif
X-if BUILD_DAEMON
X-if !WIN32
X- DAEMON_DIR = daemon
X-endif
X-endif
X-if BUILD_GTK
X- GTK_DIR = gtk po
X-endif
X-if BUILD_MAC
X- MAC_DIR = macosx
X-endif
X-if BUILD_WX
X- WX_DIR = wx
X-endif
X-
X SUBDIRS = \
X- doc \
X third-party \
X libtransmission \
X- $(DAEMON_DIR) \
X- $(CLI_DIR) \
X- $(BEOS_DIR) \
X- $(GTK_DIR) \
X- $(MAC_DIR) \
X- $(WX_DIR)
X-
X-EXTRA_DIST = \
X- web \
X- NEWS \
X- AUTHORS \
X- COPYING \
X- README \
X- autogen.sh \
X- Transmission.xcodeproj/project.pbxproj \
X- intltool-extract.in \
X- intltool-merge.in \
X- intltool-update.in
X-
X-clutchdir = $(datadir)/transmission/web
X-clutch_DATA = \
X- web/index.html \
X- web/LICENSE
X-
X-clutch_cssdir = $(clutchdir)/stylesheets
X-clutch_css_DATA = \
X- web/stylesheets/iphone.css \
X- web/stylesheets/common.css \
X- web/stylesheets/ie6.css \
X- web/stylesheets/ie7.css
X-
X-clutch_jsdir = $(clutchdir)/javascript
X-clutch_js_DATA = \
X- web/javascript/menu.js \
X- web/javascript/dialog.js \
X- web/javascript/transmission.js \
X- web/javascript/transmission.remote.js \
X- web/javascript/common.js \
X- web/javascript/torrent.js
X-
X-clutch_jquerydir = $(clutch_jsdir)/jquery
X-clutch_jquery_DATA = \
X- web/javascript/jquery/json.min.js \
X- web/javascript/jquery/jquery.contextmenu.min.js \
X- web/javascript/jquery/jquery.min.js \
X- web/javascript/jquery/jquery.form.min.js \
X- web/javascript/jquery/jquery.transmenu.min.js
X-
X-clutch_imagesdir = $(clutchdir)/images
X-clutch_images_DATA = \
X- web/images/favicon.ico \
X- web/images/favicon.png \
X- web/images/webclip-icon.png
X-
X-clutch_graphicsdir = $(clutch_imagesdir)/graphics
X-clutch_graphics_DATA = \
X- web/images/graphics/logo.png \
X- web/images/graphics/chrome.png \
X- web/images/graphics/iphone_chrome.png \
X- web/images/graphics/filter_bar.png \
X- web/images/graphics/filter_icon.png \
X- web/images/graphics/transfer_arrows.png
X-
X-clutch_progressdir = $(clutch_imagesdir)/progress
X-clutch_progress_DATA = \
X- web/images/progress/progress.png
X-
X-clutch_buttonsdir = $(clutch_imagesdir)/buttons
X-clutch_buttons_DATA = \
X- web/images/buttons/tab_backgrounds.png \
X- web/images/buttons/toolbar_buttons.png \
X- web/images/buttons/info_general.png \
X- web/images/buttons/torrent_buttons.png \
X- web/images/buttons/info_activity.png
X-
X-DISTCLEANFILES = \
X- intltool-extract \
X- intltool-merge \
X- intltool-update
X+ daemon
5401627c5d814003bd8e8372fa517f0b
echo x - transmission-cli/files/transmission-gtk2-configure.ac
sed 's/^X//' >transmission-cli/files/transmission-gtk2-configure.ac << '918ac177caa8b0db8d3ac87639624463'
X--- configure.ac 2009-04-13 08:55:57.000000000 +0700
X+++ configure-gtk2.ac 2009-04-28 15:48:37.000000000 +0700
X@@ -21,17 +21,9 @@
X
X if test m4_substr(peer_id_prefix,6,1) = "0"; then
X supported_build=yes
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O3 -funroll-loops "
X- CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
X- fi
X AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
X else
X supported_build=no
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O0"
X- CXXFLAGS="$CXXFLAGS -g -O0"
X- fi
X if test m4_substr(peer_id_prefix,6,1) = "X"; then
X AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
X else
X@@ -40,20 +32,16 @@
X fi
X AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
X
X-OPENSSL_MINIMUM=0.9.4
X CURL_MINIMUM=7.16.3
X GIO_MINIMUM=2.15.5
X GLIB_MINIMUM=2.6.0
X GTK_MINIMUM=2.6.0
X-WX_MINIMUM=2.6.0
X LIBNOTIFY_MINIMUM=0.4.3
X DBUS_GLIB_MINIMUM=0.70
X-AC_SUBST(OPENSSL_MINIMUM)
X AC_SUBST(CURL_MINIMUM)
X AC_SUBST(GIO_MINIMUM)
X AC_SUBST(GLIB_MINIMUM)
X AC_SUBST(GTK_MINIMUM)
X-AC_SUBST(WX_MINIMUM)
X AC_SUBST(LIBNOTIFY_MINIMUM)
X AC_SUBST(DBUS_GLIB_MINIMUM)
X
X@@ -61,7 +49,7 @@
X AC_PROG_CXX
X AC_C_INLINE
X if test "x$GCC" = "xyes" ; then
X- 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"
X+ 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"
X fi
X
X AC_HEADER_STDC
X@@ -80,7 +68,7 @@
X
X AC_SEARCH_LIBS([socket], [socket net])
X AC_SEARCH_LIBS([gethostbyname], [nsl bind])
X-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
X+CHECK_SSL()
X PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
X AC_PATH_ZLIB
X
X@@ -123,20 +111,14 @@
X gthread-2.0 >= $GLIB_MINIMUM],
X [have_gtk=yes],
X [have_gtk=no])
X-AC_ARG_ENABLE([gtk],
X- AS_HELP_STRING([--enable-gtk],[build gtk client]),
X- [want_gtk=${enableval}],
X- [want_gtk=${have_gtk}])
X build_gtk=no
X use_gio=no
X use_libnotify=no
X use_dbus_glib=no
X-if test "x$want_gtk" = "xyes" ; then
X- if test "x$have_gtk" = "xyes"; then
X- build_gtk=yes
X- else
X- AC_MSG_ERROR("GTK+ not found!")
X- fi
X+if test "x$have_gtk" = "xyes"; then
X+ build_gtk=yes
X+else
X+ AC_MSG_ERROR("GTK+ not found!")
X fi
X AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
X AC_SUBST(GTK_LIBS)
X@@ -189,112 +171,18 @@
X fi
X fi
X
X-AC_ARG_ENABLE([nls],
X- AS_HELP_STRING([--enable-nls],[enable native language support]),,
X- [enable_nls=yes])
X-
X-if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
X- AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
X-fi
X-
X-use_nls=no
X-if test "x$enable_nls" = "xyes" ; then
X- use_nls=yes
X- IT_PROG_INTLTOOL([0.23],[no-xml])
X- AC_CHECK_HEADERS([libintl.h])
X- GETTEXT_PACKAGE=transmission
X- AC_SUBST(GETTEXT_PACKAGE)
X- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
X- AM_GLIB_GNU_GETTEXT
X- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
X- AC_SUBST(transmissionlocaledir)
X-fi
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl wxWidgets detection for the wxWidgets client
X-
X-build_wx=no
X-AC_ARG_ENABLE([wx],
X- AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
X- [want_wx=${enableval}],
X- [want_wx=no])
X-if test "x$want_wx" != "xno"; then
X- AM_OPTIONS_WXCONFIG
X- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
X- if test "x$have_wx" = "xyes"; then
X- build_wx=yes
X- elif test "x$want_wx" = "xyes"; then
X- AC_MSG_ERROR("wxWidgets not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
X-
X+IT_PROG_INTLTOOL([0.23],[no-xml])
X+AC_CHECK_HEADERS([libintl.h])
X+GETTEXT_PACKAGE=transmission
X+AC_SUBST(GETTEXT_PACKAGE)
X+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
X+AM_GLIB_GNU_GETTEXT
X+transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
X+AC_SUBST(transmissionlocaledir)
X
X
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl platform-specific stuff.
X-
X-AC_CANONICAL_HOST
X-have_darwin="no"
X have_msw="no"
X-case $host_os in
X
X- *cygwin|*mingw32*)
X- have_msw="yes"
X- CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
X- CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
X- LIBS="$LIBS -lshell32 -lws2_32"
X- transmissionlocaledir="locale"
X- if test -z "$host_alias"; then
X- hostaliaswindres=
X- else
X- hostaliaswindres="$host_alias-windres";
X- fi
X- AC_CHECK_TOOL(WINDRES, windres)
X- ;;
X-
X- *darwin*)
X- have_darwin="yes"
X- # Make sure the Universal SDK is installed
X- if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
X- cat << EOF
X-You need to install the Universal SDK in order to build Transmission:
X- Get your Xcode CD or package
X- Restart the install
X- When it gets to "Installation Type", select "Customize"
X- Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
X- Finish the install.
X-EOF
X- exit 1
X- fi
X- ;;
X-
X-esac
X-
X-AC_ARG_ENABLE([cli],
X- [AS_HELP_STRING([--enable-cli],[build command-line client])],
X- [build_cli=${enableval}],
X- [build_cli="yes"])
X-AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
X-
X-AC_ARG_ENABLE([mac],
X- [AS_HELP_STRING([--enable-mac],[build OS X client])],
X- [build_mac=${enableval}],
X- [build_mac=${have_darwin}])
X-AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
X-
X-AC_ARG_ENABLE([daemon],
X- [AS_HELP_STRING([--enable-daemon],[build daemon])],
X- [build_daemon=${enableval}],
X- [build_daemon="yes"])
X-AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
X-
X-
X-if test "x$have_darwin" = "xyes"; then
X- AC_DEFINE([HAVE_DARWIN], 1)
X-fi
X if test "x$have_msw" = "xyes"; then
X AC_DEFINE([HAVE_MSW], 1)
X fi
X@@ -305,17 +193,10 @@
X dnl Generate the output
X
X AC_CONFIG_FILES([Makefile
X- transmission.spec
X- cli/Makefile
X- daemon/Makefile
X- doc/Makefile
X libtransmission/Makefile
X third-party/Makefile
X third-party/miniupnp/Makefile
X third-party/libnatpmp/Makefile
X- macosx/Makefile
X- wx/Makefile
X- wx/images/Makefile
X gtk/Makefile
X gtk/icons/Makefile
X po/Makefile.in])
X@@ -329,13 +210,9 @@
X
X Source code location: ${srcdir}
X Compiler: ${CXX}
X- Build Command-Line client: ${build_cli}
X- Build Daemon: ${build_daemon}
X Build GTK+ client: ${build_gtk}
X ... gio support: ${use_gio}
X ... dbus-glib support: ${use_dbus_glib}
X ... libnotify support: ${use_libnotify}
X- Build OS X client: ${build_mac}
X- Build wxWidgets client: ${build_wx}
X
X "
X--- Makefile.am 2009-04-13 08:55:57.000000000 +0700
X+++ Makefile-gtk2.am 2009-04-28 15:33:12.000000000 +0700
X@@ -1,103 +1,6 @@
X ACLOCAL_AMFLAGS = -I m4
X
X-if BUILD_CLI
X- CLI_DIR = cli
X-endif
X-if BUILD_DAEMON
X-if !WIN32
X- DAEMON_DIR = daemon
X-endif
X-endif
X-if BUILD_GTK
X- GTK_DIR = gtk po
X-endif
X-if BUILD_MAC
X- MAC_DIR = macosx
X-endif
X-if BUILD_WX
X- WX_DIR = wx
X-endif
X-
X SUBDIRS = \
X- doc \
X third-party \
X libtransmission \
X- $(DAEMON_DIR) \
X- $(CLI_DIR) \
X- $(BEOS_DIR) \
X- $(GTK_DIR) \
X- $(MAC_DIR) \
X- $(WX_DIR)
X-
X-EXTRA_DIST = \
X- web \
X- NEWS \
X- AUTHORS \
X- COPYING \
X- README \
X- autogen.sh \
X- Transmission.xcodeproj/project.pbxproj \
X- intltool-extract.in \
X- intltool-merge.in \
X- intltool-update.in
X-
X-clutchdir = $(datadir)/transmission/web
X-clutch_DATA = \
X- web/index.html \
X- web/LICENSE
X-
X-clutch_cssdir = $(clutchdir)/stylesheets
X-clutch_css_DATA = \
X- web/stylesheets/iphone.css \
X- web/stylesheets/common.css \
X- web/stylesheets/ie6.css \
X- web/stylesheets/ie7.css
X-
X-clutch_jsdir = $(clutchdir)/javascript
X-clutch_js_DATA = \
X- web/javascript/menu.js \
X- web/javascript/dialog.js \
X- web/javascript/transmission.js \
X- web/javascript/transmission.remote.js \
X- web/javascript/common.js \
X- web/javascript/torrent.js
X-
X-clutch_jquerydir = $(clutch_jsdir)/jquery
X-clutch_jquery_DATA = \
X- web/javascript/jquery/json.min.js \
X- web/javascript/jquery/jquery.contextmenu.min.js \
X- web/javascript/jquery/jquery.min.js \
X- web/javascript/jquery/jquery.form.min.js \
X- web/javascript/jquery/jquery.transmenu.min.js
X-
X-clutch_imagesdir = $(clutchdir)/images
X-clutch_images_DATA = \
X- web/images/favicon.ico \
X- web/images/favicon.png \
X- web/images/webclip-icon.png
X-
X-clutch_graphicsdir = $(clutch_imagesdir)/graphics
X-clutch_graphics_DATA = \
X- web/images/graphics/logo.png \
X- web/images/graphics/chrome.png \
X- web/images/graphics/iphone_chrome.png \
X- web/images/graphics/filter_bar.png \
X- web/images/graphics/filter_icon.png \
X- web/images/graphics/transfer_arrows.png
X-
X-clutch_progressdir = $(clutch_imagesdir)/progress
X-clutch_progress_DATA = \
X- web/images/progress/progress.png
X-
X-clutch_buttonsdir = $(clutch_imagesdir)/buttons
X-clutch_buttons_DATA = \
X- web/images/buttons/tab_backgrounds.png \
X- web/images/buttons/toolbar_buttons.png \
X- web/images/buttons/info_general.png \
X- web/images/buttons/torrent_buttons.png \
X- web/images/buttons/info_activity.png
X-
X-DISTCLEANFILES = \
X- intltool-extract \
X- intltool-merge \
X- intltool-update
X+ gtk po
918ac177caa8b0db8d3ac87639624463
echo x - transmission-cli/files/transmission-web-configure.ac
sed 's/^X//' >transmission-cli/files/transmission-web-configure.ac << 'c7389123b3b9739d36b0925cb8654d35'
X--- configure.ac 2009-04-13 08:55:57.000000000 +0700
X+++ configure-web.ac 2009-04-28 15:48:43.000000000 +0700
X@@ -15,23 +15,13 @@
X AC_CONFIG_MACRO_DIR([m4])
X
X dnl AM_CONFIG_HEADER(config.h)
X-AC_CONFIG_SRCDIR(libtransmission/transmission.h)
X AM_INIT_AUTOMAKE([1.9 tar-ustar])
X-AC_PROG_LIBTOOL
X
X if test m4_substr(peer_id_prefix,6,1) = "0"; then
X supported_build=yes
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O3 -funroll-loops "
X- CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
X- fi
X AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
X else
X supported_build=no
X- if test "x$GCC" = "xyes" ; then
X- CFLAGS="$CFLAGS -g -O0"
X- CXXFLAGS="$CXXFLAGS -g -O0"
X- fi
X if test m4_substr(peer_id_prefix,6,1) = "X"; then
X AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
X else
X@@ -40,302 +30,13 @@
X fi
X AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
X
X-OPENSSL_MINIMUM=0.9.4
X-CURL_MINIMUM=7.16.3
X-GIO_MINIMUM=2.15.5
X-GLIB_MINIMUM=2.6.0
X-GTK_MINIMUM=2.6.0
X-WX_MINIMUM=2.6.0
X-LIBNOTIFY_MINIMUM=0.4.3
X-DBUS_GLIB_MINIMUM=0.70
X-AC_SUBST(OPENSSL_MINIMUM)
X-AC_SUBST(CURL_MINIMUM)
X-AC_SUBST(GIO_MINIMUM)
X-AC_SUBST(GLIB_MINIMUM)
X-AC_SUBST(GTK_MINIMUM)
X-AC_SUBST(WX_MINIMUM)
X-AC_SUBST(LIBNOTIFY_MINIMUM)
X-AC_SUBST(DBUS_GLIB_MINIMUM)
X-
X-AC_PROG_CC
X-AC_PROG_CXX
X-AC_C_INLINE
X-if test "x$GCC" = "xyes" ; then
X- 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"
X-fi
X-
X-AC_HEADER_STDC
X-AC_HEADER_TIME
X-
X-AC_MSG_CHECKING([for fallocate])
X-AC_TRY_LINK([#include <linux/falloc.h>],
X- [return fallocate(-1,0,0,0);],
X- [AC_DEFINE([HAVE_FALLOCATE],[1],[Defined if fallocate() exists])
X- AC_MSG_RESULT([yes])],
X- [AC_MSG_RESULT([no])])
X-AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename daemon strcasecmp localtime_r posix_fallocate])
X AC_PROG_INSTALL
X AC_PROG_MAKE_SET
X-ACX_PTHREAD
X
X-AC_SEARCH_LIBS([socket], [socket net])
X-AC_SEARCH_LIBS([gethostbyname], [nsl bind])
X-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
X-PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
X-AC_PATH_ZLIB
X-
X-AC_SYS_LARGEFILE
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl va_copy
X-
X-AC_MSG_CHECKING([how to copy va_list])
X-AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
X- AC_MSG_RESULT([va_copy]),
X- [ AH_TEMPLATE([va_copy], [define if va_copy is not available])
X- AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; __va_copy(ap1, ap2);],
X- [ AC_DEFINE([va_copy], [__va_copy])
X- AC_MSG_RESULT([__va_copy])],
X- [ AC_DEFINE([va_copy(dest,src)], [memcpy(&dest,&src,sizeof(va_list))])
X- AC_MSG_RESULT([memcpy])]
X- )
X-])
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl libevent fun
X-
X-AC_CONFIG_SUBDIRS([third-party/libevent])
X-AC_MSG_NOTICE([invoking libevent's configure script])
X-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
X-AC_SUBST(LIBEVENT_CPPFLAGS)
X-
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl detection for the GTK+ client
X-
X-PKG_CHECK_MODULES(GTK,
X- [gtk+-2.0 >= $GTK_MINIMUM
X- glib-2.0 >= $GLIB_MINIMUM
X- gmodule-2.0 >= $GLIB_MINIMUM
X- gthread-2.0 >= $GLIB_MINIMUM],
X- [have_gtk=yes],
X- [have_gtk=no])
X-AC_ARG_ENABLE([gtk],
X- AS_HELP_STRING([--enable-gtk],[build gtk client]),
X- [want_gtk=${enableval}],
X- [want_gtk=${have_gtk}])
X-build_gtk=no
X-use_gio=no
X-use_libnotify=no
X-use_dbus_glib=no
X-if test "x$want_gtk" = "xyes" ; then
X- if test "x$have_gtk" = "xyes"; then
X- build_gtk=yes
X- else
X- AC_MSG_ERROR("GTK+ not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_GTK],[test "x$build_gtk" = "xyes"])
X-AC_SUBST(GTK_LIBS)
X-AC_SUBST(GTK_CFLAGS)
X-
X-if test "x$build_gtk" = "xyes"; then
X-
X- PKG_CHECK_MODULES([GIO],
X- [gio-2.0 >= $GIO_MINIMUM],
X- [use_gio=yes],
X- [use_gio=no])
X- AC_SUBST(GIO_LIBS)
X- AC_SUBST(GIO_CFLAGS)
X- if test "x$use_gio" = "xyes"; then
X- AC_DEFINE([HAVE_GIO], 1)
X- fi
X-
X- PKG_CHECK_MODULES([LIBNOTIFY],
X- [libnotify >= $LIBNOTIFY_MINIMUM],
X- [have_libnotify=yes],
X- [have_libnotify=no])
X- AC_ARG_ENABLE([libnotify],
X- AS_HELP_STRING([--enable-libnotify],[enable notifications]),,
X- [enable_libnotify=yes])
X- use_libnotify=no
X- if test "x$enable_libnotify" = "xyes" ; then
X- if test "x$have_libnotify" = "xyes"; then
X- use_libnotify=yes
X- AC_SUBST(LIBNOTIFY_LIBS)
X- AC_SUBST(LIBNOTIFY_CFLAGS)
X- AC_DEFINE([HAVE_LIBNOTIFY], 1)
X- fi
X- fi
X-
X- PKG_CHECK_MODULES([DBUS_GLIB],
X- [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
X- [use_dbus_glib=yes],
X- [use_dbus_glib=no])
X- AC_SUBST(DBUS_GLIB_LIBS)
X- AC_SUBST(DBUS_GLIB_CFLAGS)
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_DEFINE([HAVE_DBUS_GLIB], 1)
X- fi
X- if test "x$use_dbus_glib" = "xyes"; then
X- AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
X- if test "x$DBUS_BINDING_TOOL" = xno; then
X- AC_MSG_WARN([Cannot find dbus-binding-tool])
X- use_dbus_glib="no (dbus-binding-tool not found)"
X- fi
X- fi
X-fi
X-
X-AC_ARG_ENABLE([nls],
X- AS_HELP_STRING([--enable-nls],[enable native language support]),,
X- [enable_nls=yes])
X-
X-if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
X- AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
X-fi
X-
X-use_nls=no
X-if test "x$enable_nls" = "xyes" ; then
X- use_nls=yes
X- IT_PROG_INTLTOOL([0.23],[no-xml])
X- AC_CHECK_HEADERS([libintl.h])
X- GETTEXT_PACKAGE=transmission
X- AC_SUBST(GETTEXT_PACKAGE)
X- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
X- AM_GLIB_GNU_GETTEXT
X- transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
X- AC_SUBST(transmissionlocaledir)
X-fi
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl wxWidgets detection for the wxWidgets client
X-
X-build_wx=no
X-AC_ARG_ENABLE([wx],
X- AS_HELP_STRING([--enable-wx],[build wxWidgets client]),
X- [want_wx=${enableval}],
X- [want_wx=no])
X-if test "x$want_wx" != "xno"; then
X- AM_OPTIONS_WXCONFIG
X- AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
X- if test "x$have_wx" = "xyes"; then
X- build_wx=yes
X- elif test "x$want_wx" = "xyes"; then
X- AC_MSG_ERROR("wxWidgets not found!")
X- fi
X-fi
X-AM_CONDITIONAL([BUILD_WX],[test "x$build_wx" = "xyes"])
X-
X-
X-
X-dnl ----------------------------------------------------------------------------
X-dnl
X-dnl platform-specific stuff.
X-
X-AC_CANONICAL_HOST
X-have_darwin="no"
X-have_msw="no"
X-case $host_os in
X-
X- *cygwin|*mingw32*)
X- have_msw="yes"
X- CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
X- CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
X- LIBS="$LIBS -lshell32 -lws2_32"
X- transmissionlocaledir="locale"
X- if test -z "$host_alias"; then
X- hostaliaswindres=
X- else
X- hostaliaswindres="$host_alias-windres";
X- fi
X- AC_CHECK_TOOL(WINDRES, windres)
X- ;;
X-
X- *darwin*)
X- have_darwin="yes"
X- # Make sure the Universal SDK is installed
X- if test ! -d /Developer/SDKs/MacOSX10.4u.sdk; then
X- cat << EOF
X-You need to install the Universal SDK in order to build Transmission:
X- Get your Xcode CD or package
X- Restart the install
X- When it gets to "Installation Type", select "Customize"
X- Select "Mac OS X 10.4 (Universal) SDK" under "Cross Development"
X- Finish the install.
X-EOF
X- exit 1
X- fi
X- ;;
X-
X-esac
X-
X-AC_ARG_ENABLE([cli],
X- [AS_HELP_STRING([--enable-cli],[build command-line client])],
X- [build_cli=${enableval}],
X- [build_cli="yes"])
X-AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
X-
X-AC_ARG_ENABLE([mac],
X- [AS_HELP_STRING([--enable-mac],[build OS X client])],
X- [build_mac=${enableval}],
X- [build_mac=${have_darwin}])
X-AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
X-
X-AC_ARG_ENABLE([daemon],
X- [AS_HELP_STRING([--enable-daemon],[build daemon])],
X- [build_daemon=${enableval}],
X- [build_daemon="yes"])
X-AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
X-
X-
X-if test "x$have_darwin" = "xyes"; then
X- AC_DEFINE([HAVE_DARWIN], 1)
X-fi
X-if test "x$have_msw" = "xyes"; then
X- AC_DEFINE([HAVE_MSW], 1)
X-fi
X-AM_CONDITIONAL(WIN32, test "x$have_msw" = "xyes")
X
X dnl ----------------------------------------------------------------------------
X dnl
X dnl Generate the output
X
X-AC_CONFIG_FILES([Makefile
X- transmission.spec
X- cli/Makefile
X- daemon/Makefile
X- doc/Makefile
X- libtransmission/Makefile
X- third-party/Makefile
X- third-party/miniupnp/Makefile
X- third-party/libnatpmp/Makefile
X- macosx/Makefile
X- wx/Makefile
X- wx/images/Makefile
X- gtk/Makefile
X- gtk/icons/Makefile
X- po/Makefile.in])
X-
X-ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
X+AC_CONFIG_FILES([Makefile])
X AC_OUTPUT
X-
X-echo "
X-
X-Configuration:
X-
X- Source code location: ${srcdir}
X- Compiler: ${CXX}
X- Build Command-Line client: ${build_cli}
X- Build Daemon: ${build_daemon}
X- Build GTK+ client: ${build_gtk}
X- ... gio support: ${use_gio}
X- ... dbus-glib support: ${use_dbus_glib}
X- ... libnotify support: ${use_libnotify}
X- Build OS X client: ${build_mac}
X- Build wxWidgets client: ${build_wx}
X-
X-"
X--- Makefile.am 2009-04-13 08:55:57.000000000 +0700
X+++ Makefile-web.am 2009-04-28 15:34:13.000000000 +0700
X@@ -1,46 +1,5 @@
X ACLOCAL_AMFLAGS = -I m4
X
X-if BUILD_CLI
X- CLI_DIR = cli
X-endif
X-if BUILD_DAEMON
X-if !WIN32
X- DAEMON_DIR = daemon
X-endif
X-endif
X-if BUILD_GTK
X- GTK_DIR = gtk po
X-endif
X-if BUILD_MAC
X- MAC_DIR = macosx
X-endif
X-if BUILD_WX
X- WX_DIR = wx
X-endif
X-
X-SUBDIRS = \
X- doc \
X- third-party \
X- libtransmission \
X- $(DAEMON_DIR) \
X- $(CLI_DIR) \
X- $(BEOS_DIR) \
X- $(GTK_DIR) \
X- $(MAC_DIR) \
X- $(WX_DIR)
X-
X-EXTRA_DIST = \
X- web \
X- NEWS \
X- AUTHORS \
X- COPYING \
X- README \
X- autogen.sh \
X- Transmission.xcodeproj/project.pbxproj \
X- intltool-extract.in \
X- intltool-merge.in \
X- intltool-update.in
X-
X clutchdir = $(datadir)/transmission/web
X clutch_DATA = \
X web/index.html \
X@@ -68,7 +27,8 @@
X web/javascript/jquery/jquery.contextmenu.min.js \
X web/javascript/jquery/jquery.min.js \
X web/javascript/jquery/jquery.form.min.js \
X- web/javascript/jquery/jquery.transmenu.min.js
X+ web/javascript/jquery/jquery.transmenu.min.js \
X+ web/javascript/jquery/jquery.dimensions.min.js
X
X clutch_imagesdir = $(clutchdir)/images
X clutch_images_DATA = \
X@@ -96,8 +56,3 @@
X web/images/buttons/info_general.png \
X web/images/buttons/torrent_buttons.png \
X web/images/buttons/info_activity.png
X-
X-DISTCLEANFILES = \
X- intltool-extract \
X- intltool-merge \
X- intltool-update
c7389123b3b9739d36b0925cb8654d35
echo x - transmission-cli/Makefile
sed 's/^X//' >transmission-cli/Makefile << '70a0adcb1600a5baa803a202f7f43774'
X# New ports collection makefile for: transmission
X# Date created: 08 October 2005
X# Whom: Mezz <mezz@FreeBSD.org>
X#
X# $FreeBSD: ports/net-p2p/transmission-cli/Makefile,v 1.53 2009/03/18 20:06:36 mezz Exp $
X#
X
XPORTNAME= transmission
XPORTVERSION= 1.52
XPORTREVISION?= 1
XCATEGORIES?= net-p2p
XMASTER_SITES= http://download.m0k.org/${PORTNAME}/files/
XPKGNAMESUFFIX?= -cli
X
XMAINTAINER?= ports@FreeBSD.org
XCOMMENT?= A fast and lightweight CLI (command line) BitTorrent client
X
XSLAVEPORT?=
X.if ${SLAVEPORT}!="web"
XLIB_DEPENDS?= ${GEN_LIB_DEPENDS}
X
X# General dependencies
XGEN_LIB_DEPENDS=curl.5:${PORTSDIR}/ftp/curl
XGEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
X
XUSE_GNOME?= pkgconfig
XUSE_OPENSSL= yes
XCONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} \
X --with-zlib=/usr
X
XMAN1?= transmissioncli.1
X.endif
X
XUSE_BZIP2= yes
XUSE_GMAKE= yes
XUSE_AUTOTOOLS= autoconf:262:env aclocal:19:env automake:19:env libtool:15:env
XGNU_CONFIGURE= yes
X
XDOCS= AUTHORS COPYING NEWS README
X
XDOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
XEXTRA_PATCHES= ${PATCHDIR}/${PORTNAME}${PKGNAMESUFFIX}-configure.ac
X
Xgeneral-patch:
X @${REINPLACE_CMD} -e 's|SUBDIRS = . sample.*|SUBDIRS = .|g' \
X ${WRKSRC}/third-party/libevent/Makefile.*
X @${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
X 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
X.if ${SLAVEPORT}!="gtk2"
X @${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \
X ${WRKSRC}/libtransmission/utils.h
X.endif
X
Xpost-patch: general-patch
X
Xpre-configure:
X @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none)
X.if ${SLAVEPORT}=="gtk2"
X @(cd ${WRKSRC} && intltoolize --copy --force --automake)
X.endif
X @${REINPLACE_CMD} -e \
X 's|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g' \
X ${WRKSRC}/configure
X @${REINPLACE_CMD} -e 's|-lrt||g' \
X ${WRKSRC}/third-party/libevent/configure
X
Xgeneral-install:
X.ifndef (NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}
X.for i in ${DOCS}
X @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
X.endfor
X.endif
X
Xpost-install: general-install
X
X.include <bsd.port.mk>
70a0adcb1600a5baa803a202f7f43774
echo x - transmission-cli/distinfo
sed 's/^X//' >transmission-cli/distinfo << '178cebf1fdf5ab1f858adf6a9087df4a'
XMD5 (transmission-1.52.tar.bz2) = 2a1a628c2a8872934575cb4351bca291
XSHA256 (transmission-1.52.tar.bz2) = 30e0035984901f2348d5c1863e8104df5739b18acdf52216b4935e1eaee221fa
XSIZE (transmission-1.52.tar.bz2) = 4641665
178cebf1fdf5ab1f858adf6a9087df4a
echo x - transmission-cli/pkg-descr
sed 's/^X//' >transmission-cli/pkg-descr << '8a23e874286714e10e8c1d0cc9f276d4'
XA fast and lightweight CLI (command line) BitTorrent client.
X
XTransmission has been built from the ground up to be a lightweight, yet
Xpowerful BitTorrent client. Its simple, intuitive interface is designed
Xto integrate tightly with whatever computing environment you choose to
Xuse. Transmission strikes a balance between providing useful functionality
Xwithout feature bloat. Furthermore, it is free for anyone to use or modify.
X
XWWW: http://www.transmissionbt.com/
8a23e874286714e10e8c1d0cc9f276d4
echo x - transmission-cli/pkg-plist
sed 's/^X//' >transmission-cli/pkg-plist << '501b67548d7ed90277ea9589accf88c3'
Xbin/transmissioncli
X%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
X%%PORTDOCS%%%%DOCSDIR%%/COPYING
X%%PORTDOCS%%%%DOCSDIR%%/NEWS
X%%PORTDOCS%%%%DOCSDIR%%/README
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
501b67548d7ed90277ea9589accf88c3
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904280921.n3S9L129051329>