diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2021-01-01 10:11:34 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2021-01-01 10:11:34 +0000 |
commit | 26b4c8f71f91d22e081b27814782686edde0c90a (patch) | |
tree | 1c321c39372c25d8634e75b5c8e08edc676b296d /net-p2p/linuxdcpp | |
parent | 548f16bd1a2915f08878b716eed92ff3267e6de2 (diff) | |
download | ports-26b4c8f71f91d22e081b27814782686edde0c90a.tar.gz ports-26b4c8f71f91d22e081b27814782686edde0c90a.zip |
Revert r559792 to unbreak INDEX and bulk -a
It seems a lot of reverse dependencies were missed
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=559822
Diffstat (limited to 'net-p2p/linuxdcpp')
-rw-r--r-- | net-p2p/linuxdcpp/Makefile | 42 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/distinfo | 2 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-BufferSocket.cpp | 11 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 86 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp | 26 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-libc++ | 64 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/pkg-descr | 13 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/pkg-plist | 114 |
8 files changed, 358 insertions, 0 deletions
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile new file mode 100644 index 000000000000..49ec7b088969 --- /dev/null +++ b/net-p2p/linuxdcpp/Makefile @@ -0,0 +1,42 @@ +# $FreeBSD$ + +PORTNAME= linuxdcpp +PORTVERSION= 1.1.0 +PORTREVISION= 17 +CATEGORIES= net-p2p +MASTER_SITES= http://launchpadlibrarian.net/69733951/ + +MAINTAINER= ports@FreeBSD.org +COMMENT= Port of the DC++ Direct Connect client to Unix-like systems + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/License.txt + +BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs + +USES= compiler:c++11-lang gettext gnome iconv localbase:ldflags \ + pkgconfig scons:python2 ssl tar:bzip2 +USE_GNOME= libglade2 +INSTALLS_ICONS= yes +PORTDOCS= * +DESTDIRNAME= FAKE_ROOT + +OPTIONS_DEFINE= NOTIFY DOCS +OPTIONS_DEFAULT=NOTIFY + +NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify +NOTIFY_MAKE_ARGS_OFF= libnotify=0 + +.if defined(WITH_DEBUG) +MAKE_ARGS+= debug=1 +.endif + +post-patch: + @${REINPLACE_CMD} -e "s/'iconv'/'${ICONV_LIB:S/-l//}'/" \ + ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConstruct + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include <bsd.port.mk> diff --git a/net-p2p/linuxdcpp/distinfo b/net-p2p/linuxdcpp/distinfo new file mode 100644 index 000000000000..537eae52fd0b --- /dev/null +++ b/net-p2p/linuxdcpp/distinfo @@ -0,0 +1,2 @@ +SHA256 (linuxdcpp-1.1.0.tar.bz2) = 66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a +SIZE (linuxdcpp-1.1.0.tar.bz2) = 529048 diff --git a/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp b/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp new file mode 100644 index 000000000000..a00d597f6bd5 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp @@ -0,0 +1,11 @@ +--- dcpp/BufferedSocket.cpp.orig 2014-06-18 00:29:48.737534795 +0200 ++++ dcpp/BufferedSocket.cpp 2011-04-17 19:57:09.000000000 +0200 +@@ -478,7 +478,7 @@ + + void BufferedSocket::addTask(Tasks task, TaskData* data) { + dcassert(task == DISCONNECT || task == SHUTDOWN || task == UPDATED || sock.get()); +- tasks.push_back(make_pair(task, data)); taskSem.signal(); ++ tasks.push_back(make_pair(task, boost::shared_ptr<TaskData>(data))); taskSem.signal(); + } + + } // namespace dcpp diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct new file mode 100644 index 000000000000..10d0f43993a3 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -0,0 +1,86 @@ +--- SConstruct.orig 2011-04-17 17:57:09 UTC ++++ SConstruct +@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale/' + 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'] + } + + # ---------------------------------------------------------------------- +@@ -106,6 +106,7 @@ else: + vars.AddVariables( + BoolVariable('debug', 'Compile the program with debug information', 0), + BoolVariable('release', 'Compile the program with optimizations', 0), ++ BoolVariable('libnotify', 'Enable notifications through libnotify', 1), + BoolVariable('profile', 'Compile the program with profiling information', 0), + PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), + ('FAKE_ROOT', 'Make scons install the program under a fake root', '') +@@ -131,14 +132,23 @@ if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] + + if os.environ.has_key('CXXFLAGS'): +- env['CPPFLAGS'] = env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() ++ env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() + ++if os.environ.has_key('CPPFLAGS'): ++ env['CPPFLAGS'] = os.environ['CPPFLAGS'].split() ++ + if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] = os.environ['LDFLAGS'].split() + + if os.environ.has_key('CFLAGS'): + env['CFLAGS'] = os.environ['CFLAGS'].split() + ++if os.environ.has_key('CPPPATH'): ++ env['CPPPATH'] = os.environ['CPPPATH'].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') +@@ -185,10 +195,6 @@ conf = env.Configure( + + if not 'install' in COMMAND_LINE_TARGETS: + +- if not conf.CheckCXXVersion(env['CXX'], 4, 1): +- print 'Compiler version check failed. g++ 4.1 or later is needed' +- Exit(1) +- + if not conf.CheckPKGConfig(): + print '\tpkg-config not found.' + Exit(1) +@@ -256,21 +262,20 @@ if not 'install' in COMMAND_LINE_TARGETS: + + if not conf.CheckHeader('iconv.h'): + Exit(1) +- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'): +- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const')) + + if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']): + conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H') + + # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies +- if not conf.CheckPKG('libnotify >= 0.4.1'): +- print '\tlibnotify >= 0.4.1 not found, disabling notifications.' +- print '\tNote: You might have the lib but not the headers' +- else: +- conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY') +- conf.env.ParseConfig('pkg-config --libs libnotify') +- if conf.CheckPKG('libnotify >= 0.7'): +- conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') ++ if conf.env.get('libnotify'): ++ if not conf.CheckPKG('libnotify >= 0.4.1'): ++ print '\tlibnotify >= 0.4.1 not found, disabling notifications.' ++ print '\tNote: You might have the lib but not the headers' ++ else: ++ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY') ++ conf.env.ParseConfig('pkg-config --libs libnotify') ++ if conf.CheckPKG('libnotify >= 0.7'): ++ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') + + conf.CheckBZRRevision() + diff --git a/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp b/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp new file mode 100644 index 000000000000..3584893ee6af --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp @@ -0,0 +1,26 @@ +--- dcpp/CryptoManager.cpp.orig 2011-04-17 17:57:09 UTC ++++ dcpp/CryptoManager.cpp +@@ -107,12 +107,20 @@ CryptoManager::CryptoManager() + }; + + if(dh) { +- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); +- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ BIGNUM *p, *g; + +- if (!dh->p || !dh->g) { ++ p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); ++ g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ ++ if (!p || !g) { + dh.reset(); + } else { ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ dh->p = p; ++ dh->g = g; ++#else ++ DH_set0_pqg(dh, p, NULL, g); ++#endif + SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_tmp_dh(serverContext, (DH*)dh); diff --git a/net-p2p/linuxdcpp/files/patch-libc++ b/net-p2p/linuxdcpp/files/patch-libc++ new file mode 100644 index 000000000000..97091c88b6d9 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-libc++ @@ -0,0 +1,64 @@ +--- dcpp/stdinc.h.orig ++++ dcpp/stdinc.h +@@ -123,7 +123,7 @@ + #include <boost/scoped_array.hpp> + #include <boost/noncopyable.hpp> + +-#if defined(_MSC_VER) || defined(_STLPORT_VERSION) ++#if defined(_MSC_VER) || defined(_STLPORT_VERSION) || defined(_LIBCPP_VERSION) + + #include <unordered_map> + #include <unordered_set> +@@ -139,5 +139,8 @@ + ++#ifdef _LIBCPP_VERSION ++namespace std { namespace tr1 { using namespace std; }} ++#endif + namespace dcpp { + using namespace std; + using namespace std::tr1; + } +--- dcpp/CID.h.orig 2011-04-17 21:57:09.000000000 +0400 ++++ dcpp/CID.h 2013-09-13 00:50:16.544145469 +0400 +@@ -57,7 +57,10 @@ + + } // namespace dcpp + +-namespace std { namespace tr1 { ++namespace std { ++#ifndef _LIBCPP_VERSION ++namespace tr1 { ++#endif + template<> + struct hash<dcpp::CID> { + size_t operator()(const dcpp::CID& rhs) const { +@@ -65,6 +68,8 @@ + } + }; ++#ifndef _LIBCPP_VERSION + } ++#endif + } + + #endif // !defined(CID_H) +--- dcpp/HashValue.h.orig 2011-04-17 21:57:09.000000000 +0400 ++++ dcpp/HashValue.h 2013-09-13 00:48:18.173057104 +0400 +@@ -46,12 +46,17 @@ + + } // namespace dcpp + +-namespace std { namespace tr1 { ++namespace std { ++#ifndef _LIBCPP_VERSION ++namespace tr1 { ++#endif + template<typename T> + struct hash<dcpp::HashValue<T> > { + size_t operator()(const dcpp::HashValue<T>& rhs) const { return *(size_t*)rhs.data; } + }; ++#ifndef _LIBCPP_VERSION + } ++#endif + } + + #endif // !defined(HASH_VALUE_H) diff --git a/net-p2p/linuxdcpp/pkg-descr b/net-p2p/linuxdcpp/pkg-descr new file mode 100644 index 000000000000..95c0cfa355eb --- /dev/null +++ b/net-p2p/linuxdcpp/pkg-descr @@ -0,0 +1,13 @@ +LinuxDC++ is a Linux port of the Direct Connect client DC++. Though it is +primarily aimed at Linux, it has been shown to work on other Unix-based +operating systems as well. It is written in C++ and makes use of GTK+ for +the user interface. LinuxDC++ is free and open source software licensed +under the GPL. + +Direct Connect is a peer-to-peer file-sharing protocol. The most popular +Windows client implementing this protocol currently is DC++. Direct Connect +clients connect to a central hub where they can view a list of clients or +users connected to them. Users can search for files and download them from +other clients, as well as chat with other users. + +WWW: https://launchpad.net/linuxdcpp diff --git a/net-p2p/linuxdcpp/pkg-plist b/net-p2p/linuxdcpp/pkg-plist new file mode 100644 index 000000000000..b27987e4846c --- /dev/null +++ b/net-p2p/linuxdcpp/pkg-plist @@ -0,0 +1,114 @@ +bin/linuxdcpp +share/applications/linuxdcpp.desktop +%%DATADIR%%/glade/downloadqueue.glade +%%DATADIR%%/glade/favoritehubs.glade +%%DATADIR%%/glade/favoriteusers.glade +%%DATADIR%%/glade/finishedtransfers.glade +%%DATADIR%%/glade/hash.glade +%%DATADIR%%/glade/hub.glade +%%DATADIR%%/glade/mainwindow.glade +%%DATADIR%%/glade/privatemessage.glade +%%DATADIR%%/glade/publichubs.glade +%%DATADIR%%/glade/search.glade +%%DATADIR%%/glade/settingsdialog.glade +%%DATADIR%%/glade/sharebrowser.glade +%%DATADIR%%/glade/transfers.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 +%%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 +%%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 +%%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 +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 +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 |