From 1274494d7c01e83612490682daee4ced9f399626 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Mon, 26 Dec 2005 13:16:16 +0000
Subject: [PATCH] SHARED_LIBS ok sturm@

---
 mail/c-client/Makefile                     |  6 +++---
 mail/c-client/pkg/PFRAG.shared             |  4 ++--
 mail/dspam/Makefile                        |  5 ++++-
 mail/dspam/patches/patch-src_Makefile_in   | 12 ++++++++++++
 mail/dspam/pkg/PFRAG.shared                |  4 ++--
 mail/faces/Makefile                        |  7 ++++++-
 mail/faces/patches/patch-compface_Makefile | 16 +++++++---------
 mail/faces/pkg/PFRAG.shared                |  4 ++--
 mail/xfmail/Makefile                       |  6 +++++-
 mail/xfmail/pkg/PFRAG.shared               |  6 +++---
 10 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 mail/dspam/patches/patch-src_Makefile_in

diff --git a/mail/c-client/Makefile b/mail/c-client/Makefile
index 0da30b52251..817cb21b4f9 100644
--- a/mail/c-client/Makefile
+++ b/mail/c-client/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2005/08/17 16:10:03 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2005/12/26 13:16:16 steven Exp $
 
 COMMENT=	"University of Washington's c-client mail access routines"
 NO_REGRESS=	Yes
@@ -6,6 +6,7 @@ NO_REGRESS=	Yes
 VERSION=	4.61
 DISTNAME=	pine${VERSION}
 PKGNAME=	c-client-${VERSION}p0
+SHARED_LIBS=	c-client	4.0
 CATEGORIES=	mail devel
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.sunet.se/pub/unix/mail/pine/
@@ -22,8 +23,7 @@ PERMIT_DISTFILES_FTP=	Yes
 FLAVORS=	kerberos
 FLAVOR?=
 
-SHLIB=		libc-client.so.4.0
-SUBST_VARS=	SHLIB
+SHLIB=		libc-client.so.${LIBc-client_VERSION}
 
 MAKE_FLAGS=	EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}" \
 		SSLTYPE="unix" CC="${CC}"
diff --git a/mail/c-client/pkg/PFRAG.shared b/mail/c-client/pkg/PFRAG.shared
index 8ba59296ba3..34dd9fb7d8a 100644
--- a/mail/c-client/pkg/PFRAG.shared
+++ b/mail/c-client/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 09:09:41 espie Exp $
-@lib lib/${SHLIB}
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/26 13:16:16 steven Exp $
+@lib lib/libc-client.so.${LIBc-client_VERSION}
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index d0c25f9183e..3e122a2de37 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,9 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2005/11/30 08:33:16 jakob Exp $
+# $OpenBSD: Makefile,v 1.7 2005/12/26 13:17:35 steven Exp $
 
 COMMENT=	"anti-spam filter"
 
 VERSION=	3.6.2
 DISTNAME=	dspam-${VERSION}
+SHARED_LIBS=		dspam	7.0
+MODGNU_SHARED_LIBS=	dspam	''
+LIBdspam_ALIAS=		realdspam
 CATEGORIES=	mail
 
 MASTER_SITES=	http://dspam.nuclearelephant.com/sources/
diff --git a/mail/dspam/patches/patch-src_Makefile_in b/mail/dspam/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..64dffb425cd
--- /dev/null
+++ b/mail/dspam/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2005/12/26 13:17:35 steven Exp $
+--- src/Makefile.in.orig	Sun Dec 25 19:58:07 2005
++++ src/Makefile.in	Sun Dec 25 19:59:15 2005
+@@ -442,7 +442,7 @@ libdspam_la_LIBADD = $(adapter_objects) 
+ libdspam_la_DEPENDENCIES = $(adapter_objects) $(am__append_12)
+ 
+ #   current:revision:age
+-libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info $(libversion)
++libdspam_la_LDFLAGS = -rpath '$(libdir)' $(librealdspam_la_LDFLAGS)
+ @DYNAMIC_DRIVER_TRUE@libdb4_drv_la_SOURCES = \
+ @DYNAMIC_DRIVER_TRUE@	libdb4_drv.c libdb4_drv.h 
+ 
diff --git a/mail/dspam/pkg/PFRAG.shared b/mail/dspam/pkg/PFRAG.shared
index 2e5c07873fb..eedbabb8ad7 100644
--- a/mail/dspam/pkg/PFRAG.shared
+++ b/mail/dspam/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2005/10/26 06:18:39 jakob Exp $
-@lib lib/libdspam.so.7.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 13:17:35 steven Exp $
+@lib lib/libdspam.so.${LIBdspam_VERSION}
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 5e73db04f6f..a72a63c5c6b 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2005/01/02 12:56:05 alek Exp $
+# $OpenBSD: Makefile,v 1.21 2005/12/26 13:19:05 steven Exp $
 
 COMMENT=	"visual mail, user and print face server"
 
 DISTNAME=	faces-1.6.1
