Fix installation.

Problem noted by Mark White <mark.white@st-edmund-hall.oxford.ac.uk> on
tech-pkg.

7 files changed, 142 insertions, 77 deletions

diff --git a/graphics/urt/patches/patch-ad b/graphics/urt/patches/patch-ad
index 150f7c81178..17c2adeba88 100644
--- a/graphics/urt/patches/patch-ad
+++ b/graphics/urt/patches/patch-ad
@@ -1,11 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2001/02/26 16:56:35 agc Exp $
+$NetBSD: patch-ad,v 1.3 2001/03/26 22:51:39 skrll Exp $
 
-Make sure that we don't override the PBMDIR definition that was
-carefully set up in config/urt
-
---- cnv/makefile.src	1998/08/24 15:26:04	1.1
-+++ cnv/makefile.src	1998/08/24 15:26:19
-@@ -71,18 +71,18 @@
+--- cnv/makefile.src.orig	Mon Dec 11 14:58:05 1995
++++ cnv/makefile.src
+@@ -71,19 +71,16 @@
  
  #ifdef PBMPLUS
  #emit PBMDIR
@@ -16,46 +13,64 @@ carefully set up in config/urt
  # rletoppm - RLE to ppm format
  pgmtorle.out: pgmtorle.c
 -	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.new ${LIBPBMPLUS} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
  ppmtorle.out: ppmtorle.c
 -	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.new ${LIBPBMPLUS} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
  rletoppm.out: rletoppm.c
 -	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.new ${LIBPBMPLUS} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
+ #endif
+ 
+ #ifdef POSTSCRIPT
+@@ -95,11 +92,9 @@
+ # iristorle/rletoiris - Convert between RLE and SGI image format.
+ #
+ iristorle.out: iristorle.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+-	mv $*.new $@
++	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.out
+ rletoiris.out: rletoiris.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+-	mv $*.new $@
++	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.out
  #endif
  
-@@ -108,10 +108,10 @@
+ #ifdef TIFF
+@@ -108,11 +103,9 @@
  # tifftorle - Convert TIFF images to RLE
  # rletotiff - Convert RLE images to TIFF
  rletotiff.out: rletotiff.c
 -	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.new ${LIBTIFF} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.out ${LIBTIFF} ../lib/librle.la -lm
  tifftorle.out: tifftorle.c
 -	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.new ${LIBTIFF} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.out ${LIBTIFF} ../lib/librle.la -lm
  #endif
  
-@@ -125,7 +125,7 @@
+ #ifdef WASATCH
+@@ -125,8 +118,7 @@
  # Will build with the default rule.
  # rletorla - RLE to Wavefront RLA
  rletorla.out: rletorla.c
 -	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.new ${LIBWAVEFRONT} ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.out ${LIBWAVEFRONT} ../lib/librle.la -lm
  #endif WAVEFRONT
  
-@@ -144,7 +144,7 @@
+ # Install stuff
+@@ -144,8 +136,7 @@
  .SUFFIXES:
  .SUFFIXES: .out .c
  .c.out:
 -	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.new ../lib/librle.la -lm
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.out ../lib/librle.la -lm
  
  # Dependency lines.  Make sure to #ifdef them.
+ # DO NOT DELETE THIS LINE
diff --git a/graphics/urt/patches/patch-am b/graphics/urt/patches/patch-am
index f6956e1a36b..95a14068051 100644
--- a/graphics/urt/patches/patch-am
+++ b/graphics/urt/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 1999/11/22 11:11:33 agc Exp $
+$NetBSD: patch-am,v 1.2 2001/03/26 22:51:39 skrll Exp $
 
