pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mbone/mdp Restructured the package so that all source ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a77976eb0f7b
branches: trunk
changeset: 536026:a77976eb0f7b
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Dec 01 13:55:11 2007 +0000
description:
Restructured the package so that all source files can be patched.
Fixed build failures with g++4.
diffstat:
mbone/mdp/Makefile | 22 +++++++++++++---------
mbone/mdp/distinfo | 7 ++++---
mbone/mdp/patches/patch-aa | 25 -------------------------
mbone/mdp/patches/patch-ab | 7 ++++---
mbone/mdp/patches/patch-ac | 18 ++++++++++++++++++
mbone/mdp/patches/patch-ad | 29 +++++++++++++++++++++++++++++
6 files changed, 68 insertions(+), 40 deletions(-)
diffs (162 lines):
diff -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/Makefile
--- a/mbone/mdp/Makefile Sat Dec 01 13:39:05 2007 +0000
+++ b/mbone/mdp/Makefile Sat Dec 01 13:55:11 2007 +0000
@@ -1,29 +1,33 @@
-# $NetBSD: Makefile,v 1.15 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/12/01 13:55:11 rillig Exp $
#
DISTNAME= src-mdp-1.9a5
PKGREVISION= 1
CATEGORIES= mbone
-MASTER_SITES+= http://downloads.pf.itd.nrl.navy.mil/mdp/
-MASTER_SITES+= http://downloads.pf.itd.nrl.navy.mil/protolib/
+MASTER_SITES= http://downloads.pf.itd.nrl.navy.mil/mdp/ \
+ http://downloads.pf.itd.nrl.navy.mil/protolib/
DISTFILES= src-mdp-1.9a5.tgz src-protolib-1.0a3d.tgz
MAINTAINER= manu%NetBSD.org@localhost
HOMEPAGE= http://cs.itd.nrl.navy.mil/work/mdp/
COMMENT= Multicast file transfer
-WRKSRC= ${WRKDIR}/mdp/unix
+WRKSRC= ${WRKDIR}/mdp
+BUILD_DIRS= unix
USE_LANGUAGES= c++
USE_TOOLS+= gmake
BUILD_TARGET= mdp
INSTALLATION_DIRS= bin
-pre-build:
- ${LN} -sf ${WRKSRC}/Makefile.netbsd ${WRKSRC}/Makefile
- ${RM} -f ${WRKSRC}/../protolib
- ${LN} -sf ${WRKDIR}/protolib-1.0 ${WRKSRC}/../protolib
+post-extract:
+ rm ${WRKSRC}/protolib
+ mv ${WRKDIR}/protolib-1.0 ${WRKSRC}/protolib
+
+do-configure:
+ cd ${WRKSRC}/unix && rm -f Makefile && ln -s Makefile.netbsd Makefile
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mdp ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/mdp ${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/distinfo
--- a/mbone/mdp/distinfo Sat Dec 01 13:39:05 2007 +0000
+++ b/mbone/mdp/distinfo Sat Dec 01 13:55:11 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:33:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2007/12/01 13:55:11 rillig Exp $
SHA1 (src-mdp-1.9a5.tgz) = 62d688cc7f570d4492d6e0839026b6a72a5c7163
RMD160 (src-mdp-1.9a5.tgz) = ba9a614466995eff42ea14d2afdb442fff780284
@@ -6,5 +6,6 @@
SHA1 (src-protolib-1.0a3d.tgz) = 4532de7a4bce6e7190ab3afa5dbf82f31f1775a8
RMD160 (src-protolib-1.0a3d.tgz) = 53946fbdd298f0ea1d039531f57fe2d6460d8505
Size (src-protolib-1.0a3d.tgz) = 59402 bytes
-SHA1 (patch-aa) = 0cadf302bbf20bb4a283500c6589a1fbbd455dd7
-SHA1 (patch-ab) = a4b319aa47025c97d74103c5764d4ffa45c7fa7f
+SHA1 (patch-ab) = 6a958d89aa42c636e67a9989d8a94eba1d3816e6
+SHA1 (patch-ac) = 72ccea437882074279c887635deb1ad3acbcb3ed
+SHA1 (patch-ad) = b6ec185f71ee4bac3986739969f12395de591328
diff -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/patches/patch-aa
--- a/mbone/mdp/patches/patch-aa Sat Dec 01 13:39:05 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/patches/patch-ab
--- a/mbone/mdp/patches/patch-ab Sat Dec 01 13:39:05 2007 +0000
+++ b/mbone/mdp/patches/patch-ab Sat Dec 01 13:55:11 2007 +0000
@@ -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 -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbone/mdp/patches/patch-ac Sat Dec 01 13:55:11 2007 +0000
@@ -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 -r 72122a1d4a31 -r a77976eb0f7b mbone/mdp/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbone/mdp/patches/patch-ad Sat Dec 01 13:55:11 2007 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index