4 files changed, 30 insertions, 57 deletions

diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 18b82cda6925..f564a4f83c1f 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linuxdcpp
-PORTVERSION=	0.0.1.20070204	#0.0.1.YYYYMMDD
+PORTVERSION=	0.0.1.20070206	#0.0.1.YYYYMMDD
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~mezz/distfiles/
@@ -22,15 +22,11 @@ USE_ICONV=	yes
 USE_SCONS=	yes
 USE_OPENSSL=	yes
 
+CXXFLAGS+=	-I. -I${LOCALBASE}/include
+SCONS_BUILDENV=	${SCONS_ENV}
+
 .if defined(WITH_DEBUG)
 SCONS_ARGS=	debug=1
-.else
-SCONS_ARGS=	release=1
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; s|%%CXX%%|${CXX}|g ; \
-		s|%%CXXFLAGS%%|${CXXFLAGS}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/SConstruct
-
 .include <bsd.port.mk>
diff --git a/net-p2p/linuxdcpp/distinfo b/net-p2p/linuxdcpp/distinfo
index 0d1e71c66091..aef6f0b47bb2 100644
--- a/net-p2p/linuxdcpp/distinfo
+++ b/net-p2p/linuxdcpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (linuxdcpp-0.0.1.20070204.tar.bz2) = f3ad092a5757fd2e59a99eadfb1e9ad2
-SHA256 (linuxdcpp-0.0.1.20070204.tar.bz2) = 56f76b7f3fd69bf30737b400aa64a1647fb0caedd96cbca80e692c46bcca5304
-SIZE (linuxdcpp-0.0.1.20070204.tar.bz2) = 349400
+MD5 (linuxdcpp-0.0.1.20070206.tar.bz2) = 06afb337878fee4a26559b4c28a0e844
+SHA256 (linuxdcpp-0.0.1.20070206.tar.bz2) = 48b281c54c5d5edd8cc1f10d8ce5ace68492741762a72139f91022bb95231822
+SIZE (linuxdcpp-0.0.1.20070206.tar.bz2) = 349293
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct
index f28371517c6e..de14e2e24f5f 100644
--- a/net-p2p/linuxdcpp/files/patch-SConstruct
+++ b/net-p2p/linuxdcpp/files/patch-SConstruct
@@ -1,42 +1,30 @@
---- SConstruct.orig	Mon Feb  5 01:15:08 2007
-+++ SConstruct	Mon Feb  5 01:17:03 2007
-@@ -62,7 +62,7 @@
- # Initialization
- # ----------------------------------------------------------------------
+--- SConstruct.orig	Tue Feb  6 21:27:05 2007
++++ SConstruct	Tue Feb  6 22:31:03 2007
+@@ -91,9 +91,15 @@
+ 	conf_dir = 'build/sconf',
+ 	log_file = 'build/sconf/config.log')
  
--env = Environment(ENV = os.environ, options = opts)
-+env = Environment(ENV = os.environ, options = opts, CC = '%%CC%%', CXX = '%%CXX%%')
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++
+ if os.environ.has_key('CXX'):
+ 	env['CXX'] = os.environ['CXX']
  
- conf = Configure(env,
- 	custom_tests =
-@@ -130,11 +130,6 @@
- 		print '\tHeader file unistd.h not found'
- 		Exit(1)
++if os.environ.has_key('CCFLAGS'):
++	env['CCFLAGS'] = os.environ['CCFLAGS'].split()
++
+ if os.environ.has_key('CXXFLAGS'):
+ 	env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
  
+@@ -145,11 +151,6 @@
+ 
+ 	if not conf.CheckHeader('unistd.h'):
+ 		print '\tHeader file unistd.h not found'
+-		Exit(1)
+-
 -	if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'c'):
 -		print '\tpthread library not found'
 -		print '\tNote: You might have the lib but not the headers'
--		Exit(1)
--
- 	if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
- 		print '\tz library (gzip/z compression) not found'
- 		print '\tNote: You might have the lib but not the headers'
-@@ -157,15 +152,15 @@
- # Compile and link flags
- # ----------------------------------------------------------------------
- 
--	env.Append(CXXFLAGS = Split('-I. -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64'))
-+	env.Append(CXXFLAGS = Split('-I. -I%%LOCALBASE%%/include -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64'))
- 	env.Append(LINKFLAGS = ['-Wl,--as-needed'])
- 
- 	if env.has_key('debug') and env['debug']:
--		env.Append(CXXFLAGS = Split('-g -ggdb -D_DEBUG -Wall'))
-+		env.Append(CXXFLAGS = Split('%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall'))
- 		env.Append(LINKFLAGS = Split('-g -ggdb -Wall'))
- 
- 	if env.has_key('release') and env['release']:
--		env.Append(CXXFLAGS = '-O3')
-+		env.Append(CXXFLAGS = '%%CXXFLAGS%%')
+ 		Exit(1)
  
- 	if env.has_key('profile') and env['profile']:
- 		env.Append(CXXFLAGS = '-pg')
+ 	if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
diff --git a/net-p2p/linuxdcpp/files/patch-client_Text.cpp b/net-p2p/linuxdcpp/files/patch-client_Text.cpp
deleted file mode 100644
index bf460b55dd56..000000000000
--- a/net-p2p/linuxdcpp/files/patch-client_Text.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/Text.cpp.orig	Mon Feb  5 17:59:13 2007
-+++ client/Text.cpp	Mon Feb  5 17:59:21 2007
-@@ -309,7 +309,7 @@
- 	char *outbuf = (char *)tmp.data();
- 
- 	while(inleft > 0) {
--		rv = iconv(cd, (char **)&inbuf, &inleft, &outbuf, &outleft);
-+		rv = iconv(cd, &inbuf, &inleft, &outbuf, &outleft);
- 		if(rv == (size_t)-1) {
- 			size_t used = outbuf - tmp.data();
- 			if(errno == E2BIG) {