---- makefile.tlr	Tue Aug  4 13:17:57 1992
-+++ makefile.tlr	Sat Sep 16 10:35:58 1995
+--- makefile.tlr.orig	Tue Aug  4 18:17:57 1992
++++ makefile.tlr
 @@ -7,7 +7,7 @@
  	@sh -c "if test 'x$(DIRS)' != x ; then eval \
  		'set -e ; for dir in $(DIRS) ; do \
@@ -11,7 +11,17 @@ $NetBSD: patch-am,v 1.1 1999/11/22 11:11:33 agc Exp $
  		done' ; \
  	  else \
  		true ; \
-@@ -46,7 +46,7 @@
+@@ -18,8 +18,7 @@
+ 	@sh -c "if test 'x$?' != x ; then eval \
+ 		'for pgm in $? ; do \
+ 			dpgm=\`basename \$$pgm .out\` ; \
+-			echo cp \$$pgm $(DEST)/\$$dpgm ; \
+-			cp \$$pgm $(DEST)/\$$dpgm; \
++			${LIBTOOL} --mode=install cp \$$pgm $(DEST)/\$$dpgm; \
+ 		done' ; \
+ 	else \
+ 	    true ; \
+@@ -46,7 +45,7 @@
  	@sh -c "if test 'x$(DIRS)' != x  ; then eval \
  		'for dir in $(DIRS) ; do \
  			(cd \$$dir ; echo Install ${HERE}\$$dir ; \
@@ -20,7 +30,7 @@ $NetBSD: patch-am,v 1.1 1999/11/22 11:11:33 agc Exp $
  		done' ; \
  	  else \
  		true ; \
-@@ -105,7 +105,7 @@
+@@ -105,7 +104,7 @@
  	    'for dir in $(ALLDIRS); do \
  		if test -d $$dir ; then \
  			(cd $$dir; echo Make ${HERE}$$dir pristine ; \
@@ -29,7 +39,7 @@ $NetBSD: patch-am,v 1.1 1999/11/22 11:11:33 agc Exp $
  		else \
  			true; \
  		fi; \
-@@ -124,7 +124,7 @@
+@@ -124,7 +123,7 @@
  	    'for dir in $(ALLDIRS); do \
  		if test -d $$dir ; then \
  			(cd $$dir; echo Clean ${HERE}$$dir ; \
diff --git a/graphics/urt/patches/patch-an b/graphics/urt/patches/patch-an
index fb436df9d86..8170db9b36e 100644
--- a/graphics/urt/patches/patch-an
+++ b/graphics/urt/patches/patch-an
@@ -1,44 +1,69 @@
-$NetBSD: patch-an,v 1.2 2001/02/26 16:56:36 agc Exp $
+$NetBSD: patch-an,v 1.3 2001/03/26 22:51:39 skrll Exp $
 
---- tools/makefile.src	Tue Jan 28 15:47:42 1992
-+++ tools/makefile.src	Sat Sep 16 10:33:14 1995
-@@ -62,24 +62,24 @@
+--- tools/makefile.src.orig	Tue Jan 28 18:47:42 1992
++++ tools/makefile.src
+@@ -13,7 +13,6 @@
+ 	mergechan.out \
+ 	pyrmask.out \
+ 	repos.out \
+-	rleClock.out \
+ 	rleaddcom.out \
+ 	rlebg.out \
+ 	rlebox.out \
+@@ -49,7 +48,7 @@
+ ALLDIRS = clock
+ 
+ # Default is what is to be made if nothing is specified.
+-default: $(PGMS)
++default: $(PGMS) rleClock.out
+ 
+ # Everything depends on the rle headers and libraries.
+ $(PGMS): $(RI)/rle.h $(RI)/rle_config.h
+@@ -62,30 +61,27 @@
  pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
  	$(CC) $(CFLAGS) pyrlib.c -c
  pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
 -	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} pyrmask.c pyrlib.o ../lib/librle.la -lm -o pyrmask.new
- 	mv pyrmask.new pyrmask.out
+-	mv pyrmask.new pyrmask.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} pyrmask.c pyrlib.o ../lib/librle.la -lm -o pyrmask.out
  
  fant.out: fant.o mallocNd.o
 -	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} fant.o mallocNd.o ../lib/librle.la -lm -o fant.new
- 	mv fant.new fant.out
+-	mv fant.new fant.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} fant.o mallocNd.o ../lib/librle.la -lm -o fant.out
  	
  # rlebox and crop use some common code.
  rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
  
  crop.out: crop.c rle_box.o
 -	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} crop.c rle_box.o ../lib/librle.la -lm -o crop.new
