6 files changed, 492 insertions, 22 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 8bcfe28a1370..1820fa3852dd 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	0.2.20051009
+PORTVERSION=	0.3
 CATEGORIES=	net
-#MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mezz
+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,9 +18,8 @@ COMMENT=	A free BitTorrent client written from scratch in C
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 
-USE_OPENSSL=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude macosx \
@@ -29,12 +28,30 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude macosx \
 PLIST_FILES=	bin/transmissioncli
 PORTDOCS=	AUTHORS LICENSE NEWS README
 
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=--disable-openssl
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--openssl-include=${OPENSSLINC} \
+		--openssl-lib=${OPENSSLLIB}
+.endif
+
+pre-everything::
+.if !defined(WITHOUT_OPENSSL)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${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
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|cc|${CC}|g ; \
+		s|-g |${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS}|g ; \
+		s|-pthread|${PTHREAD_LIBS}|g ; \
 		s|$$LINKLIBS ;|${LDFLAGS} $$LINKLIBS ;|g' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O3||g ; \
-		s|-g |${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS} |g' \
+	@${REINPLACE_CMD} -e 's|-O3||g' \
 			${WRKSRC}/Jamrules
 
 # jam -dx, it will giving a verbose of build.
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index add1d0cca2c5..f5df1f480f57 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,2 +1,2 @@
-MD5 (Transmission-0.2.20051009.tar.gz) = 1ca6e92280d6cbf5465344b49eb6e10a
-SIZE (Transmission-0.2.20051009.tar.gz) = 141614
+MD5 (Transmission-0.3.tar.gz) = a67de368f674c9195d07f459f27a5431
+SIZE (Transmission-0.3.tar.gz) = 142513
diff --git a/net-p2p/transmission-cli/files/patch-configure b/net-p2p/transmission-cli/files/patch-configure
new file mode 100644
index 000000000000..6fb1eb882c0d
--- /dev/null
+++ b/net-p2p/transmission-cli/files/patch-configure
@@ -0,0 +1,218 @@
+--- ../../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 ;
+ 
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 8bcfe28a1370..1820fa3852dd 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	0.2.20051009
+PORTVERSION=	0.3
 CATEGORIES=	net
-#MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mezz
+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,9 +18,8 @@ COMMENT=	A free BitTorrent client written from scratch in C
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 
-USE_OPENSSL=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude macosx \
@@ -29,12 +28,30 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude macosx \
 PLIST_FILES=	bin/transmissioncli
 PORTDOCS=	AUTHORS LICENSE NEWS README
 
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=--disable-openssl
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--openssl-include=${OPENSSLINC} \
+		--openssl-lib=${OPENSSLLIB}
+.endif
+
+pre-everything::
+.if !defined(WITHOUT_OPENSSL)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${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
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|cc|${CC}|g ; \
+		s|-g |${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS}|g ; \
+		s|-pthread|${PTHREAD_LIBS}|g ; \
 		s|$$LINKLIBS ;|${LDFLAGS} $$LINKLIBS ;|g' \
 			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O3||g ; \
-		s|-g |${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS} |g' \
+	@${REINPLACE_CMD} -e 's|-O3||g' \
 			${WRKSRC}/Jamrules
 
 # jam -dx, it will giving a verbose of build.
diff --git a/net-p2p/transmission/distinfo b/net-p2p/transmission/distinfo
index add1d0cca2c5..f5df1f480f57 100644
--- a/net-p2p/transmission/distinfo
+++ b/net-p2p/transmission/distinfo
@@ -1,2 +1,2 @@
-MD5 (Transmission-0.2.20051009.tar.gz) = 1ca6e92280d6cbf5465344b49eb6e10a
-SIZE (Transmission-0.2.20051009.tar.gz) = 141614
+MD5 (Transmission-0.3.tar.gz) = a67de368f674c9195d07f459f27a5431
+SIZE (Transmission-0.3.tar.gz) = 142513
diff --git a/net-p2p/transmission/files/patch-configure b/net-p2p/transmission/files/patch-configure
new file mode 100644
index 000000000000..6fb1eb882c0d
--- /dev/null
+++ b/net-p2p/transmission/files/patch-configure
@@ -0,0 +1,218 @@
+--- ../../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 ;
+