diff options
| -rw-r--r-- | net-p2p/linuxdcpp/Makefile | 17 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-BufferSocket.cpp | 11 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 12 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/pkg-plist | 2 |
4 files changed, 32 insertions, 10 deletions
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile index b36a6b228bab..38db74ea9a1f 100644 --- a/net-p2p/linuxdcpp/Makefile +++ b/net-p2p/linuxdcpp/Makefile @@ -13,9 +13,8 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs -USE_BZIP2= yes USE_GNOME= libglade2 -USES= iconv pkgconfig scons +USES= iconv pkgconfig scons tar:bzip2 USE_OPENSSL= yes PORTDOCS= * DESTDIRNAME= FAKE_ROOT @@ -27,16 +26,18 @@ OPTIONS_DEFAULT=NOTIFY MAKE_ARGS+= debug=1 .endif -.include <bsd.port.options.mk> +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -.else -MAKE_ARGS+= libnotify=0 -.endif +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NOTIFY_MAKE_ARGS_OFF= libnotify=0 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/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 index 360a88eeced2..20fa13e02dd2 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -17,6 +17,18 @@ 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,7 +131,10 @@ + 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() @@ -139,6 +140,12 @@ if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() diff --git a/net-p2p/linuxdcpp/pkg-plist b/net-p2p/linuxdcpp/pkg-plist index e52a30646caf..d6ed1a90456e 100644 --- a/net-p2p/linuxdcpp/pkg-plist +++ b/net-p2p/linuxdcpp/pkg-plist @@ -125,5 +125,3 @@ 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 |