Date: Sat, 7 Dec 2013 22:23:29 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335853 - in head/net/xpvm: . files Message-ID: <201312072223.rB7MNT8S054537@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sat Dec 7 22:23:29 2013 New Revision: 335853 URL: http://svnweb.freebsd.org/changeset/ports/335853 Log: 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] Deleted: head/net/xpvm/files/patch-mrt-base_file.h Modified: head/net/xpvm/Makefile head/net/xpvm/files/patch-src:Makefile.aimk Modified: head/net/xpvm/Makefile ============================================================================== --- head/net/xpvm/Makefile Sat Dec 7 22:08:49 2013 (r335852) +++ head/net/xpvm/Makefile Sat Dec 7 22:23:29 2013 (r335853) @@ -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 Modified: head/net/xpvm/files/patch-src:Makefile.aimk ============================================================================== --- head/net/xpvm/files/patch-src:Makefile.aimk Sat Dec 7 22:08:49 2013 (r335852) +++ head/net/xpvm/files/patch-src:Makefile.aimk Sat Dec 7 22:23:29 2013 (r335853) @@ -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 xp + $(LOCALBASE)/include/pvmtev.h \ $(TRCDIR)/trcdef.h $(TRCDIR)/trctype.h \ $(TRCDIR)/trcproto.h $(TRCDIR)/trccompat.h +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312072223.rB7MNT8S054537>