5 files changed, 140 insertions, 86 deletions

diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 355f0b200ad9..1ac9ad75fb68 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	linuxdcpp
-PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTVERSION=	1.1.0
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://launchpadlibrarian.net/21888715/
+MASTER_SITES=	http://launchpadlibrarian.net/69733951/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A port of the DC++ direct connect client to POSIX-like systems
 
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
+
 USE_BZIP2=	yes
 USE_GNOME=	libglade2
 USE_ICONV=	yes
diff --git a/net-p2p/linuxdcpp/distinfo b/net-p2p/linuxdcpp/distinfo
index 3a51344095f1..537eae52fd0b 100644
--- a/net-p2p/linuxdcpp/distinfo
+++ b/net-p2p/linuxdcpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (linuxdcpp-1.0.3.tar.bz2) = 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71
-SIZE (linuxdcpp-1.0.3.tar.bz2) = 289891
+SHA256 (linuxdcpp-1.1.0.tar.bz2) = 66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a
+SIZE (linuxdcpp-1.1.0.tar.bz2) = 529048
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct
index 945761d6fb7a..180836446633 100644
--- a/net-p2p/linuxdcpp/files/patch-SConstruct
+++ b/net-p2p/linuxdcpp/files/patch-SConstruct
@@ -1,46 +1,24 @@
---- SConstruct.orig	2008-07-07 01:07:36.000000000 -0500
-+++ SConstruct	2008-07-07 01:09:49.000000000 -0500
-@@ -74,20 +74,23 @@
- 	conf_dir = 'build/sconf',
- 	log_file = 'build/sconf/config.log')
+--- SConstruct.orig	2011-04-18 01:57:09.000000000 +0800
++++ SConstruct	2011-10-19 23:42:24.000000000 +0800
+@@ -20,7 +20,7 @@
+ BUILD_FLAGS = {
+ 	'common'  : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
+ 	'debug'   : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 
+-	'release' : ['-O3', '-fomit-frame-pointer', '-DNDEBUG']
++	'release' : ['-fomit-frame-pointer', '-DNDEBUG']
+ }
  
-+if os.environ.has_key('CC'):
-+	env['CC'] = os.environ['CC']
-+
- if os.environ.has_key('CXX'):
--	conf.env['CXX'] = os.environ['CXX']
-+	env['CXX'] = os.environ['CXX']
- 
--if os.environ.has_key('CC'):
--	conf.env['CC'] = os.environ['CC']
-+if os.environ.has_key('CCFLAGS'):
-+	env['CCFLAGS'] = os.environ['CCFLAGS'].split()
+ # ----------------------------------------------------------------------
+@@ -139,6 +139,12 @@
+ if os.environ.has_key('CFLAGS'):
+ 	env['CFLAGS'] = os.environ['CFLAGS'].split()
  
- if os.environ.has_key('CXXFLAGS'):
--	conf.env['CPPFLAGS'] = conf.env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
-+	env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
- 
--if os.environ.has_key('LDFLAGS'):
--	conf.env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
 +if os.environ.has_key('CPPPATH'):
 +	env['CPPPATH'] = os.environ['CPPPATH'].split()
- 
--if os.environ.has_key('CFLAGS'):
--	conf.env['CFLAGS'] = os.environ['CFLAGS'].split()
++
 +if os.environ.has_key('LIBPATH'):
 +	env['LIBPATH'] = os.environ['LIBPATH'].split()
++
+ env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
  
  env.SConsignFile('build/sconf/.sconsign')
- opts.Save('build/sconf/scache.conf', env)
-@@ -135,11 +138,6 @@
- 	if not conf.CheckHeader('unistd.h'):
- 		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'
diff --git a/net-p2p/linuxdcpp/files/patch-client-HashManager.cpp b/net-p2p/linuxdcpp/files/patch-client-HashManager.cpp
deleted file mode 100644
index e62eb919fd48..000000000000
--- a/net-p2p/linuxdcpp/files/patch-client-HashManager.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- client/HashManager.cpp.orig	2010-02-06 12:57:41.000000000 +0600
-+++ client/HashManager.cpp	2010-02-06 12:58:04.000000000 +0600
-@@ -636,13 +636,13 @@
- 			currentSize = max(static_cast<uint64_t>(currentSize - size_read), static_cast<uint64_t>(0));
- 		}
- 
--		if(size_left <= 0) {
--			break;
--		}
--
- 		munmap(buf, size_read);
- 		pos += size_read;
- 		size_left -= size_read;
-+
-+		if(size_left <= 0) {
-+			break;
-+		}
- 	}
- 	close(fd);
- 	return true;
diff --git a/net-p2p/linuxdcpp/pkg-plist b/net-p2p/linuxdcpp/pkg-plist
index 63b19eecd202..b145f16ea370 100644
--- a/net-p2p/linuxdcpp/pkg-plist
+++ b/net-p2p/linuxdcpp/pkg-plist
@@ -1,6 +1,9 @@
 bin/linuxdcpp
