svn commit: r335929 - in head/net/pvm++: . files
Gerald Pfeifer
gerald at FreeBSD.org
Sun Dec 8 19:39:31 UTC 2013
Author: gerald
Date: Sun Dec 8 19:39:27 2013
New Revision: 335929
URL: http://svnweb.freebsd.org/changeset/ports/335929
Log:
Unbreak this port by applying the real patchset that was submitted [1] which
- adds USE_GCC since that's how libpvm3.a (a dependency) was built;
- renames namespace Pvm::Internal to avoid conflict with class Pvm::Internal;
- adds #include <stdlib.h> where required.
While we are at it, migrate from USE_GMAKE to USES=gmake.
PR: 182136 [1]
Submitted by: Christoph Moench-Tegeder <cmt at burggraben.net> [1]
Pointyhat to: gerald [1]
Added:
head/net/pvm++/files/patch-examples-forkjoin-forkjoin.cc (contents, props changed)
head/net/pvm++/files/patch-examples-talk-talk.hh (contents, props changed)
head/net/pvm++/files/patch-pvm++-class.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-handlertabletype.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-host.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-internal.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-internal.hh (contents, props changed)
head/net/pvm++/files/patch-pvm++-internal.ii (contents, props changed)
head/net/pvm++/files/patch-pvm++-private.hh (contents, props changed)
head/net/pvm++/files/patch-pvm++-struct.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-structset.cc (contents, props changed)
head/net/pvm++/files/patch-pvm++-task.cc (contents, props changed)
Deleted:
head/net/pvm++/files/patch-mrt-base_file.h
Modified:
head/net/pvm++/Makefile
Modified: head/net/pvm++/Makefile
==============================================================================
--- head/net/pvm++/Makefile Sun Dec 8 19:24:42 2013 (r335928)
+++ head/net/pvm++/Makefile Sun Dec 8 19:39:27 2013 (r335929)
@@ -10,12 +10,11 @@ MASTER_SITES= SF/pvm-plus-plus/pvm-plus-
MAINTAINER= ports at FreeBSD.org
COMMENT= A C++-Library for PVM
-BROKEN= Fails to patch
-
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
+USES= gmake
USE_AUTOTOOLS= libtool
-USE_GMAKE= yes
+USE_GCC= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \
--with-pvm-libs=${LOCALBASE}/lib
Added: head/net/pvm++/files/patch-examples-forkjoin-forkjoin.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-examples-forkjoin-forkjoin.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,10 @@
+--- examples/forkjoin/forkjoin.cc.orig 2013-11-16 20:05:10.000000000 +0100
++++ examples/forkjoin/forkjoin.cc 2013-11-16 20:05:29.000000000 +0100
+@@ -5,6 +5,7 @@
+
+ /* defines and prototypes for the PVM++ and PVM libraries */
+
++#include <stdlib.h>
+ #include <pvm++/pvm++.hh>
+
+ /* Maximum number of children this program will spawn */
Added: head/net/pvm++/files/patch-examples-talk-talk.hh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-examples-talk-talk.hh Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,7 @@
+--- examples/talk/talk.hh.orig 2013-11-16 20:05:10.000000000 +0100
++++ examples/talk/talk.hh 2013-11-16 20:05:46.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <pvm++/pvm++.hh>
+
+ const Pvm::StructId MessageId = 1;
Added: head/net/pvm++/files/patch-pvm++-class.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-class.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/class.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/class.cc 2013-11-16 20:02:45.000000000 +0100
+@@ -22,7 +22,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ void
+ Throw (int Error, const char *File, int Line)
Added: head/net/pvm++/files/patch-pvm++-handlertabletype.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-handlertabletype.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/handlertabletype.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/handlertabletype.cc 2013-11-16 20:03:09.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ ReceiveAction
+ HandlerTableType::Install (Struct &Struct, ReceiveAction What)
Added: head/net/pvm++/files/patch-pvm++-host.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-host.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/host.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/host.cc 2013-11-16 20:02:50.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ Host::operator unsigned int () const
+ {
Added: head/net/pvm++/files/patch-pvm++-internal.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-internal.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,23 @@
+--- pvm++/internal.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/internal.cc 2013-11-16 20:02:56.000000000 +0100
+@@ -27,7 +27,7 @@
+ namespace Pvm
+ {
+
+- namespace Internal
++ namespace Internal_
+ {
+
+ void
+@@ -225,9 +225,9 @@
+ HandlerTableType *HandlerTable;
+ QueueType *ReceivedQueue;
+
+- } // namespace Internal
++ } // namespace Internal_
+
+- using namespace Internal;
++ using namespace Internal_;
+
+ void
+ AccessPrivate::UnPack (const QueueIterator &QueuePos, StructSet &What,
Added: head/net/pvm++/files/patch-pvm++-internal.hh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-internal.hh Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,20 @@
+--- pvm++/internal.hh.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/internal.hh 2013-11-16 20:03:28.000000000 +0100
+@@ -37,7 +37,7 @@
+ long int EndSec, long int EnduSec);
+ };
+
+- namespace Internal
++ namespace Internal_
+ {
+
+ void GetTasks (int What, TaskSet & Result);
+@@ -69,7 +69,7 @@
+ extern HandlerTableType *HandlerTable;
+ extern QueueType *ReceivedQueue;
+
+- } // namespace Internal
++ } // namespace Internal_
+
+ } // namespace Pvm
+
Added: head/net/pvm++/files/patch-pvm++-internal.ii
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-internal.ii Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,20 @@
+--- pvm++/internal.ii.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/internal.ii 2013-11-16 20:03:32.000000000 +0100
+@@ -25,7 +25,7 @@
+ namespace Pvm
+ {
+
+- namespace Internal
++ namespace Internal_
+ {
+
+ inline
+@@ -57,7 +57,7 @@
+ return AccessPrivate::Select (StructSet, EndSec, EnduSec);
+ }
+
+- } // namespace Internal
++ } // namespace Internal_
+
+ } // namespace Pvm
+
Added: head/net/pvm++/files/patch-pvm++-private.hh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-private.hh Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/private.hh.orig 2013-11-16 20:04:12.000000000 +0100
++++ pvm++/private.hh 2013-11-16 20:04:29.000000000 +0100
+@@ -20,6 +20,8 @@
+ #ifndef __PVM_PRIVATE_HH__
+ #define __PVM_PRIVATE_HH__
+
++#include <stdlib.h>
++
+ #include <pvm++/pvm++.hh>
+
+ #include <pvm++/privatetypes.hh>
Added: head/net/pvm++/files/patch-pvm++-struct.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-struct.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/struct.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/struct.cc 2013-11-16 20:03:01.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ Task Struct::IgnoreTask;
+ bool Struct::CurrentlyPacking;
Added: head/net/pvm++/files/patch-pvm++-structset.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-structset.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/structset.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/structset.cc 2013-11-16 20:03:20.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ Task StructSet::IgnoreTask;
+
Added: head/net/pvm++/files/patch-pvm++-task.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm++/files/patch-pvm++-task.cc Sun Dec 8 19:39:27 2013 (r335929)
@@ -0,0 +1,11 @@
+--- pvm++/task.cc.orig 2013-11-16 19:59:44.000000000 +0100
++++ pvm++/task.cc 2013-11-16 20:03:04.000000000 +0100
+@@ -21,7 +21,7 @@
+
+ namespace Pvm
+ {
+- using namespace Internal;
++ using namespace Internal_;
+
+ bool
+ Task::HasParent () const
More information about the svn-ports-all
mailing list