- Update to 0.4.

- Add '-dx' in jam by default to give the verbose of build. Easier for me to
  collect the bug report or/and read in log from tinderboxes.
- /usr/bin/fmt -> ${FMT}, reported by portlint.

3 files changed, 9 insertions, 231 deletions

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index bf06bec3e44a..08b9e538f12b 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	net
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
-#MASTER_SITES=	${MASTER_SITE_LOCAL}
-#MASTER_SITE_SUBDIR=	mezz
 DISTNAME=	Transmission-${PORTVERSION}
 
 MAINTAINER=	mezz@FreeBSD.org
@@ -18,6 +16,7 @@ COMMENT=	A free BitTorrent client written from scratch in C
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 
+CFLAGS+=	-Wall -W
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
@@ -32,8 +31,7 @@ PORTDOCS=	AUTHORS LICENSE NEWS README
 CONFIGURE_ARGS+=--disable-openssl
 .else
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--openssl-include=${OPENSSLINC} \
-		--openssl-lib=${OPENSSLLIB}
+CONFIGURE_ARGS+=--openssl-prefix=${OPENSSLBASE}
 .endif
 
 pre-everything::
@@ -42,13 +40,11 @@ pre-everything::
 	@${ECHO_MSG} " "
 .endif
 .if !defined(WITHOUT_OPENSSL)
-	@${ECHO_MSG} "WITHOUT_OPENSSL=yes to disable OpenSSL support, using built-in SHA1 implementation. Warning, it is a bit slower if you use this option." | /usr/bin/fmt 75 75
+	@${ECHO_MSG} "WITHOUT_OPENSSL=yes to disable OpenSSL support, using built-in SHA1 implementation. Warning, it is a bit slower if you use this option." | ${FMT} 75 75
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|cc|${CC}|g ; \
-		s|-g |${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS} |g ; \
-		s|-pthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
 		s|$$LINKLIBS ;|${LDFLAGS} $$LINKLIBS ;|g' \
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-O3||g' \
@@ -56,7 +52,7 @@ post-patch:
 
 # jam -dx, it will giving a verbose of build.
 do-build:
