From 5fa52e5c2c5279c9d92daa0443acfb1799a5ff4b Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Wed, 6 Sep 2000 12:25:08 +0000
Subject: Fix compilation problem with certain version of "bsd.lib.mk".

---
 mail/faces/files/patch-sum  |  4 ++--
 mail/faces/patches/patch-ac | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'mail')

diff --git a/mail/faces/files/patch-sum b/mail/faces/files/patch-sum
index 743c67be1dd..db1c361067b 100644
--- a/mail/faces/files/patch-sum
+++ b/mail/faces/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.7 2000/09/04 11:29:36 tron Exp $
+$NetBSD: patch-sum,v 1.8 2000/09/06 12:25:08 tron Exp $
 
 MD5 (patch-aa) = 052e47d7ef63e511fcd5d2d1cc306ba1
 MD5 (patch-ab) = 20c7e9729e4e6362b36ccc5292fabf74
-MD5 (patch-ac) = 0ac52989a207ed147a1e93f730d72e0b
+MD5 (patch-ac) = 879d80dffc8849bda76b2a5e1bbecc98
 MD5 (patch-ad) = 8c46ea454eaf308aaa2940b051974dfd
 MD5 (patch-ae) = f56893cac29f4610d535974407a47fa5
 MD5 (patch-af) = 23e22d4fcbd94ef7f89cb6f87739489e
diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac
index b4a05c6b9f9..c08c27763c2 100644
--- a/mail/faces/patches/patch-ac
+++ b/mail/faces/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $
+$NetBSD: patch-ac,v 1.9 2000/09/06 12:25:08 tron Exp $
 
 --- compface/Makefile.orig	Thu Oct 24 03:28:06 1991
-+++ compface/Makefile	Mon Sep  4 10:57:52 2000
-@@ -19,62 +19,66 @@
++++ compface/Makefile	Wed Sep  6 14:19:49 2000
+@@ -19,62 +19,67 @@
  #
  #SYSV           = -DSYSV32
  #--------------------------------------------------------------------------
@@ -26,6 +26,7 @@ $NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $
 -LIBRARY		= $(LIBDIR)/$(LIBNAME)
 +SHLIB_MAJOR	= 1
 +SHLIB_MINOR	= 0
++SHLIB_FULLVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR)
 +LIB		= $(NAME)
 +NOPROFILE	= ''
 +LIBRARY		= $(LIBDIR)
@@ -51,7 +52,7 @@ $NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $
 -		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
 +$(NAME) :	cmain.o compface.o
 +		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L./ -Wl,-R./ \
-+			-L@x11prefix@/lib -Wl,-R@x11prefix@/lib -lcompface
++			-L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lcompface
  
  $(UNNAME) :	uncmain.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
@@ -60,7 +61,7 @@ $NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $
 -		ar rc $(LIBNAME) $(OBJECTS)
 -		-ranlib $(LIBNAME)
 +		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -Wl,-R./ \
-+			-L@x11prefix@/lib -Wl,-R@x11prefix@/lib -lcompface
++			-L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lcompface
  
  lint :
  		lint -abchx $(SOURCES)
@@ -95,7 +96,7 @@ $NetBSD: patch-ac,v 1.8 2000/09/04 11:29:36 tron Exp $
  
  shar :
  		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-@@ -88,3 +92,5 @@
+@@ -88,3 +93,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