Fix up some more bugs introduced by the libtoolization. Hopefully this

will finally fix all of the bulk build problems seen on -current and
2.0 branch machines (1.6 branch has never had problems).

5 files changed, 92 insertions, 29 deletions

diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 3b9aadc5191..19f5fd78fd7 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/07/26 11:15:24 dmcmahill Exp $
+$NetBSD: distinfo,v 1.14 2004/07/30 13:07:25 dmcmahill Exp $
 
 SHA1 (pvm3.4.4.tgz) = 95bfabee61383fe2223ee2f539129bb54b5afb40
 Size (pvm3.4.4.tgz) = 967852 bytes
@@ -46,9 +46,9 @@ SHA1 (patch-bo) = 69dd03e65ae75cf330a05eedd5507311523acfc1
 SHA1 (patch-bp) = 5820e2ff17c58b2ee0ca7290bb8a259ff080087f
 SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
-SHA1 (patch-bs) = 87140b9f45685471fc2814de9624e23666f81735
-SHA1 (patch-bt) = c52c750af0e51c857ae9b73eda6afc1923706ff4
+SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
+SHA1 (patch-bt) = d9331073d273a197f4a03499d69693b63f7fb473
 SHA1 (patch-bu) = 0ee41192bf7c350b22e3f4dd804f20792dbfee47
 SHA1 (patch-bv) = bf9a53cceb5d0c0cbe541a612e014c8421b470da
-SHA1 (patch-bw) = 881c72c6cb07428dd1110bed52a7cd3512259f3c
-SHA1 (patch-bx) = 7c22c0da74e8d09c8deb950b98f4e9652dcd57a7
+SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
+SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
diff --git a/parallel/pvm3/patches/patch-bs b/parallel/pvm3/patches/patch-bs
index 803a72ab05b..dbfde19d5bd 100644
--- a/parallel/pvm3/patches/patch-bs
+++ b/parallel/pvm3/patches/patch-bs
@@ -1,8 +1,20 @@
-$NetBSD: patch-bs,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bs,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
 
 --- console/Makefile.aimk.orig	Thu Aug 28 18:12:54 1997
