Date: Wed, 18 Jun 2014 12:23:54 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358264 - in head/net-p2p/linuxdcpp: . files Message-ID: <201406181223.s5ICNsPb029089@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Wed Jun 18 12:23:54 2014 New Revision: 358264 URL: http://svnweb.freebsd.org/changeset/ports/358264 QAT: https://qat.redports.org/buildarchive/r358264/ Log: Fix port so it builds again. Did some minor housekeeping while being there. PR: 190600 Reviewed by: bapt Approved by: bapt Added: head/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp (contents, props changed) Modified: head/net-p2p/linuxdcpp/Makefile head/net-p2p/linuxdcpp/files/patch-SConstruct head/net-p2p/linuxdcpp/pkg-plist Modified: head/net-p2p/linuxdcpp/Makefile ============================================================================== --- head/net-p2p/linuxdcpp/Makefile Wed Jun 18 12:23:46 2014 (r358263) +++ head/net-p2p/linuxdcpp/Makefile Wed Jun 18 12:23:54 2014 (r358264) @@ -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> Added: head/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp Wed Jun 18 12:23:54 2014 (r358264) @@ -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 Modified: head/net-p2p/linuxdcpp/files/patch-SConstruct ============================================================================== --- head/net-p2p/linuxdcpp/files/patch-SConstruct Wed Jun 18 12:23:46 2014 (r358263) +++ head/net-p2p/linuxdcpp/files/patch-SConstruct Wed Jun 18 12:23:54 2014 (r358264) @@ -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() Modified: head/net-p2p/linuxdcpp/pkg-plist ============================================================================== --- head/net-p2p/linuxdcpp/pkg-plist Wed Jun 18 12:23:46 2014 (r358263) +++ head/net-p2p/linuxdcpp/pkg-plist Wed Jun 18 12:23:54 2014 (r358264) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406181223.s5ICNsPb029089>