- Update it to the lastest version of CVS, at 2007-02-04 in changelog. See in

  the changelog for details:

	http://tinyurl.com/b3myl
- Remove STRIP= from WITH_DEBUG, it's in bsd.port.mk now.
- Remove IGNORE on FreeBSD 4.x, it's no longer need.

Reviewed by:	bland (iconv patch)

2 files changed, 39 insertions, 23 deletions

diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct
index dd4984d7c403..f28371517c6e 100644
--- a/net-p2p/linuxdcpp/files/patch-SConstruct
+++ b/net-p2p/linuxdcpp/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	Mon Jan  1 12:17:39 2007
-+++ SConstruct	Mon Jan  1 12:19:12 2007
+--- SConstruct.orig	Mon Feb  5 01:15:08 2007
++++ SConstruct	Mon Feb  5 01:17:03 2007
 @@ -62,7 +62,7 @@
  # Initialization
  # ----------------------------------------------------------------------
@@ -9,29 +9,34 @@
  
  conf = Configure(env,
  	custom_tests =
-@@ -128,11 +128,6 @@
- 	print '\tHeader file unistd.h not found'
- 	Exit(1)
+@@ -130,11 +130,6 @@
+ 		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('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'
-@@ -159,11 +154,11 @@
- env.Append(LINKFLAGS = ['-Wl,--as-needed'])
+ 	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('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%%')
+ 	if env.has_key('release') and env['release']:
+-		env.Append(CXXFLAGS = '-O3')
++		env.Append(CXXFLAGS = '%%CXXFLAGS%%')
  
- if env.has_key('profile') and env['profile']:
- 	env.Append(CXXFLAGS = '-pg')
+ 	if env.has_key('profile') and env['profile']:
+ 		env.Append(CXXFLAGS = '-pg')
diff --git a/net-p2p/linuxdcpp/files/patch-client_Text.cpp b/net-p2p/linuxdcpp/files/patch-client_Text.cpp
new file mode 100644
index 000000000000..bf460b55dd56
--- /dev/null
+++ b/net-p2p/linuxdcpp/files/patch-client_Text.cpp
@@ -0,0 +1,11 @@
+--- 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) {