From d459a9c59c3ac652890ac68092b47ff11c2dd956 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sun, 20 Feb 2005 11:16:03 +0000
Subject: Honour threads. Bump PORTREVISION.

Reported by:	Valentin Nechayev <netch at segfault dot kiev.ua>
---
 net/dante/Makefile              |  4 +++
 net/dante/files/patch-ltmain.sh | 56 +++++++++++++++++++++++++++++++++++++++++
 net/dante/pkg-plist             |  2 --
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 net/dante/files/patch-ltmain.sh

(limited to 'net/dante')

diff --git a/net/dante/Makefile b/net/dante/Makefile
index 7344a347e89e..fe4222f9f594 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dante
 PORTVERSION=	1.1.14
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.inet.no/pub/socks/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/ \
@@ -16,8 +17,11 @@ MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A circuit-level firewall/proxy
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 INSTALLS_SHLIB=	yes
 
diff --git a/net/dante/files/patch-ltmain.sh b/net/dante/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d740de004aed
--- /dev/null
+++ b/net/dante/files/patch-ltmain.sh
@@ -0,0 +1,56 @@
+--- ltmain.sh.orig	Sun Feb 20 11:57:03 2005
++++ ltmain.sh	Sun Feb 20 12:04:33 2005
+@@ -1052,14 +1052,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1069,6 +1069,13 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -2453,6 +2460,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4219,10 +4229,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/dante/pkg-plist b/net/dante/pkg-plist
index 4eeaf24b7b27..9eee0b6a8e07 100644
--- a/net/dante/pkg-plist
+++ b/net/dante/pkg-plist
@@ -3,11 +3,9 @@ etc/sockd.conf.example
 etc/socks.conf.example
 etc/rc.d/sockd.sh-dist
 include/socks.h
-lib/libdsocks.la
 lib/libdsocks.so
 lib/libdsocks.so.1
 lib/libsocks.a
-lib/libsocks.la
 lib/libsocks.so
 lib/libsocks.so.1
 sbin/sockd
-- 
cgit v1.2.3