Fix build problem with new libtool.

3 files changed, 31 insertions, 12 deletions

diff --git a/graphics/urt/files/patch-sum b/graphics/urt/files/patch-sum
index c87aa1a228d..2166d8b67f0 100644
--- a/graphics/urt/files/patch-sum
+++ b/graphics/urt/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.9 2001/02/26 16:56:35 agc Exp $
+$NetBSD: patch-sum,v 1.10 2001/03/02 16:52:29 skrll Exp $
 
 MD5 (patch-aa) = 8b2f54cfb35b04cd5dddf6b2fe855820
 MD5 (patch-ab) = d452d364f338abd9b93ba68063252f63
@@ -10,7 +10,7 @@ MD5 (patch-ag) = 5fd8a529e2577fa07189fca6c141d012
 MD5 (patch-ah) = 5c4c8ba9732314cbc321c9dcf69fa903
 MD5 (patch-ai) = cbc0d6e2b3f5c4767098ec09d1e675f0
 MD5 (patch-aj) = 9aeeb4ad08b208ed370ab4ee96091d79
-MD5 (patch-ak) = f4cfd10b615a3818f2c434bd6e6f13c7
+MD5 (patch-ak) = f01c5b4f4c96773dffe889a315b35a6f
 MD5 (patch-al) = 1d752bb6028c57455f1b43f8eca769ab
 MD5 (patch-am) = ffce71bdaac42d46480127f1010f61bf
 MD5 (patch-an) = c1651cc133f0944ed06563ba2800d235
@@ -19,3 +19,4 @@ MD5 (patch-ap) = 4d63edc21f9839954dca8f6cbdfb2a41
 MD5 (patch-aq) = 0334a7c0708c6054216ceb1811e7e410
 MD5 (patch-ar) = dfd413eeeac906957dbc608559ffd3ea
 MD5 (patch-as) = 93f73c9101a9dd92f8872d3cc47aa3e8
+MD5 (patch-at) = f94aaf179021c695cecc6cfb46dbfbbb
diff --git a/graphics/urt/patches/patch-ak b/graphics/urt/patches/patch-ak
index 7fe4f7f991b..53d91b0ebff 100644
--- a/graphics/urt/patches/patch-ak
+++ b/graphics/urt/patches/patch-ak
@@ -1,17 +1,18 @@
-$NetBSD: patch-ak,v 1.3 2001/02/26 16:56:35 agc Exp $
+$NetBSD: patch-ak,v 1.4 2001/03/02 16:52:29 skrll Exp $
 
---- lib/makefile.src.orig	Wed Mar  4 20:32:53 1992
+--- lib/makefile.src.orig	Wed Mar  4 19:32:53 1992
 +++ lib/makefile.src
-@@ -9,6 +9,8 @@
- RANLIB = ranlib
- #endif
+@@ -26,6 +26,9 @@
+ 	vaxshort.o \
+ 	$(OPT_OBJS)
  
-+CC= ${LIBTOOL} --mode=compile gcc
++.c.o:
++	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${CPPFLAGS} -c ${.IMPSRC}
 +
- # If nothing else is specified, default is to build the library.
- default: buildlib
+ LIBNAME = librle.a
  
-@@ -36,40 +38,13 @@
+ # Just rebuild the object files.
+@@ -36,40 +39,13 @@
  #  is more useful to have a non-debug version than nothing at all.)
  # Do nothing if $(DEST) is empty (or not defined)
  install: buildlib
@@ -50,7 +51,7 @@ $NetBSD: patch-ak,v 1.3 2001/02/26 16:56:35 agc Exp $
 -#ifndef NO_RANLIB
 -	ranlib $(LIBNAME)
 -#endif
-+	${LIBTOOL} --mode=link cc -o ${LIBNAME:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
++	${LIBTOOL} --mode=link ${CC} -o ${LIBNAME:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
  	touch buildlib
  
  # Clean up installed stuff and binaries
diff --git a/graphics/urt/patches/patch-at b/graphics/urt/patches/patch-at
new file mode 100644
index 00000000000..8c13f8c4a38
--- /dev/null
+++ b/graphics/urt/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1 2001/03/02 16:52:29 skrll Exp $
+
+--- makefile.hdr.orig	Fri Mar  2 16:04:55 2001
++++ makefile.hdr
+@@ -48,9 +48,9 @@
+ CFLAGS = -O $(DFLAGS) $(DIRFLAGS) $(ExtraCFLAGS) $(IFLAGS) $(MachFLAGS) 
+ IFLAGS = -I. -I$(RI)
+ 
+-#ifdef GCC
+-CC=gcc
+-#endif
++##ifdef GCC
++#CC=gcc
++##endif
+ 
+ 
+ # System V make pays attention to the SHELL environment variable. Override it.