- Update it to the lastest version of CVS, at 2006-09-01 in changelog. See in

the changelog for details: http://tinyurl.com/b3myl - Add an entry in UPDATING about that the name of binary, datadir and docsdir have been renamed from ldcpp to linuxdcpp by the linuxdcpp developer.
svn path=/head/; revision=171846
2025-07-18 17:59:20 -04:00 · 2006-09-02 07:21:00 +00:00 · 2006-09-02 07:21:00 +00:00 · 373429525f · 2021-03-31 03:12:20 +00:00
commit 373429525f
parent 2fc37958ab
6 changed files with 60 additions and 99 deletions
--- a/7
+++ b/7
@ -8,6 +8,13 @@ upgrades.



+20060902:
+  AFFECTS: users of net-p2p/linuxdcpp
+  AUTHOR: mezz@FreeBSD.org
+
+  The name of binary, datadir and docsdir have been renamed from ldcpp to
+  linuxdcpp by the linuxdcpp developer.
+
 20060831:
  AFFECTS: users of x11-wm/fluxbox-devel
  AUTHOR: mezz@FreeBSD.org
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	linuxdcpp
-PORTVERSION=	0.0.1.20060821	#0.0.1.YYYYMMDD
+PORTVERSION=	0.0.1.20060901	#0.0.1.YYYYMMDD
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=mezz
@ -20,9 +20,6 @@ USE_BZIP2=	yes
 USE_GNOME=	libglade2
 USE_SCONS=	yes

-DATADIR=	${PREFIX}/share/ldcpp
-DOCSDIR=	${PREFIX}/share/doc/ldcpp
-
 .if defined(WITH_DEBUG)
 SCONS_ARGS=	debug=1
 STRIP=
@ -36,9 +33,6 @@ SCONS_ARGS=	release=1
 IGNORE=	does not compile on FreeBSD 4.x, due to lack of wide character in libc
 .endif

-post-extract:
-	@${RM} ${WRKSRC}/linux/prefix.*
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; s|%%CXX%%|${CXX}|g ; \
 		s|%%CXXFLAGS%%|${CXXFLAGS}|g' ${WRKSRC}/SConstruct
--- a/net-p2p/linuxdcpp/distinfo
+++ b/net-p2p/linuxdcpp/distinfo
@ -1,3 +1,3 @@
-MD5 (linuxdcpp-0.0.1.20060821.tar.bz2) = ada196e06230d8e8b642bdaedf19fbae
-SHA256 (linuxdcpp-0.0.1.20060821.tar.bz2) = 12aa972f51c9cee11731466713d31a6385c71164401f54a516a9bbeffaddca57
-SIZE (linuxdcpp-0.0.1.20060821.tar.bz2) = 351564
+MD5 (linuxdcpp-0.0.1.20060901.tar.bz2) = d0cb7cebb39182ecf6ab5a1f13f0e3d9
+SHA256 (linuxdcpp-0.0.1.20060901.tar.bz2) = bf18172b3348f2aa35a665f6c769026f48f686619b4c95008b8224ec4892de96
+SIZE (linuxdcpp-0.0.1.20060901.tar.bz2) = 348060
--- a/net-p2p/linuxdcpp/files/patch-SConstruct
+++ b/net-p2p/linuxdcpp/files/patch-SConstruct
@ -1,6 +1,6 @@
--- SConstruct.orig	Fri Aug 18 12:37:38 2006
-+++ SConstruct	Fri Aug 18 12:39:29 2006
-@@ -38,28 +38,13 @@
+--- SConstruct.orig	Fri Sep  1 16:52:46 2006
+++ SConstruct	Fri Sep  1 16:55:38 2006
+@@ -23,21 +23,6 @@
      context.Result(ret)
      return ret
 
@ -14,52 +14,62 @@
 -		or (string.atoi(ret[0]) > major)):
 -			retval = 1
 -	except ValueError:
-		print "Oops! No C++ compiler found!"
+-		print "No C++ compiler found!"
 -
 -	context.Result(retval)
 -	return retval
 -
 
- # Initialize the environment and configure variables
+ # ----------------------------------------------------------------------
+ # Command-line options
+@@ -62,24 +47,17 @@
+ # Initialization
+ # ----------------------------------------------------------------------
 
-env = Environment(ENV = os.environ)
-+env = Environment(ENV = os.environ, CC = '%%CC%%', CXX = '%%CXX%%')
+-env = Environment(ENV = os.environ, options = opts)
+env = Environment(ENV = os.environ, options = opts, CC = '%%CC%%', CXX = '%%CXX%%')
 
 conf = Configure(env,
-	custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG, 'CheckCXXVersion' : CheckCXXVersion},
-+	custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG},
+ 	custom_tests =
+ 	{
+ 		'CheckPKGConfig' : CheckPKGConfig,
+-		'CheckPKG' : CheckPKG,
+-		'CheckCXXVersion' : CheckCXXVersion
+		'CheckPKG' : CheckPKG
+ 	},
 	conf_dir = 'build/sconf',
 	log_file = 'build/sconf/config.log')
 