+share/applications/linuxdcpp.desktop
+@dirrmtry share/applications
 %%DATADIR%%/glade/downloadqueue.glade
 %%DATADIR%%/glade/favoritehubs.glade
+%%DATADIR%%/glade/favoriteusers.glade
 %%DATADIR%%/glade/finishedtransfers.glade
 %%DATADIR%%/glade/hash.glade
 %%DATADIR%%/glade/hub.glade
@@ -10,28 +13,118 @@ bin/linuxdcpp
 %%DATADIR%%/glade/search.glade
 %%DATADIR%%/glade/settingsdialog.glade
 %%DATADIR%%/glade/sharebrowser.glade
-%%DATADIR%%/pixmaps/FinishedDL.png
-%%DATADIR%%/pixmaps/FinishedUL.png
-%%DATADIR%%/pixmaps/connect.png
-%%DATADIR%%/pixmaps/dc++-fw-op.png
-%%DATADIR%%/pixmaps/dc++-fw.png
-%%DATADIR%%/pixmaps/dc++-op.png
-%%DATADIR%%/pixmaps/dc++.png
-%%DATADIR%%/pixmaps/download.png
-%%DATADIR%%/pixmaps/favhubs.png
-%%DATADIR%%/pixmaps/hash.png
-%%DATADIR%%/pixmaps/linuxdcpp-icon.png
-%%DATADIR%%/pixmaps/linuxdcpp.png
-%%DATADIR%%/pixmaps/normal-fw-op.png
-%%DATADIR%%/pixmaps/normal-fw.png
-%%DATADIR%%/pixmaps/normal-op.png
-%%DATADIR%%/pixmaps/normal.png
-%%DATADIR%%/pixmaps/publichubs.png
-%%DATADIR%%/pixmaps/queue.png
-%%DATADIR%%/pixmaps/quit.png
-%%DATADIR%%/pixmaps/search.png
-%%DATADIR%%/pixmaps/settings.png
-%%DATADIR%%/pixmaps/upload.png
-@dirrm %%DATADIR%%/pixmaps
+%%DATADIR%%/glade/transfers.glade
 @dirrm %%DATADIR%%/glade
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-dc++-fw-op.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-dc++-fw.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-dc++-op.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-dc++.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-download.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-normal-fw-op.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-normal-fw.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-normal-op.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-normal.png
+%%DATADIR%%/icons/hicolor/16x16/status/linuxdcpp-upload.png
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-favorite-hubs.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-favorite-users.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-finished-downloads.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-finished-uploads.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-hash.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-preferences.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-public-hubs.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-queue.png
+%%DATADIR%%/icons/hicolor/22x22/categories/linuxdcpp-search.png
+@dirrm %%DATADIR%%/icons/hicolor/22x22/categories
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-favorite-hubs.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-favorite-users.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-finished-downloads.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-finished-uploads.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-hash.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-preferences.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-public-hubs.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-queue.svg
+%%DATADIR%%/icons/hicolor/scalable/categories/linuxdcpp-search.svg
+@dirrm %%DATADIR%%/icons/hicolor/scalable/categories
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-dc++-fw-op.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-dc++-fw.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-dc++-op.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-dc++.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-download.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-normal-fw-op.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-normal-fw.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-normal-op.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-normal.svg
+%%DATADIR%%/icons/hicolor/scalable/status/linuxdcpp-upload.svg
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+share/icons/hicolor/16x16/apps/linuxdcpp.png
+share/icons/hicolor/20x20/apps/linuxdcpp.png
+share/icons/hicolor/24x24/apps/linuxdcpp.png
+share/icons/hicolor/48x48/apps/linuxdcpp.png
+share/icons/hicolor/96x96/apps/linuxdcpp.png
+@dirrmtry share/icons/hicolor/20x20/apps
+@dirrmtry share/icons/hicolor/20x20
+share/icons/hicolor/scalable/apps/linuxdcpp.svg
+share/locale/ar/LC_MESSAGES/libdcpp.mo
+share/locale/bg/LC_MESSAGES/libdcpp.mo
+share/locale/bs/LC_MESSAGES/libdcpp.mo
+share/locale/ca/LC_MESSAGES/libdcpp.mo
+share/locale/cs/LC_MESSAGES/libdcpp.mo
+share/locale/cs/LC_MESSAGES/linuxdcpp.mo
+share/locale/da/LC_MESSAGES/libdcpp.mo
+share/locale/de/LC_MESSAGES/libdcpp.mo
+share/locale/de/LC_MESSAGES/linuxdcpp.mo
+share/locale/el/LC_MESSAGES/libdcpp.mo
+share/locale/en_CA/LC_MESSAGES/libdcpp.mo
+share/locale/en_GB/LC_MESSAGES/libdcpp.mo
+share/locale/es/LC_MESSAGES/libdcpp.mo
+share/locale/et/LC_MESSAGES/libdcpp.mo
+share/locale/et/LC_MESSAGES/linuxdcpp.mo
+share/locale/fi/LC_MESSAGES/libdcpp.mo
+share/locale/fr/LC_MESSAGES/libdcpp.mo
+share/locale/gl/LC_MESSAGES/libdcpp.mo
+share/locale/he/LC_MESSAGES/libdcpp.mo
+share/locale/hr/LC_MESSAGES/libdcpp.mo
+share/locale/hu/LC_MESSAGES/libdcpp.mo
+share/locale/id/LC_MESSAGES/libdcpp.mo
+share/locale/is/LC_MESSAGES/libdcpp.mo
+share/locale/it/LC_MESSAGES/libdcpp.mo
+share/locale/it/LC_MESSAGES/linuxdcpp.mo
+share/locale/ja/LC_MESSAGES/libdcpp.mo
+share/locale/km/LC_MESSAGES/libdcpp.mo
+share/locale/ko/LC_MESSAGES/libdcpp.mo
+share/locale/lt/LC_MESSAGES/libdcpp.mo
+share/locale/lt/LC_MESSAGES/linuxdcpp.mo
+share/locale/lv/LC_MESSAGES/libdcpp.mo
+share/locale/mk/LC_MESSAGES/libdcpp.mo
+share/locale/ml/LC_MESSAGES/libdcpp.mo
+share/locale/ms/LC_MESSAGES/libdcpp.mo
+share/locale/nb/LC_MESSAGES/libdcpp.mo
+share/locale/nl/LC_MESSAGES/libdcpp.mo
+share/locale/pl/LC_MESSAGES/libdcpp.mo
+share/locale/pl/LC_MESSAGES/linuxdcpp.mo
+share/locale/pt/LC_MESSAGES/libdcpp.mo
+share/locale/pt/LC_MESSAGES/linuxdcpp.mo
+share/locale/pt_BR/LC_MESSAGES/libdcpp.mo
+share/locale/ro/LC_MESSAGES/libdcpp.mo
+share/locale/ro/LC_MESSAGES/linuxdcpp.mo
+share/locale/ru/LC_MESSAGES/libdcpp.mo
+share/locale/ru/LC_MESSAGES/linuxdcpp.mo
+share/locale/sk/LC_MESSAGES/libdcpp.mo
+share/locale/sl/LC_MESSAGES/libdcpp.mo
+share/locale/sq/LC_MESSAGES/libdcpp.mo
+share/locale/sr/LC_MESSAGES/libdcpp.mo
+share/locale/sv/LC_MESSAGES/libdcpp.mo
+share/locale/sv/LC_MESSAGES/linuxdcpp.mo
+share/locale/tr/LC_MESSAGES/libdcpp.mo
+share/locale/uk/LC_MESSAGES/libdcpp.mo
+share/locale/zh_CN/LC_MESSAGES/libdcpp.mo
+share/locale/zh_TW/LC_MESSAGES/libdcpp.mo
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km