From 2caaf58123634dff9df87ca8b02985b67e754f65 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 4 Sep 2000 11:29:35 +0000 Subject: Fix this package to pass the shared library test in the "check-shlibs" target. These patches created by Alistair Crooks. --- mail/faces/Makefile | 6 +++--- mail/faces/files/patch-sum | 6 +++--- mail/faces/patches/patch-ab | 10 +++++----- mail/faces/patches/patch-ac | 14 ++++++++------ 4 files changed, 19 insertions(+), 17 deletions(-) (limited to 'mail/faces') diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 0f4be79895a..3f60aa99c9d 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/11 09:53:10 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/09/04 11:29:35 tron Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp # @@ -18,8 +18,8 @@ MAKE_ENV+= MKLINT=no post-configure: @cd ${WRKSRC}; \ - for f in Makefile faces.h x11.c scripts/addxface scripts/facesall \ - scripts/mkfacesindex; do \ + for f in Makefile faces.h x11.c compface/Makefile \ + scripts/addxface scripts/facesall scripts/mkfacesindex; do \ ${MV} $$f $$f.in; \ ${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \ -e 's|@x11prefix@|'${X11PREFIX}'|g' \ diff --git a/mail/faces/files/patch-sum b/mail/faces/files/patch-sum index d43d4a26f59..743c67be1dd 100644 --- a/mail/faces/files/patch-sum +++ b/mail/faces/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.6 2000/07/11 09:53:11 agc Exp $ +$NetBSD: patch-sum,v 1.7 2000/09/04 11:29:36 tron Exp $ MD5 (patch-aa) = 052e47d7ef63e511fcd5d2d1cc306ba1 -MD5 (patch-ab) = 76829626220cdec02f5bd190062f8b43 -MD5 (patch-ac) = 36f893a6e4d333e2b0bde29078ffa755 +MD5 (patch-ab) = 20c7e9729e4e6362b36ccc5292fabf74 +MD5 (patch-ac) = 0ac52989a207ed147a1e93f730d72e0b MD5 (patch-ad) = 8c46ea454eaf308aaa2940b051974dfd MD5 (patch-ae) = f56893cac29f4610d535974407a47fa5 MD5 (patch-af) = 23e22d4fcbd94ef7f89cb6f87739489e diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab index 66404355750..3e1a4ec6315 100644 --- a/mail/faces/patches/patch-ab +++ b/mail/faces/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.7 2000/07/11 09:53:11 agc Exp $ +$NetBSD: patch-ab,v 1.8 2000/09/04 11:29:36 tron Exp $ ---- Makefile.orig Sat Jul 8 14:25:27 2000 -+++ Makefile Sat Jul 8 14:28:16 2000 +--- Makefile.orig Mon Sep 4 10:37:54 2000 ++++ Makefile Mon Sep 4 10:55:54 2000 @@ -0,0 +1,475 @@ +# +# Makefile for faces, an icon face server, plus associated software. @@ -322,7 +322,7 @@ $NetBSD: patch-ab,v 1.7 2000/07/11 09:53:11 agc Exp $ + +STDSRCS = address.c get.c main.c mon.c parsefrom.c rec.c +STDOBJS = address.o get.o main.o mon.o parsefrom.o rec.o -+STDLIBS = -L./compface -lcompface $(DNSLIB) $(SGILIBS) ++STDLIBS = -L./compface -Wl,-R@localbase@/lib -lcompface $(DNSLIB) $(SGILIBS) + +COMPFACE = compface +FACES = facedir @@ -363,7 +363,7 @@ $NetBSD: patch-ab,v 1.7 2000/07/11 09:53:11 agc Exp $ +# Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet +# AT&T's XWIN: $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt +# -+X11LIBS = -L@x11base@/lib -lX11 ++X11LIBS = -L@x11base@/lib -Wl,-R@x11base@/lib -lX11 +XVIEWLIBS = $(XVIEWLIBDIR) -lxview -lolgx -lX11 + +help: diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac index 48a9113afb6..b4a05c6b9f9 100644 --- a/mail/faces/patches/patch-ac +++ b/mail/faces/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2000/07/08 12:47:05 tron Exp $ +$NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $ --- compface/Makefile.orig Thu Oct 24 03:28:06 1991 -+++ compface/Makefile Sat Jul 8 14:28:58 2000 -@@ -19,62 +19,64 @@ ++++ compface/Makefile Mon Sep 4 10:57:52 2000 +@@ -19,62 +19,66 @@ # #SYSV = -DSYSV32 #-------------------------------------------------------------------------- @@ -50,7 +50,8 @@ $NetBSD: patch-ac,v 1.7 2000/07/08 12:47:05 tron Exp $ -$(NAME) : cmain.o compface.o $(LIBNAME) - $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME) +$(NAME) : cmain.o compface.o -+ $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L./ -lcompface ++ $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L./ -Wl,-R./ \ ++ -L@x11prefix@/lib -Wl,-R@x11prefix@/lib -lcompface $(UNNAME) : uncmain.o $(LIBNAME) - $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME) @@ -58,7 +59,8 @@ $NetBSD: patch-ac,v 1.7 2000/07/08 12:47:05 tron Exp $ -$(LIBNAME) : $(OBJECTS) - ar rc $(LIBNAME) $(OBJECTS) - -ranlib $(LIBNAME) -+ $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -lcompface ++ $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -Wl,-R./ \ ++ -L@x11prefix@/lib -Wl,-R@x11prefix@/lib -lcompface lint : lint -abchx $(SOURCES) @@ -93,7 +95,7 @@ $NetBSD: patch-ac,v 1.7 2000/07/08 12:47:05 tron Exp $ shar : shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh -@@ -88,3 +90,5 @@ +@@ -88,3 +92,5 @@ gen.o: gen.c compface.h data.h uncmain.o: uncmain.c compface.h data.h uncompface.o: uncompface.c compface.h data.h -- cgit v1.2.3