-	@(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} jam)
+	@(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} jam -dx)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/transmissioncli ${PREFIX}/bin/
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 3d29bca188d5..82bbfd5c9e8a 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,3 +1,3 @@
-MD5 (Transmission-0.3.tar.gz) = a67de368f674c9195d07f459f27a5431
-SHA256 (Transmission-0.3.tar.gz) = 0e6754def4f6c1a5b9732352eba7cf518ccd9f1e3528edef3c114db82f3bd16a
-SIZE (Transmission-0.3.tar.gz) = 142513
+MD5 (Transmission-0.4.tar.gz) = 6bfee1ac1e8ade8c268f46a125b9db45
+SHA256 (Transmission-0.4.tar.gz) = 8b632c0ee20195f2ce2b5658487e0f9c993286f8b0e50de779f5a4d5e9afa0c8
+SIZE (Transmission-0.4.tar.gz) = 158412
diff --git a/net/transmission/files/patch-configure b/net/transmission/files/patch-configure
deleted file mode 100644
index 6fb1eb882c0d..000000000000
--- a/net/transmission/files/patch-configure
+++ /dev/null
@@ -1,218 +0,0 @@
---- ../../Transmission/configure	Wed Oct 12 09:31:32 2005
-+++ configure	Wed Oct 19 16:18:33 2005
-@@ -1,4 +1,11 @@
- #! /bin/sh
-+#
-+#-*- mode: Fundamental; tab-width: 4; -*-
-+# ex:ts=4
-+#
-+
-+CC="cc"
-+CFLAGS="-g -Wall -W"
- 
- # For > 2 GB files
- DEFINES="_FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE"
-@@ -6,80 +13,134 @@
- # For asprintf
- DEFINES="$DEFINES _GNU_SOURCE"
- 
--# System-specific flags
-+## System-specific flags
- SYSTEM=`uname -s`
- case $SYSTEM in
--  BeOS)
--    DEFINES="$DEFINES SYS_BEOS"
-+	BeOS)
-+	DEFINES="$DEFINES SYS_BEOS"
- 
--    RELEASE=`uname -r`
--    case $RELEASE in
--      6.0|5.0.4) # Zeta or R5 / BONE beta 7
--        SYSTEM="$SYSTEM / BONE"
--        LINKLIBS="$LINKLIBS -lbind -lsocket"
--        ;;
--      5.0*)      # R5 / net_server
--        SYSTEM="$SYSTEM / net_server"
--        DEFINES="$DEFINES BEOS_NETSERVER"
--        LINKLIBS="$LINKLIBS -lnet"
--        ;;
--      *)
--        echo "Unsupported BeOS version"
--        exit 1 ;;
--    esac
--    ;;
--
--  Darwin)
--    DEFINES="$DEFINES SYS_DARWIN"
--    LINKLIBS="$LINKLIBS -lpthread"
--    ;;
--
--  FreeBSD)
--    DEFINES="$DEFINES SYS_FREEBSD"
--    LINKLIBS="$LINKLIBS -pthread"
--    ;;
--
--  NetBSD)
--    DEFINES="$DEFINES SYS_NETBSD"
--    LINKLIBS="$LINKLIBS -lpthread"
--    ;;
--
--  Linux)
--    DEFINES="$DEFINES SYS_LINUX"
--    LINKLIBS="$LINKLIBS -lpthread"
--    ;;
--
--  *)
--    echo "Unsupported operating system"
--    exit 1 ;;
-+	RELEASE=`uname -r`
-+	case $RELEASE in
-+		6.0|5.0.4) # Zeta or R5 / BONE beta 7
-+			SYSTEM="$SYSTEM / BONE"
-+			LINKLIBS="$LINKLIBS -lbind -lsocket"
-+			;;
-+		5.0*)      # R5 / net_server
-+			SYSTEM="$SYSTEM / net_server"
-+			DEFINES="$DEFINES BEOS_NETSERVER"
-+			LINKLIBS="$LINKLIBS -lnet"
-+			;;
-+		*)
-+			echo "Unsupported BeOS version"
-+			exit 1 ;;
-+	esac
-+	;;
-+
-+	Darwin)
-+		DEFINES="$DEFINES SYS_DARWIN"
-+		LINKLIBS="$LINKLIBS -lpthread"
-+		;;
-+
-+	FreeBSD)
-+		DEFINES="$DEFINES SYS_FREEBSD"
-+		LINKLIBS="$LINKLIBS -pthread"
-+		;;
-+
-+	NetBSD)
-+		DEFINES="$DEFINES SYS_NETBSD"
-+		LINKLIBS="$LINKLIBS -lpthread"
-+		;;
-+
-+	Linux)
-+		DEFINES="$DEFINES SYS_LINUX"
-+		LINKLIBS="$LINKLIBS -lpthread"
-+		;;
-+
-+	*)
-+		echo "Unsupported operating system"
-+		exit 1
-+		;;
- esac
- echo "System:  $SYSTEM"
-+##
-+
-+## Functions
-+usage () {
-+	cat <<-EOF
-+	OpenSSL options:
-+	    --disable-openssl       Disable OpenSSL, use built-in SHA1 implementation
-+	    --openssl-include=PATH  Location of OpenSSL headers
-+	    --openssl-lib=PATH      Location of OpenSSL library
- 
--# Check for OpenSSL
--cat > testconf.c << EOF
--#include <stdio.h>
--#include <openssl/sha.h>
--int main()
--{
--    SHA1( 0, 0, 0 );
-+	EOF
- }
--EOF
--if cc -o testconf testconf.c -lcrypto > /dev/null 2>&1
--then
--  echo "OpenSSL: yes"
--  DEFINES="$DEFINES HAVE_OPENSSL"
--  LINKLIBS="$LINKLIBS -lcrypto"
-+
-+openssl_test () {
-+	cat > testssl.c <<-EOF
-+	#include <stdio.h>
-+	#include <openssl/sha.h>
-+	int main()
-+	{
-+		SHA1( 0, 0, 0 );
-+	}
-+	EOF
-+
-+	if $CC -I$OPENSSL_INC -o testssl testssl.c -L$OPENSSL_LIB -lcrypto > /dev/null 2>&1; then
-+		echo "OpenSSL: yes"
-+		CFLAGS="$CFLAGS -I$OPENSSL_INC"
-+		DEFINES="$DEFINES HAVE_OPENSSL"
-+		LINKLIBS="$LINKLIBS -L$OPENSSL_LIB -lcrypto"
-+	else
-+		echo "OpenSSL: no, using built-in SHA1 implementation"
-+	fi
-+
-+	rm -f testssl.c testssl
-+}
-+##
-+
-+## Options
-+openssl_disable=0
-+OPENSSL_INC="/usr/include"
-+OPENSSL_LIB="/usr/lib"
-+while [ $# -ne 0 ]; do
-+	param=`expr "opt$1" : 'opt[^=]*=\(.*\)'`
-+
-+	case "x$1" in
-+		x--disable-openssl)
-+			openssl_disable="1";
-+			shift;;
-+		x--openssl-include=*)
-+			OPENSSL_INC="$param";
-+			shift;;
-+		x--openssl-lib=*)
-+			OPENSSL_LIB="$param";
-+			shift;;
-+		x--help)
-+			usage
-+			exit 0
-+			shift;;
-+	esac
-+done
-+##
-+
-+## OpenSSL: autocheck or disable
-+if [ ${openssl_disable} = 1 ]; then
-+	echo "OpenSSL: no, using built-in SHA1 implementation"
- else
--  echo "OpenSSL: no, using built-in SHA1 implementation"
-+	openssl_test
- fi
--rm -f testconf.c testconf
-+##
- 
--# Generate config.jam
-+## Generate config.jam
- rm -f config.jam
- cat << EOF > config.jam
-+CC       = $CC ;
-+CCFLAGS  = $CFLAGS ;
- DEFINES  = $DEFINES ;
-+LINK     = $CC ;
- LINKLIBS = $LINKLIBS ;
- EOF
-+##
- 
- echo
- echo "To build Transmission, run 'jam'."
---- ../../Transmission/Jamrules	Tue Oct 18 18:50:07 2005
-+++ Jamrules	Wed Oct 19 16:22:09 2005
-@@ -12,7 +12,6 @@
- DEFINES += VERSION_MAJOR=$(VERSION_MAJOR)
-            VERSION_MINOR=$(VERSION_MINOR)
-            VERSION_STRING=\\\"$(VERSION_STRING)\\\" ;
--CCFLAGS  = -g -Wall -W ;
- OPTIM    = -O3 ;
- RM       = rm -Rf ;
-