From 6be3ab4d889e396bdaa81f55ac12d2f1f5366ae0 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Mon, 26 Jul 2004 11:15:24 +0000
Subject: fix a dependency in the tracer Makefile.aimk to hopefully fix compile
 problems noted in NetBSD-2.0 branch bulk builds.

---
 parallel/pvm3/distinfo         |  4 ++--
 parallel/pvm3/patches/patch-br | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'parallel')

diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 51ef1a7e834..3b9aadc5191 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2004/07/26 11:15:24 dmcmahill Exp $
 
 SHA1 (pvm3.4.4.tgz) = 95bfabee61383fe2223ee2f539129bb54b5afb40
 Size (pvm3.4.4.tgz) = 967852 bytes
@@ -45,7 +45,7 @@ SHA1 (patch-bn) = 31050e707a27256595f1ecc2fa48b45aabf69be4
 SHA1 (patch-bo) = 69dd03e65ae75cf330a05eedd5507311523acfc1
 SHA1 (patch-bp) = 5820e2ff17c58b2ee0ca7290bb8a259ff080087f
 SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
-SHA1 (patch-br) = 7a4f9f38e9d0d34c8a9b1aae4f409daf1b195e8a
+SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 87140b9f45685471fc2814de9624e23666f81735
 SHA1 (patch-bt) = c52c750af0e51c857ae9b73eda6afc1923706ff4
 SHA1 (patch-bu) = 0ee41192bf7c350b22e3f4dd804f20792dbfee47
diff --git a/parallel/pvm3/patches/patch-br b/parallel/pvm3/patches/patch-br
index 788eb53bca2..6158dcc310e 100644
--- a/parallel/pvm3/patches/patch-br
+++ b/parallel/pvm3/patches/patch-br
@@ -1,14 +1,30 @@
-$NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-br,v 1.2 2004/07/26 11:15:24 dmcmahill Exp $
 
 --- tracer/Makefile.aimk.orig	Thu Oct  1 21:13:24 1998
-+++ tracer/Makefile.aimk	Wed Mar 24 18:26:39 2004
-@@ -24,4 +24,5 @@
++++ tracer/Makefile.aimk
+@@ -23,6 +23,7 @@ CFLOPTS		=	-O
+ #CC			=	gcc
  
  CFLAGS		=	$(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
 +LTCC=	${LIBTOOL} --mode=compile ${CC}
  
  
-@@ -107,30 +108,34 @@
+ #
+@@ -56,10 +57,10 @@ SYSLIBS	 	=	$(ARCHLIB)
+ LIBPREFIX	=	lib
+ 
+ PVMLIB		=	pvm3
+-PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
++PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
+ 
+ TRCLIB		=	pvmtrc
+-LIBPVMTRC	=	$(LIBPREFIX)$(TRCLIB).a
++LIBPVMTRC	=	$(LIBPREFIX)$(TRCLIB).la
+ TRCLIBDEP	=	$(PVMLDIR)/$(LIBPVMTRC)
+ 
+ LIBS		=	$(LIBDIRS) -l$(TRCLIB) -l$(PVMLIB) $(SYSLIBS)
+@@ -106,32 +107,36 @@ default:  local
+ install:  $(PVMXDIR) $(PVMLDIR) $(PROGS)
  
  $(PVMXDIR)/tracer$(EXESFX):  tracer$(EXESFX)
 -	@ cp tracer$(EXESFX) $(PVMXDIR)
@@ -42,18 +58,20 @@ $NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 -	@ cp $(LIBPVMTRC) $(PVMLDIR)
 +	${MKDIR} $(PVMLDIR)/.libs
 +	-cp .libs/* $(PVMLDIR)/.libs
-+	cp $(LIBPVMTRC:.a=.*) $(PVMLDIR)
++	cp $(LIBPVMTRC:.la=.*) $(PVMLDIR)
  
  $(LIBPVMTRC):  $(TRCOBJS) $(PVMLDIR)
 -	$(AR) rcv $(LIBPVMTRC) $(TRCOBJS)
 -	@ case x$(HASRANLIB) in \
 -		xt ) echo "ranlib $(LIBPVMTRC)"; ranlib $(LIBPVMTRC) ;; \
 -		xf ) echo "No Ranlib Necessary." ;; esac
-+	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${TRCOBJS:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${TRCOBJS:.o=.lo} \
 +		-rpath ${PVM_DIR}/lib/$(PVM_ARCH)  -version-info ${PVMLIB_VER}
  
  $(PVMXDIR):
-@@ -157,13 +162,13 @@
+ 	- mkdir $(PVMBDIR)
+@@ -156,15 +161,15 @@ veryclean:  clean
+ 
  tracer.o:  $(SRCDIR)/tracer.c $(HEADERS)
  	@ touch tracer.o
 -	$(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/tracer.c
@@ -70,7 +88,9 @@ $NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 +	$(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcglob.c
  
  
-@@ -174,24 +179,24 @@
+ #
+@@ -173,25 +178,25 @@ trcglob.o:  $(SRCDIR)/trcglob.c $(HEADER
+ 
  trcmess.o:  $(TRCDIR)/trcmess.c $(TRCHEADERS)
  	@ touch trcmess.o
 -	$(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcmess.c
-- 
cgit v1.2.3