- 	mv crop.new crop.out
+-	mv crop.new crop.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} crop.c rle_box.o ../lib/librle.la -lm -o crop.out
  rlebox.out: rlebox.c rle_box.o
 -	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} rlebox.c rle_box.o ../lib/librle.la -lm -o rlebox.new
- 	mv rlebox.new rlebox.out
+-	mv rlebox.new rlebox.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} rlebox.c rle_box.o ../lib/librle.la -lm -o rlebox.out
  
 -# rleClock has it's own directory, must be built special
 +# rleClock has its own directory, must be built specially
  
  rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
- 	(cd clock ; make)
-@@ -100,8 +100,8 @@
+-	(cd clock ; make)
++	(cd clock ; $(MAKE))
+ 
+ # Incremental install, copies everything ("$?") since last install to DEST dir.
+ install: $(PGMS) install-pgm
++	(cd clock ; $(MAKE) install)
+ 	touch install
+ 
+ # Clean up installed stuff and binaries
+@@ -100,8 +96,7 @@
  .SUFFIXES:
  .SUFFIXES: .out .c .o
  .c.out:
 -	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} $< ../lib/librle.la -lm -o $*.new
- 	mv $*.new $@
+-	mv $*.new $@
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} $< ../lib/librle.la -lm -o $*.out
  
  .c.o:
 -	$(CC) -c $(CFLAGS) $<
diff --git a/graphics/urt/patches/patch-ao b/graphics/urt/patches/patch-ao
index d53e4a1fd1e..cab2c7373cf 100644
--- a/graphics/urt/patches/patch-ao
+++ b/graphics/urt/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.2 2001/02/26 16:56:36 agc Exp $
+$NetBSD: patch-ao,v 1.3 2001/03/26 22:51:39 skrll Exp $
 
---- get/getx11/makefile.src.orig	Wed Jul 15 22:31:20 1992
-+++ get/getx11/makefile.src	Wed May 17 20:48:07 2000
+--- get/getx11/makefile.src.orig	Wed Jul 15 21:31:20 1992
++++ get/getx11/makefile.src
 @@ -16,7 +16,7 @@
  #endif
  
@@ -11,12 +11,13 @@ $NetBSD: patch-ao,v 1.2 2001/02/26 16:56:36 agc Exp $
  
  # -lX11 is X11 support library
  DIRLIBS = $(LIBX11) $(LIBEXT) -lm
-@@ -47,7 +47,7 @@
+@@ -47,8 +47,7 @@
  
  # getx11 - read RLE file to X11 display
  getx11.out: $(X_O_FILES) 
 -	${CC} $(CFLAGS) $(X_O_FILES) $(LIBS) -o getx11.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${X_O_FILES} -o getx11.new ../../lib/librle.la -lm -L${X11BASE}/lib -lXext -lX11
- 	mv getx11.new getx11.out
+-	mv getx11.new getx11.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${X_O_FILES} -o getx11.out ../../lib/librle.la -lm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11
  
  # Make prototypes.h and fn_decls.h.  Only happens if HAVE_CPROTO is defined.
+ # Also assumes that the C preprocessor is /lib/cpp.
diff --git a/graphics/urt/patches/patch-aq b/graphics/urt/patches/patch-aq
index dc287b7faec..34a47783533 100644
--- a/graphics/urt/patches/patch-aq
+++ b/graphics/urt/patches/patch-aq
@@ -1,15 +1,33 @@
-$NetBSD: patch-aq,v 1.1 2001/02/26 16:56:36 agc Exp $
+$NetBSD: patch-aq,v 1.2 2001/03/26 22:51:39 skrll Exp $
 
