From 1f7bc8057aec4707a8ba2f8cf000845bae4ca5f5 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 26 Feb 2001 16:56:35 +0000 Subject: Knock another 2 off the non-building list. Convert this package to use libtool, much against my better judgement. However, it slots in much more easily than the BSD *.mk structure here. --- graphics/urt/Makefile | 3 +- graphics/urt/files/patch-sum | 14 ++++--- graphics/urt/patches/patch-ad | 49 +++++++++++++++++++++++- graphics/urt/patches/patch-ak | 86 ++++++++++++------------------------------- graphics/urt/patches/patch-an | 45 ++++++++++++++++------ graphics/urt/patches/patch-ao | 11 +++++- graphics/urt/patches/patch-ap | 53 ++++++++++++++++++++++++++ graphics/urt/patches/patch-aq | 15 ++++++++ graphics/urt/patches/patch-ar | 18 +++++++++ graphics/urt/patches/patch-as | 15 ++++++++ 10 files changed, 227 insertions(+), 82 deletions(-) create mode 100644 graphics/urt/patches/patch-ap create mode 100644 graphics/urt/patches/patch-aq create mode 100644 graphics/urt/patches/patch-ar create mode 100644 graphics/urt/patches/patch-as diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index a8711344964..233dc45c84c 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:52 hubertf Exp $ +# $NetBSD: Makefile,v 1.19 2001/02/26 16:56:35 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp DISTNAME= urt @@ -19,6 +19,7 @@ DEPENDS+= netpbm-9.*:../netpbm EXTRACT_ONLY= urt-3.1b.tar.Z +USE_LIBTOOL= yes USE_X11= yes NO_WRKSUBDIR= yes CONFIGURE_SCRIPT=./Configure diff --git a/graphics/urt/files/patch-sum b/graphics/urt/files/patch-sum index fb3a684bead..c87aa1a228d 100644 --- a/graphics/urt/files/patch-sum +++ b/graphics/urt/files/patch-sum @@ -1,17 +1,21 @@ -$NetBSD: patch-sum,v 1.8 2001/02/23 13:33:05 wiz Exp $ +$NetBSD: patch-sum,v 1.9 2001/02/26 16:56:35 agc Exp $ MD5 (patch-aa) = 8b2f54cfb35b04cd5dddf6b2fe855820 MD5 (patch-ab) = d452d364f338abd9b93ba68063252f63 MD5 (patch-ac) = 3db78380267e5d9bb36a3a50a5df7425 -MD5 (patch-ad) = 2f8c2c83daf3d6a7384c34b0adefdc91 +MD5 (patch-ad) = b43dce741265d1e74f944091d6752139 MD5 (patch-ae) = 33182ea6068e3b0307ed7e7604a87df3 MD5 (patch-af) = d10f232bd3d6d1cae311fbb34032a57b MD5 (patch-ag) = 5fd8a529e2577fa07189fca6c141d012 MD5 (patch-ah) = 5c4c8ba9732314cbc321c9dcf69fa903 MD5 (patch-ai) = cbc0d6e2b3f5c4767098ec09d1e675f0 MD5 (patch-aj) = 9aeeb4ad08b208ed370ab4ee96091d79 -MD5 (patch-ak) = f1b0a01e6dad76557c5f903f473bfe10 +MD5 (patch-ak) = f4cfd10b615a3818f2c434bd6e6f13c7 MD5 (patch-al) = 1d752bb6028c57455f1b43f8eca769ab MD5 (patch-am) = ffce71bdaac42d46480127f1010f61bf -MD5 (patch-an) = 3d267c95fa1f4d3465444113643558d1 -MD5 (patch-ao) = 6b5995080892a6df6c4d30c96146eb23 +MD5 (patch-an) = c1651cc133f0944ed06563ba2800d235 +MD5 (patch-ao) = a1344356587c37fe0ecac69a51a884fe +MD5 (patch-ap) = 4d63edc21f9839954dca8f6cbdfb2a41 +MD5 (patch-aq) = 0334a7c0708c6054216ceb1811e7e410 +MD5 (patch-ar) = dfd413eeeac906957dbc608559ffd3ea +MD5 (patch-as) = 93f73c9101a9dd92f8872d3cc47aa3e8 diff --git a/graphics/urt/patches/patch-ad b/graphics/urt/patches/patch-ad index 6ec8b36e0cf..150f7c81178 100644 --- a/graphics/urt/patches/patch-ad +++ b/graphics/urt/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.1 1998/08/24 16:55:36 agc Exp $ +$NetBSD: patch-ad,v 1.2 2001/02/26 16:56:35 agc 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,7 +71,7 @@ +@@ -71,18 +71,18 @@ #ifdef PBMPLUS #emit PBMDIR @@ -14,3 +14,48 @@ carefully set up in config/urt # pgmtorle - pgm format to RLE # ppmtorle - ppm format to RLE # 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 $@ + 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 $@ + 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 $@ + #endif + +@@ -108,10 +108,10 @@ + # 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 $@ + 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 $@ + #endif + +@@ -125,7 +125,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 $@ + #endif WAVEFRONT + +@@ -144,7 +144,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 $@ + + # Dependency lines. Make sure to #ifdef them. diff --git a/graphics/urt/patches/patch-ak b/graphics/urt/patches/patch-ak index 542e6e8a3f4..7fe4f7f991b 100644 --- a/graphics/urt/patches/patch-ak +++ b/graphics/urt/patches/patch-ak @@ -1,32 +1,24 @@ -$NetBSD: patch-ak,v 1.2 2001/02/23 13:33:06 wiz Exp $ +$NetBSD: patch-ak,v 1.3 2001/02/26 16:56:35 agc Exp $ --- lib/makefile.src.orig Wed Mar 4 20:32:53 1992 +++ lib/makefile.src -@@ -26,7 +26,10 @@ - vaxshort.o \ - $(OPT_OBJS) +@@ -9,6 +9,8 @@ + RANLIB = ranlib + #endif --LIBNAME = librle.a -+SOOBJS = $(OBJS:.o=.so) ++CC= ${LIBTOOL} --mode=compile gcc + -+LIBANAME = librle.a -+LIBSONAME = librle.so.1.0 + # If nothing else is specified, default is to build the library. + default: buildlib - # Just rebuild the object files. - objs: $(OBJS) -@@ -37,23 +40,15 @@ +@@ -36,40 +38,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 - @sh -c "if test '$(DEST)x' != x ; then \ +- @sh -c "if test '$(DEST)x' != x ; then \ - echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ - cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ -+ echo cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \ -+ cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \ -+ echo cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \ -+ cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \ -+ ln -sf $(LIBSONAME) $(DEST)/librle.so.1 ; \ -+ ln -sf $(LIBSONAME) $(DEST)/librle.so ; \ - if test x$(RANLIB) != x ; then \ +- if test x$(RANLIB) != x ; then \ - echo ranlib $(DEST)/$(LIBNAME) ; \ - ranlib $(DEST)/$(LIBNAME) ; \ - else \ @@ -41,54 +33,24 @@ $NetBSD: patch-ak,v 1.2 2001/02/23 13:33:06 wiz Exp $ - true ; \ - fi ; \ - ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ echo ranlib $(DEST)/$(LIBANAME) ; \ -+ ranlib $(DEST)/$(LIBANAME) ; \ - else \ - true ; \ - fi ; \ -@@ -63,14 +58,24 @@ +- else \ +- true ; \ +- fi ; \ +- else \ +- true ; \ +- fi" ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBNAME:.a=.la} ${PREFIX}/lib touch install # Rebuild the library from all the .o files. --buildlib: $(OBJS) -- -rm -f $(LIBNAME) + buildlib: $(OBJS) + -rm -f $(LIBNAME) - ar rc $(LIBNAME) - ar q $(LIBNAME) $(OBJS) -+buildlib: $(LIBANAME) $(LIBSONAME) -+ -+$(LIBANAME): $(OBJS) -+ -rm -f $@ -+ ar rc $@ $? - #ifndef NO_RANLIB +-#ifndef NO_RANLIB - ranlib $(LIBNAME) -+ ranlib $@ - #endif -- touch buildlib -+ -+.SUFFIXES: .so .o -+ -+.c.so: -+ $(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so -+ $(LD) -X -r $*.so -+ -+$(LIBSONAME): $(SOOBJS) -+ -rm -f $@ -+ ld -Bshareable -o $@ $> +-#endif ++ ${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 - pristine: clean -@@ -86,9 +91,12 @@ - # Get rid of everything which must be recompiled on a different computer. - clean: - -rm -f *.o -+ -rm -f *.so - -@if test x$(DEST) != x ; then \ -- echo rm -f $(LIBNAME) ; \ -- rm -f $(LIBNAME) ; \ -+ echo rm -f $(LIBANAME) ; \ -+ rm -f $(LIBANAME) ; \ -+ echo rm -f $(LIBSONAME) ; \ -+ rm -f $(LIBSONAME) ; \ - else \ - true ; \ - fi diff --git a/graphics/urt/patches/patch-an b/graphics/urt/patches/patch-an index 41920ee3420..fb436df9d86 100644 --- a/graphics/urt/patches/patch-an +++ b/graphics/urt/patches/patch-an @@ -1,22 +1,45 @@ -$NetBSD: patch-an,v 1.1 1999/11/22 11:11:33 agc Exp $ +$NetBSD: patch-an,v 1.2 2001/02/26 16:56:36 agc Exp $ --- tools/makefile.src Tue Jan 28 15:47:42 1992 +++ tools/makefile.src Sat Sep 16 10:33:14 1995 -@@ -68,7 +68,7 @@ +@@ -62,24 +62,24 @@ + 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 + fant.out: fant.o mallocNd.o - $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new +- $(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 -- -+ + # rlebox and crop use some common code. rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h -@@ -82,7 +82,7 @@ - # rleClock has it's own directory, must be built special + 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 + 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 + +-# 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) -+ (cd clock ; $(MAKE)) + (cd clock ; make) +@@ -100,8 +100,8 @@ + .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 $@ - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm + .c.o: +- $(CC) -c $(CFLAGS) $< ++ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c $< diff --git a/graphics/urt/patches/patch-ao b/graphics/urt/patches/patch-ao index d457c045f72..d53e4a1fd1e 100644 --- a/graphics/urt/patches/patch-ao +++ b/graphics/urt/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1 2000/05/17 18:50:35 tron Exp $ +$NetBSD: patch-ao,v 1.2 2001/02/26 16:56:36 agc Exp $ --- get/getx11/makefile.src.orig Wed Jul 15 22:31:20 1992 +++ get/getx11/makefile.src Wed May 17 20:48:07 2000 @@ -11,3 +11,12 @@ $NetBSD: patch-ao,v 1.1 2000/05/17 18:50:35 tron Exp $ # -lX11 is X11 support library DIRLIBS = $(LIBX11) $(LIBEXT) -lm +@@ -47,7 +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 + + # Make prototypes.h and fn_decls.h. Only happens if HAVE_CPROTO is defined. diff --git a/graphics/urt/patches/patch-ap b/graphics/urt/patches/patch-ap new file mode 100644 index 00000000000..d812d69adee --- /dev/null +++ b/graphics/urt/patches/patch-ap @@ -0,0 +1,53 @@ +--- /dev/null Fri Feb 16 09:53:47 2001 ++++ lib.mk Fri Feb 16 09:53:24 2001 +@@ -0,0 +1,50 @@ ++PBMDIR= ${LOCALBASE} ++ ++INCPBMPLUS = -I$(PBMDIR)/include ++LIBPBMPLUS = -L$(PBMDIR)/lib -Wl,-R$(PBMDIR)/lib -lppm -lpgm -lpbm ++ ++INCTIFF = -I${LOCALBASE}/include ++LIBTIFF = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ltiff -ljpeg -lz ++ ++LIBX11 = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 ++INCX11 = -I${X11BASE}/include ++ ++RI = ../include ++RL = ../lib ++ ++CPPFLAGS+= ${INCPBMPLUS} ${INCTIFF} ${INCX11} -I. -I${RI} ++LDFLAGS+= ${LIBPBMPLUS} ${LIBTIFF} ${LIBX11} -L${RL} -Wl,-R${RL} ++ ++LIB= rle ++SHLIB_MAJOR= 1 ++SHLIB_MINOR= 0 ++ ++SRCS= Runput.c buildmap.c cmd_name.c colorquant.c dither.c ++SRCS+= float_to_exp.c hilbert.c inv_cmap.c ++SRCS+= rle_addhist.c rle_cp.c rle_error.c rle_getcom.c ++SRCS+= rle_getraw.c rle_getrow.c rle_getskip.c rle_global.c ++SRCS+= rle_hdr.c ++SRCS+= rle_open_f.c rle_putcom.c rle_putraw.c rle_putrow.c ++SRCS+= rle_raw_alc.c rle_rawrow.c rle_row_alc.c scanargs.c ++SRCS+= vaxshort.c ++ ++MKLINT= no ++ ++Runput.o: ${RI}/rle.h ${RI}/rle_code.h ${RI}/rle_put.h ++buildmap.o: ${RI}/rle.h ++float_to_exp.o: ${RI}/rle.h ++rle_addhist.o: ${RI}/rle.h ++rle_cp.o: ${RI}/rle.h ${RI}/rle_code.h ${RI}/rle_put.h ++rle_getcom.o: ${RI}/rle.h ++rle_getraw.o: ${RI}/rle.h ${RI}/rle_raw.h ++rle_getrow.o: ${RI}/rle.h ${RI}/rle_code.h ++rle_getskip.o: ${RI}/rle.h ${RI}/rle_code.h ++rle_global.o: ${RI}/rle.h ${RI}/rle_put.h ++rle_putcom.o: ${RI}/rle.h ++rle_putraw.o: ${RI}/rle.h ${RI}/rle_put.h ${RI}/rle_raw.h ++rle_putrow.o: ${RI}/rle.h ${RI}/rle_put.h ++rle_raw_alc.o: ${RI}/rle.h ${RI}/rle_raw.h ++rle_rawrow.o: ${RI}/rle.h ${RI}/rle_raw.h ++rle_row_alc.o: ${RI}/rle.h ++ ++.include diff --git a/graphics/urt/patches/patch-aq b/graphics/urt/patches/patch-aq new file mode 100644 index 00000000000..dc287b7faec --- /dev/null +++ b/graphics/urt/patches/patch-aq @@ -0,0 +1,15 @@ +$NetBSD: patch-aq,v 1.1 2001/02/26 16:56:36 agc 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 + + 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 + + font.c:font.src makeFont + chmod +x makeFont diff --git a/graphics/urt/patches/patch-ar b/graphics/urt/patches/patch-ar new file mode 100644 index 00000000000..2ff29460cb6 --- /dev/null +++ b/graphics/urt/patches/patch-ar @@ -0,0 +1,18 @@ +$NetBSD: patch-ar,v 1.1 2001/02/26 16:56:36 agc 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 @@ + # 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 + + # 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 new file mode 100644 index 00000000000..f838e5ff9a0 --- /dev/null +++ b/graphics/urt/patches/patch-as @@ -0,0 +1,15 @@ +$NetBSD: patch-as,v 1.1 2001/02/26 16:56:36 agc 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 @@ + # 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 + + # Incremental install, copies executable to DEST dir. -- cgit v1.2.3