Unbreak this port by applying a simplified version of the real patch that

was submitted [1] which
- adds USE_GCC since that's how libpvm3.a (a dependency) was built;
- works around pvm's aimk build system to pass our LDFLAGS.

While we are at it, migrate to the new LIB_DEPENDS format.

PR:             183342 [1]
Submitted by:   Christoph Moench-Tegeder <cmt@burggraben.net> [1]
Pointyhat to:	gerald [1]
This commit is contained in:
Gerald Pfeifer 2013-12-07 22:23:29 +00:00
parent ba38e3c0f8
commit 6cf4cb90d1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=335853
3 changed files with 14 additions and 16 deletions

View file

@ -13,13 +13,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A Graphical Console and Monitor for PVM
BROKEN= Fails to patch
MAKE_JOBS_UNSAFE= yes
USE_GCC= yes
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
LIB_DEPENDS= libtk84.so:${PORTSDIR}/x11-toolkits/tk84
WRKSRC= ${WRKDIR}/xpvm
PVM_ROOT?= ${LOCALBASE}/lib/pvm

View file

@ -1,10 +0,0 @@
--- mrt/base_file.h.orig 2013-11-16 13:43:12.000000000 +0100
+++ mrt/base_file.h 2013-11-16 13:44:09.000000000 +0100
@@ -20,6 +20,7 @@
*/
#include <string>
+#include <sys/types.h>
#include "export_mrt.h"
namespace mrt {

View file

@ -1,6 +1,14 @@
diff -ruN xpvm.orig/src/Makefile.aimk xpvm/src/Makefile.aimk
--- src/Makefile.aimk Fri Apr 10 05:11:22 1998
+++ src/Makefile.aimk Thu Apr 1 13:38:57 2004
--- src/Makefile.aimk.orig 1998-04-09 23:11:22.000000000 +0200
+++ src/Makefile.aimk 2013-11-16 20:41:32.000000000 +0100
@@ -29,7 +29,7 @@
#CC = gcc
CFLAGS = $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
-LFLAGS = $(ARCHCFLAGS)
+LFLAGS = $(LDFLAGS) $(ARCHCFLAGS)
AIMK = $(PVM_ROOT)/lib/aimk
@@ -39,36 +39,39 @@
#
@ -100,3 +108,4 @@ diff -ruN xpvm.orig/src/Makefile.aimk xpvm/src/Makefile.aimk
+ $(LOCALBASE)/include/pvmtev.h \
$(TRCDIR)/trcdef.h $(TRCDIR)/trctype.h \
$(TRCDIR)/trcproto.h $(TRCDIR)/trccompat.h