-Use libtool to make the executable properly
-
---- tools/clock/makefile.src	2001/02/26 15:27:41	1.1
-+++ tools/clock/makefile.src	2001/02/26 15:29:16
-@@ -6,7 +6,7 @@
- 	mv rleClock ../rleClock.out
+--- tools/clock/makefile.src.orig	Fri Jun  7 16:56:38 1991
++++ tools/clock/makefile.src
+@@ -1,12 +1,17 @@
+ # Makefile for rleClock
+ 
+-default: install
++#set	DEST	TOOLS_DEST	Where to install the tools
++DEST = ../../bin
  
- rleClock:rleClock.o font.o
+-install: rleClock
+-	mv rleClock ../rleClock.out
++PGMS = 	rleClock.out
+ 
+-rleClock:rleClock.o font.o
 -	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} rleClock.o font.o -o rleClock ../../lib/librle.la -lm
++default: $(PGMS)
++
++install: $(PGMS) install-pgm
++	touch install
++
++rleClock.out:rleClock.o font.o
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} rleClock.o font.o -o rleClock.out ../../lib/librle.la -lm
  
  font.c:font.src makeFont
  	chmod +x makeFont
+@@ -23,3 +28,5 @@
+ 
+ # Dependencies.
+ rleClock.o font.o:$(RI)/rle_config.h
++# Description file for rle tool programs. 
++
diff --git a/graphics/urt/patches/patch-ar b/graphics/urt/patches/patch-ar
index 2ff29460cb6..43af6f7668c 100644
--- a/graphics/urt/patches/patch-ar
+++ b/graphics/urt/patches/patch-ar
@@ -1,18 +1,15 @@
-$NetBSD: patch-ar,v 1.1 2001/02/26 16:56:36 agc Exp $
+$NetBSD: patch-ar,v 1.2 2001/03/26 22:51:39 skrll Exp $
 
-Use libtool
-
---- cnv/rletoabA62/makefile.src	2001/02/26 15:57:54	1.1
-+++ cnv/rletoabA62/makefile.src	2001/02/26 15:59:21
-@@ -15,9 +15,8 @@
+--- cnv/rletoabA62/makefile.src.orig	Fri Jun  7 16:57:14 1991
++++ cnv/rletoabA62/makefile.src
+@@ -15,9 +15,7 @@
  # Executables.  The .out will be stripped off in the install action.
  
  rletoabA62.out	:	rletoabA62.o rle.o
 -			$(CC) $(CFLAGS) -o rletoabA62.new \
 -			  rletoabA62.o rle.o $(LIBS)
 -			mv rletoabA62.new rletoabA62.out
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o rletoabA62.new rletoabA62.o rle.o ../../lib/librle.la -lm
-+	mv rletoabA62.new rletoabA62.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o rletoabA62.out rletoabA62.o rle.o ../../lib/librle.la -lm
  
  # Incremental install, copies executable to DEST dir.
  install		:	default install-pgm
diff --git a/graphics/urt/patches/patch-as b/graphics/urt/patches/patch-as
index f838e5ff9a0..775cd2e0cb9 100644
--- a/graphics/urt/patches/patch-as
+++ b/graphics/urt/patches/patch-as
@@ -1,15 +1,14 @@
-$NetBSD: patch-as,v 1.1 2001/02/26 16:56:36 agc Exp $
+$NetBSD: patch-as,v 1.2 2001/03/26 22:51:39 skrll Exp $
 
-Use libtool
-
---- cnv/rletogif/makefile.src	2001/02/26 16:03:14	1.1
-+++ cnv/rletogif/makefile.src	2001/02/26 16:04:11
-@@ -15,7 +15,7 @@
+--- cnv/rletogif/makefile.src.orig	Fri Jun  7 16:57:40 1991
++++ cnv/rletogif/makefile.src
+@@ -15,8 +15,7 @@
  # The executable.  The ".out" will be stripped off in the install action.
  
  rletogif.out: ${OBJ}
 -	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${OBJ} -o rletogif.new ../../lib/librle.la -lm
- 	mv rletogif.new rletogif.out
+-	mv rletogif.new rletogif.out
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${OBJ} -o rletogif.out ../../lib/librle.la -lm
  
  # Incremental install, copies executable to DEST dir.
+ install		:	default install-pgm