Change shared library version numbers to "1.0". Move EXTRACT_SUFX

to right place.  Add ldconfig to post-install target and @exec in PLIST
so the shared library will be registered.  Remove patch between two
versions of "Makefile.old".

These things are all described in the handbook.  Andreas, can you please
read it?

3 files changed, 8 insertions, 106 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index ab49acd29f5d..c112205ed1d8 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -4,17 +4,20 @@
 # Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
 #			Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/12/14 22:27:51 andreas Exp $
 #
 
 DISTNAME=	faces-1.6.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/ \
 		ftp://odie.physik2.uni-rostock.de/pub/
+EXTRACT_SUFX=	.tar.Z
 		
 MAINTAINER=	Lars_Koeller@odie.physik2.uni-rostock.de
 
 WRKSRC=		$(WRKDIR)/faces
-EXTRACT_SUFX=	.tar.Z
+
+post-install:
+	/sbin/ldconfig -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/mail/faces/files/patch-ab b/mail/faces/files/patch-ab
index 7af7d21cb5c2..2d293bba57ee 100644
--- a/mail/faces/files/patch-ab
+++ b/mail/faces/files/patch-ab
@@ -72,7 +72,7 @@ diff -c -N ../faces/compface/Makefile ./compface/Makefile
   UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
   LIBNAME		= lib$(NAME).a
 ! SHLIB_MAJOR	= 1
-! SHLIB_MINOR	= 6
+! SHLIB_MINOR	= 0
 ! LIB		= $(NAME)
 ! NOPROFILE	= ''
 ! LIBRARY		= $(LIBDIR)
@@ -128,108 +128,6 @@ diff -c -N ../faces/compface/Makefile ./compface/Makefile
   uncompface.o:	uncompface.c compface.h data.h
 + 
 + .include <bsd.lib.mk>
-\ No newline at end of file
-diff -c -N ../faces/compface/Makefile.old ./compface/Makefile.old
-*** ../faces/compface/Makefile.old	Thu Jan  1 01:00:00 1970
---- ./compface/Makefile.old	Tue Dec 10 16:20:24 1996
-***************
-*** 0 ****
---- 1,95 ----
-+ #
-+ #  Compface - 48x48x1 image compression and decompression
-+ #
-+ #  Copyright (c) James Ashton - Sydney University - June 1990.
-+ #
-+ #  Written 11th November 1989.
-+ #
-+ #  Permission is given to distribute these sources, as long as the
-+ #  copyright messages are not removed, and no monies are exchanged. 
-+ #
-+ #  No responsibility is taken for any errors on inaccuracies inherent
-+ #  either to the comments or the code of this program, but if reported
-+ #  to me, then an attempt will be made to fix them.
-+ 
-+ # SYSV is expected to be overridden by the calling Makefile.
-+ #--------------------------------------------------------------------------
-+ #  If you are running on a Unix System V machine, then you should uncomment
-+ #  the next definition.
-+ #
-+ #SYSV           = -DSYSV32
-+ #--------------------------------------------------------------------------
-+ # BINDIR, LIBDIR, and MANDIR are expected to be overridden by the
-+ # calling Makefile
-+ 
-+ BINDIR		= /usr/local/bin
-+ LIBDIR		= /usr/local/lib
-+ MANDIR		= /usr/manl
-+ 
-+ NAME		= compface
-+ UNNAME		= uncompface
-+ EXECUTABLE	= $(BINDIR)/$(NAME)
-+ UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
-+ LIBNAME		= lib$(NAME).a
-+ LIBRARY		= $(LIBDIR)
-+ MAN1DIR		= $(MANDIR)/man1
-+ MAN3DIR		= $(MANDIR)/man3
-+ OBJECTS		= arith.o file.o compress.o gen.o uncompface.o
-+ SOURCES		= compface.c uncompface.o arith.c file.c compress.c gen.c \
-+ 		  cmain.c uncmain.c
-+ HDRS		= compface.h data.h
-+ OTHERS		= README $(NAME).1 $(NAME).3 Makefile
-+ 
-+ CC		= cc
-+ CDEFS		= $(SYSV)
-+ CCOMP		= -pipe -O2
-+ CFLAGS		= $(CDEFS) $(CCOMP) -L/usr/local/lib
-+ 
-+ all:		$(NAME) $(UNNAME) lib$(NAME).so.1.6
-+ 
-+ $(NAME) :	cmain.o compface.o
-+ 		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -lcompface
-+ 
-+ $(UNNAME) :	uncmain.o $(LIBNAME)
-+ 		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -lcompface
-+ 
-+ $(LIBNAME) :	$(OBJECTS)
-+ 		ar rc $(LIBNAME) $(OBJECTS)
-+ 		-ranlib $(LIBNAME)
-+ 		-rm -f $(OBJECTS)
-+ 		make lib$(NAME).so.1.6 CCOMP='-pipe -O2 -fpic'
-+ 
-+ lib$(NAME).so.1.6: $(OBJECTS)
-+ 		ld -Bshareable -o $@ $(OBJECTS)
-+ 		-rm -f $(OBJECTS)
-+ 
-+ lint :
-+ 		lint -abchx $(SOURCES)
-+ 
-+ clean :
-+ 		rm -f *.o *.a *.so.* *.sh core a.out $(NAME) $(UNNAME)
-+ 
-+ install :	$(NAME) $(UNNAME) $(LIBNAME)
-+ 		install -c -s -o bin -m 755 $(NAME) $(EXECUTABLE)
-+ 		install -c -s -o bin -m 755 $(UNNAME) $(UNEXECUTABLE)
-+ 		install -c -g man -o man -m 444 $(NAME).1 $(MAN1DIR)
-+ 		-rm -f $(MAN1DIR)/$(UNNAME).1
-+ 		-ln $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
-+ 		install -c -o bin -m 444 $(LIBNAME) $(LIBRARY)
-+ 		install -c -o bin -m 444 lib$(NAME).so.1.6 $(LIBRARY)
-+ 		install -c -g man -o man -m 444 $(NAME).3 $(MAN3DIR)
-+ 		rm -f $(MAN3DIR)/$(UNNAME).3
-+ 		-ln $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+ 
-+ shar :
-+ 		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-+ 		compress $(NAME).sh
-+ 
-+ arith.o:	arith.c compface.h data.h
-+ cmain.o:	cmain.c compface.h data.h
-+ compface.o:	compface.c compface.h data.h
-+ compress.o:	compress.c compface.h data.h
-+ file.o:		file.c compface.h data.h
-+ gen.o:		gen.c compface.h data.h
-+ uncmain.o:	uncmain.c compface.h data.h
-+ uncompface.o:	uncompface.c compface.h data.h
 diff -c -N ../faces/compface/compface.1 ./compface/compface.1
 *** ../faces/compface/compface.1	Fri Mar 15 06:10:29 1991
 --- ./compface/compface.1	Tue Dec 10 17:28:10 1996
diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist
index af73171fdf25..83b298ac8f90 100644
--- a/mail/faces/pkg-plist
+++ b/mail/faces/pkg-plist
@@ -6,7 +6,8 @@ bin/uncompface
 man/man1/compface.1.gz
 man/man1/uncompface.1.gz
 lib/libcompface.a
-lib/libcompface.so.1.6
+lib/libcompface.so.1.0
+@exec /sbin/ldconfig -m %D/lib
 man/man3/compface.3.gz
 man/man3/uncompface.3.gz
 bin/icon2ikon