-@@ -68,27 +53,6 @@
+-if os.environ.has_key('CXX'):
+-	env['CXX'] = os.environ['CXX']
+-
+-if os.environ.has_key('CXXFLAGS'):
+-	env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
+-
+ env.SConsignFile('build/sconf/.sconsign')
+ opts.Save('build/sconf/scache.conf', env)
+ Help(opts.GenerateHelpText(env))
+@@ -89,19 +67,6 @@
+ # Dependencies
+ # ----------------------------------------------------------------------
 
- # Check for dependencies
- 
-# This looks up the CXX enviroment variable so that people can specify
-# what g++ to use on the command line (eg. prompt:> CXX=foo scons)
-cxx = conf.env.Dictionary()['CXX']
-if not conf.CheckCXXVersion(cxx, 3, 4):
-	if WhereIs('g++-3.4') != None:
-		print 'Found g++-3.4'
-		cxx = 'g++-3.4'
-	else:
+-if not conf.CheckCXXVersion(env['CXX'], 3, 4):
 -	print 'Compiler version check failed. g++ 3.4 or later is needed'
 -	Exit(1)
 -
 -# Add support for compiler caches to speed-up compilation.
-if os.popen('distcc 2> /dev/null').read():
-	cxx = 'distcc ' + cxx
+-if conf.TryAction(Action('distcc'))[0]:
+-	env.Prepend(CXX = 'distcc ')
 -	print 'Enabling distcc...'
-if os.popen('ccache 2> /dev/null').read():
-	cxx = 'ccache ' + cxx
-	print 'Enabling ccache...'
 -
-conf.env.Replace(CXX = cxx)
+-if conf.TryAction(Action('ccache'))[0]:
+-	env.Prepend(CXX = 'ccache ')
+-	print 'Enabling ccache...'
 -
 if not conf.CheckPKGConfig():
      print 'pkg-config not found.'
      Exit(1)
-@@ -120,11 +84,6 @@
+@@ -133,11 +98,6 @@
 	print 'Can\'t live without it, sorry'
 	Exit(1)
 
@ -71,33 +81,17 @@
 if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
 	print 'Did not find the z library (gzip/z compression)'
 	print 'Can\'t live without it, exiting'
-@@ -138,26 +97,19 @@
- 	Exit(1)
+@@ -160,11 +120,11 @@
+ env.Append(CXXFLAGS = Split('-I. -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64'))
 
- env = conf.Finish()
-env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-DENABLE_BINRELOC', '-D_FILE_OFFSET_BITS=64'])
-
-
-# Allow additional CXXFLAGS to be specified by looking at the environment variable.
-try:
-	env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
-except KeyError:
-	pass
-+env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-D_FILE_OFFSET_BITS=64'])
+ if env['debug']:
+-	env.Append(CXXFLAGS = Split('-g -ggdb -D_DEBUG -Wall'))
+	env.Append(CXXFLAGS = Split('%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall'))
+ 	env.Append(LDFLAGS = Split('-g -ggdb'))
 
- 
- # Parse command line parameters
- 
- debug = ARGUMENTS.get('debug', 0)
- if int(debug):
-	env.Append(CXXFLAGS = '-g -ggdb -D_DEBUG -Wall')
-+	env.Append(CXXFLAGS = '%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall')
- 	env.Append(LDFLAGS = '-g -ggdb')
- 
- release = ARGUMENTS.get('release', 0)
- if int(release):
+ if env['release']:
 -	env.Append(CXXFLAGS = '-O3')
 +	env.Append(CXXFLAGS = '%%CXXFLAGS%%')
 
- profile = ARGUMENTS.get('profile', 0)
- if int(profile):
+ if env['profile']:
+ 	env.Append(CXXFLAGS = '-pg')
--- a/net-p2p/linuxdcpp/files/patch-disable_binreloc
+++ b/net-p2p/linuxdcpp/files/patch-disable_binreloc
@ -1,34 +0,0 @@
--- linux/SConstruct.orig	Mon Aug 21 12:20:32 2006
-+++ linux/SConstruct	Mon Aug 21 12:20:57 2006
-@@ -9,7 +9,6 @@
- 	'hashdialog.cc',
- 	'hub.cc',
- 	'mainwindow.cc',
-	'prefix.cc',
- 	'privatemessage.cc',
- 	'publichubs.cc',
- 	'search.cc',
--- linux/wulformanager.cc.orig	Mon Aug 21 12:20:40 2006
-+++ linux/wulformanager.cc	Mon Aug 21 12:21:31 2006
-@@ -24,7 +24,6 @@
- #include "func.hh"
- #include "hashdialog.hh"
- #include "hub.hh"
-#include "prefix.hh"
- #include "privatemessage.hh"
- #include "publichubs.hh"
- #include "search.hh"
-@@ -299,13 +298,7 @@
- 
- string WulforManager::getPath()
- {
-#ifdef _DATADIR
- 	string ret = string(_DATADIR) + PATH_SEPARATOR_STR + "ldcpp";
-#else
-	char *temp = br_extract_dir(SELFPATH);
-	string ret = string(temp);
-	free(temp);
-#endif
- 	return ret;
- }
- 
--- a/net-p2p/linuxdcpp/pkg-plist
+++ b/net-p2p/linuxdcpp/pkg-plist
@ -1,4 +1,4 @@
-bin/ldcpp
+bin/linuxdcpp
 %%DOCSDIR%%/Changelog.txt
 %%DOCSDIR%%/Credits.txt
 %%DOCSDIR%%/License.txt