+SHARED_LIBS=	compface	1.0
 CATEGORIES=	mail
 
 PERMIT_PACKAGE_CDROM=	"no fee"
@@ -18,6 +19,10 @@ USE_X11=	Yes
 
 WRKDIST=	$(WRKDIR)/faces
 
+SHLIB_MAJOR=	${LIBcompface_VERSION:R}
+SHLIB_MINOR=	${LIBcompface_VERSION:E}
+MAKE_ENV=	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
+
 post-extract:
 	@cd ${WRKSRC} && cp Makefile.dist Makefile
 
diff --git a/mail/faces/patches/patch-compface_Makefile b/mail/faces/patches/patch-compface_Makefile
index b2e6aac8c6b..f170deff257 100644
--- a/mail/faces/patches/patch-compface_Makefile
+++ b/mail/faces/patches/patch-compface_Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-compface_Makefile,v 1.2 2001/03/17 15:36:09 wilfried Exp $
+$OpenBSD: patch-compface_Makefile,v 1.3 2005/12/26 13:19:05 steven Exp $
 --- compface/Makefile.orig	Thu Oct 24 03:28:06 1991
-+++ compface/Makefile	Fri Mar 16 19:57:05 2001
-@@ -19,62 +19,62 @@
++++ compface/Makefile	Sun Dec 25 20:38:15 2005
+@@ -19,62 +19,60 @@
  #
  #SYSV           = -DSYSV32
  #--------------------------------------------------------------------------
@@ -21,8 +21,6 @@ $OpenBSD: patch-compface_Makefile,v 1.2 2001/03/17 15:36:09 wilfried Exp $
  UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
  LIBNAME		= lib$(NAME).a
 -LIBRARY		= $(LIBDIR)/$(LIBNAME)
-+SHLIB_MAJOR	= 1
-+SHLIB_MINOR	= 0
 +LIB		= $(NAME)
 +NOPROFILE	= ''
 +LIBRARY		= $(LIBDIR)
@@ -51,12 +49,12 @@ $OpenBSD: patch-compface_Makefile,v 1.2 2001/03/17 15:36:09 wilfried Exp $
  
  $(UNNAME) :	uncmain.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
--
++		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -lcompface
+ 
 -$(LIBNAME) :	$(OBJECTS)
 -		ar rc $(LIBNAME) $(OBJECTS)
 -		-ranlib $(LIBNAME)
-+		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -lcompface
- 
+-
  lint :
  		lint -abchx $(SOURCES)
  
@@ -90,7 +88,7 @@ $OpenBSD: patch-compface_Makefile,v 1.2 2001/03/17 15:36:09 wilfried Exp $
  
  shar :
  		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-@@ -88,3 +88,5 @@ file.o:		file.c compface.h data.h
+@@ -88,3 +86,5 @@ 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 --git a/mail/faces/pkg/PFRAG.shared b/mail/faces/pkg/PFRAG.shared
index 426016a6d56..4acfdcfaa75 100644
--- a/mail/faces/pkg/PFRAG.shared
+++ b/mail/faces/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 09:09:42 espie Exp $
-@lib lib/libcompface.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/26 13:19:05 steven Exp $
+@lib lib/libcompface.so.${LIBcompface_VERSION}
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 5348016bf3d..636a8350b12 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2005/01/11 07:16:01 sturm Exp $
+# $OpenBSD: Makefile,v 1.36 2005/12/26 13:20:11 steven Exp $
 # $NetBSD: Makefile,v 1.2 1998/07/04 09:19:04 mycroft Exp $
 # $RuOBSD: Makefile,v 1.4 2002/05/18 04:21:36 form Exp $
 
@@ -6,6 +6,10 @@ COMMENT=		"xforms-based mail application for Unix"
 
 V=			1.5.3
 DISTNAME=       	xfmail-${V}
+SHARED_LIBS=		editor	0.0 \
+			mail	0.0
+MODGNU_SHARED_LIBS=	editor	'' \
+			mail	''
 CATEGORIES=     	mail x11
 MASTER_SITES=		ftp://ftp.xfmail.org/pub/xfmail/release/${V}/source/
 
diff --git a/mail/xfmail/pkg/PFRAG.shared b/mail/xfmail/pkg/PFRAG.shared
index 91205039265..239251bd25d 100644
--- a/mail/xfmail/pkg/PFRAG.shared
+++ b/mail/xfmail/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 09:09:45 espie Exp $
-@lib lib/libeditor.so.0.0
-@lib lib/libmail.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 13:20:11 steven Exp $
+@lib lib/libeditor.so.${LIBeditor_VERSION}
+@lib lib/libmail.so.${LIBmail_VERSION}