-+++ console/Makefile.aimk	Wed Mar 24 18:39:55 2004
-@@ -37,17 +37,21 @@
++++ console/Makefile.aimk
+@@ -20,8 +20,8 @@ TRCLDIR		=	$(TRCDIR)/$(PVM_ARCH)
+ PVMLIB		=	pvm3
+ TRCLIB		=	pvmtrc
+ LIBPREFIX	=	lib
+-PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
+-TRCLIBDEP	=	$(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).a
++PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
++TRCLIBDEP	=	$(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).la
+ CFLAGS		=	$(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \
+ 				-I$(PVMSDIR) $(ARCHCFLAGS)
+ LIBS		=	$(LOPT) -L$(TRCLDIR) -L$(PVMLDIR) \
+@@ -36,19 +36,23 @@ $(PVMLDIR):
+ 	- mkdir $(PVMLDIR)
  
  $(PVMLDIR)/pvm$(EXESFX):	pvm$(EXESFX)
 +	${MKDIR} $(PVMLDIR)/.libs
@@ -29,3 +41,4 @@ $NetBSD: patch-bs,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 +	$(LTCC) $(CFLAGS) -c $(SDIR)/trc.c
  
  clean:
+ 	rm -f *.o pvm$(EXESFX)
diff --git a/parallel/pvm3/patches/patch-bt b/parallel/pvm3/patches/patch-bt
index c1ede03870b..3c7e0bfadf3 100644
--- a/parallel/pvm3/patches/patch-bt
+++ b/parallel/pvm3/patches/patch-bt
@@ -1,8 +1,27 @@
-$NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
 
 --- pvmgs/Makefile.aimk.orig	Wed Feb 16 21:49:03 2000
-+++ pvmgs/Makefile.aimk	Thu Mar 25 01:45:35 2004
-@@ -58,15 +58,22 @@
++++ pvmgs/Makefile.aimk
+@@ -26,7 +26,7 @@ PVMXDIR		=	$(PVMBDIR)/$(PVM_ARCH)
+ PVMLDIR		=	$(PVMDIR)/lib/$(PVM_ARCH)
+ PVMLIB		=	pvm3
+ LIBPREFIX	=	lib
+-PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
++PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
+ 				$(ARCHCFLAGS)
+ LIBS		=	$(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
+@@ -39,7 +39,7 @@ PROGS		=	$(PVMXDIR)/pvm_gstat$(EXESFX) \
+ 
+ LPROGS		=	$(PVMLDIR)/pvmgs$(EXESFX)
+ 
+-LIBGPVM		=	$(LIBPREFIX)gpvm3.a
++LIBGPVM		=	$(LIBPREFIX)gpvm3.la
+ 
+ install:	all
+ 
+@@ -57,17 +57,24 @@ $(PVMLDIR):
+ 	- mkdir $(PVMLDIR)
  
  $(PVMXDIR)/pvm_gstat$(EXESFX):  pvm_gstat$(EXESFX)
 +	${MKDIR} $(PVMXDIR)/.libs
@@ -24,10 +43,12 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 -	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
 +	${MKDIR} $(PVMLDIR)/.libs
 +	-cp .libs/* $(PVMLDIR)/.libs
-+	cp $(LIBGPVM:.a=.*) $(PVMLDIR)
++	cp $(LIBGPVM:.la=.*) $(PVMLDIR)
  
  $(PVMLDIR)/$(LIBGPVM)-mpp:  $(LIBGPVM)-mpp
-@@ -76,16 +83,21 @@
+ 	cp $(LIBGPVM) $(PVMLDIR)
+@@ -75,18 +82,23 @@ $(PVMLDIR)/$(LIBGPVM)-mpp:  $(LIBGPVM)-m
+ 	touch $(PVMLDIR)/$(LIBGPVM)-mpp
  
  $(PVMLDIR)/pvmgs$(EXESFX):  pvmgs$(EXESFX)
 +	${MKDIR} $(PVMLDIR)/.libs
@@ -38,7 +59,7 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 +
  pvmgroups$(EXESFX):	pvmgroups.o $(LIBGPVM) $(PVMLIBDEP)
 -	$(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM) $(LIBS) 
-+	$(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvmgroups.lo $(LIBGPVM:.a=.la) $(LIBS) 
++	$(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvmgroups.lo $(LIBGPVM) $(LIBS) 
  
  pvmgs$(EXESFX):	$(DOBJ) $(PVMLIBDEP)
 -	$(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS)
@@ -48,19 +69,23 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
  	rm -f $(LIBGPVM)
 -	$(AR) cr $(LIBGPVM) $(LOBJ)
 -	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
-+	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${LOBJ:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${LOBJ:.o=.lo} \
 +		-rpath ${PVM_DIR}/lib/$(PVM_ARCH) \
 +		-version-info ${PVMLIB_VER}
  
  $(LIBGPVM)-mpp:	$(LOBJ)
-@@ -96,5 +108,5 @@
+ 	rm -f $(LIBGPVM)
+@@ -95,7 +107,7 @@ $(LIBGPVM)-mpp:	$(LOBJ)
+ 	touch $(LIBGPVM)-mpp
  
  pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
 -	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvm_gstat.lo $(LIBGPVM:.a=.la) $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvm_gstat.lo $(LIBGPVM) $(LIBS)
  
  clean:
-@@ -111,15 +123,15 @@
+ 	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
+@@ -110,17 +122,17 @@ lint:
+ 
  #
  pvmgsu_core.o:	$(SDIR)/pvmgsu_core.c
 -	$(CC) $(CFLAGS) -c $(SDIR)/pvmgsu_core.c
@@ -82,3 +107,4 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 +	$(LTCC) $(CFLAGS) -c $(SDIR)/pvmgs_func.c
  
  #
+ # Source File Dependencies
diff --git a/parallel/pvm3/patches/patch-bw b/parallel/pvm3/patches/patch-bw
index 100cd77863c..de7da60c338 100644
--- a/parallel/pvm3/patches/patch-bw
+++ b/parallel/pvm3/patches/patch-bw
@@ -1,24 +1,35 @@
-$NetBSD: patch-bw,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bw,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
 
 --- libfpvm/Makefile.aimk.orig	Mon Mar 15 19:05:11 1999
-+++ libfpvm/Makefile.aimk	Wed Mar 24 23:23:12 2004
-@@ -110,9 +110,12 @@
++++ libfpvm/Makefile.aimk
+@@ -35,7 +35,7 @@ PVMBFUNCH		=	$(PVMDIR)/src/bfunc.h
+ PVMBFHEADERS	=	$(PVMHEADERS) $(PVMBFUNCH)
+ 
+ LIBPREFIX		=	lib
+-LIBFPVM			=	$(LIBPREFIX)fpvm3.a
++LIBFPVM			=	$(LIBPREFIX)fpvm3.la
+ 
+ LOBS			=	pvmfaddhost.o \
+ 					pvmfaddmhf.o \
+@@ -109,11 +109,14 @@ $(PVMLDIR):
+ 	- mkdir $(PVMLDIR)
  
  $(PVMLDIR)/$(LIBFPVM):  $(LIBFPVM)
--	cp $(LIBFPVM) $(PVMLDIR)
 +	${MKDIR} $(PVMLDIR)/.libs
 +	cp .libs/* $(PVMLDIR)/.libs
-+	cp $(LIBFPVM:.a=.la) $(PVMLDIR)
+ 	cp $(LIBFPVM) $(PVMLDIR)
  
  $(LIBFPVM):  $(LOBS) ftocstr.o
 -	$(AR) cr $(LIBFPVM) $?
 -	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBFPVM) ;; esac
-+	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${LOBS:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${LOBS:.o=.lo} \
 +		ftocstr.lo -rpath ${PVM_DIR}/lib/$(PVM_ARCH) \
 +		-version-info ${PVMLIB_VER}
  
  clean:
-@@ -122,320 +125,322 @@
+ 	rm -f $(LOBS) ftocstr.o $(LIBFPVM)
+@@ -121,321 +124,323 @@ clean:
+ tidy:
  	rm -f $(LOBS)
  
 +LTCC=	$(LIBTOOL) --mode=compile $(CC)
diff --git a/parallel/pvm3/patches/patch-bx b/parallel/pvm3/patches/patch-bx
index 6a0217e88c1..9505d71afd6 100644
--- a/parallel/pvm3/patches/patch-bx
+++ b/parallel/pvm3/patches/patch-bx
@@ -1,15 +1,27 @@
-$NetBSD: patch-bx,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bx,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
 
 --- rm/Makefile.aimk.orig	Thu Aug 28 21:20:11 1997
-+++ rm/Makefile.aimk	Thu Mar 25 02:03:29 2004
-@@ -43,4 +43,6 @@
++++ rm/Makefile.aimk
+@@ -20,7 +20,7 @@ PVMIDIR		=	$(PVMDIR)/include
+ PVMLDIR		=	$(PVMDIR)/lib/$(PVM_ARCH)
+ PVMLIB		=	pvm3
+ LIBPREFIX	=	lib
+-PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
++PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
+ SDIR		=	$(PVMDIR)/rm
+ BDIR		=	$(PVMDIR)/bin
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+@@ -42,6 +42,8 @@ $(XDIR):
+ 	- mkdir $(XDIR)
  
  $(XDIR)/srm$(EXESFX):  srm$(EXESFX)
 +	${MKDIR} $(XDIR)/.libs
 +	-cp .libs/srm$(EXESFX) $(XDIR)/.libs
  	cp srm$(EXESFX) $(XDIR)
  
-@@ -52,9 +54,12 @@
+ 
+@@ -51,11 +53,14 @@ install: $(XDIR) $(XDIR)/srm$(EXESFX)
+ 
  local:	srm$(EXESFX)
  
 +LTCC=		$(LIBTOOL) --mode=compile $(CC)
@@ -24,3 +36,4 @@ $NetBSD: patch-bx,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 +	$(LTCC) $(CFLAGS) -c $(SDIR)/srm.c
  
  again:
+ 	cd $(SDIR) ; touch *.c *.h ; make