diff options
author | rillig <rillig> | 2007-12-01 13:55:11 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-12-01 13:55:11 +0000 |
commit | 08363b35be906927210a5a977300ac9a7ccd1be1 (patch) | |
tree | a4c15facb8d35c76116be94dff6194f23123d361 /mbone/mdp/patches | |
parent | 7543ccbfb4dc8bd95d52228d6279f512abf153ef (diff) | |
download | pkgsrc-08363b35be906927210a5a977300ac9a7ccd1be1.tar.gz |
Restructured the package so that all source files can be patched.
Fixed build failures with g++4.
Diffstat (limited to 'mbone/mdp/patches')
-rw-r--r-- | mbone/mdp/patches/patch-aa | 25 | ||||
-rw-r--r-- | mbone/mdp/patches/patch-ab | 7 | ||||
-rw-r--r-- | mbone/mdp/patches/patch-ac | 18 | ||||
-rw-r--r-- | mbone/mdp/patches/patch-ad | 29 |
4 files changed, 51 insertions, 28 deletions
diff --git a/mbone/mdp/patches/patch-aa b/mbone/mdp/patches/patch-aa deleted file mode 100644 index 072e55387d5..00000000000 --- a/mbone/mdp/patches/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/07/26 12:17:04 manu Exp $ ---- Makefile.common.orig Tue Jul 23 17:30:37 2002 -+++ Makefile.common Tue Jul 23 17:31:03 2002 -@@ -48,9 +48,9 @@ - - # MDP depends upon the NRL Protean Group's development library - LIBPROTO = $(PROTOLIB)/unix/libProto.a - $(PROTOLIB)/unix/libProto.a: -- make -C $(PROTOLIB)/unix -f Makefile.common libProto.a -+ ${MAKE} -C $(PROTOLIB)/unix -f Makefile.common libProto.a - - MDP_SRC = $(COMMON)/mdpBitMask.cpp $(COMMON)/mdpMessage.cpp \ - $(COMMON)/mdpEncoder.cpp $(COMMON)/galois.cpp \ - $(COMMON)/mdpSession.cpp $(COMMON)/mdpMsgHandler.cpp \ -@@ -119,9 +119,9 @@ - - clean: - rm -f *.o $(COMMON)/*.o $(NS)/*.o $(UNIX)/TclTkLibs.* $(UNIX)/tkMdpDlg.cpp $(UNIX)/tcl2c; - rm -f $(UNIX)/libMdp.a $(UNIX)/tkMdp $(UNIX)/mdp $(UNIX)/mdpChat $(UNIX)/mdpTrace; -- make -C $(PROTOLIB)/unix -f Makefile.common clean -+ ${MAKE} -C $(PROTOLIB)/unix -f Makefile.common clean - - # DO NOT DELETE THIS LINE -- mkdep uses it. - # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - diff --git a/mbone/mdp/patches/patch-ab b/mbone/mdp/patches/patch-ab index b2459d198b9..d10cfdcf90c 100644 --- a/mbone/mdp/patches/patch-ab +++ b/mbone/mdp/patches/patch-ab @@ -1,6 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2003/10/18 13:20:32 cjep Exp $ ---- Makefile.netbsd.orig 2002-01-08 06:18:57.000000000 +1100 -+++ Makefile.netbsd 2003-10-10 13:25:32.000000000 +1000 +$NetBSD: patch-ab,v 1.4 2007/12/01 13:55:12 rillig Exp $ + +--- unix/Makefile.netbsd.orig 2002-01-08 06:18:57.000000000 +1100 ++++ unix/Makefile.netbsd 2003-10-10 13:25:32.000000000 +1000 @@ -10,26 +10,26 @@ # 1) Where to find the Tcl standard library scripts diff --git a/mbone/mdp/patches/patch-ac b/mbone/mdp/patches/patch-ac new file mode 100644 index 00000000000..f8d3472f93f --- /dev/null +++ b/mbone/mdp/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1 2007/12/01 13:55:12 rillig Exp $ + +Friend declarations are not class definitions. + +--- common/mdpObject.h.orig 2002-01-07 19:18:57.000000000 +0000 ++++ common/mdpObject.h 2007-12-01 13:42:33.000000000 +0000 +@@ -419,6 +419,11 @@ enum MdpNackingMode + MDP_NACKING_NORMAL + }; + ++class MdpSession; ++class MdpServerNode; ++class MdpObjectList; ++class MdpObjectListIterator; ++ + class MdpObject + #ifdef USE_INHERITANCE + : public ProtocolTimerOwner diff --git a/mbone/mdp/patches/patch-ad b/mbone/mdp/patches/patch-ad new file mode 100644 index 00000000000..13dcbaa6cb0 --- /dev/null +++ b/mbone/mdp/patches/patch-ad @@ -0,0 +1,29 @@ +$NetBSD: patch-ad,v 1.1 2007/12/01 13:55:12 rillig Exp $ + +--- protolib/common/eventDispatcher.h.orig 2002-01-14 17:29:05.000000000 +0000 ++++ protolib/common/eventDispatcher.h 2007-12-01 13:41:07.000000000 +0000 +@@ -121,13 +121,13 @@ class EventDispatcher + // If this optional socket installer is used instead of + // explicit calls to "AddSocketInput()", the UdpSocket "installData" + // should be inited to a pointer to the EventDispatcher instance. +- static bool EventDispatcher::SocketInstaller(UdpSocketCmd cmd, ++ static bool SocketInstaller(UdpSocketCmd cmd, + UdpSocket* theSocket, + const void* installData); + + // (TBD) Provide a static TimerInstaller so EventDispatcher + // users can use their own ProtocolTimerMgrs if desired +- static bool EventDispatcher::TimerInstaller( ++ static bool TimerInstaller( + ProtocolTimerInstallCmd cmd, + double delay, + ProtocolTimerMgr* timerMgr, +@@ -162,7 +162,7 @@ class EventDispatcher + bool InstallTimerMgr(ProtocolTimerMgr* timerMgr, double delay); + bool ModifyTimerMgr(ProtocolTimerMgr* timerMgr, double delay); + bool RemoveTimerMgr(ProtocolTimerMgr* timerMgr); +- static bool EventDispatcher::PrivateTimerInstaller(ProtocolTimerInstallCmd cmd, ++ static bool PrivateTimerInstaller(ProtocolTimerInstallCmd cmd, + double theDelay, + ProtocolTimerMgr* timerMgr, + const void* installData); |