Remove libimapuw.* symlinks, which wouldn't work on a.out platforms

anyway.  Also convert to use LIBTOOLIZE_PLIST while we're here.  Bump
the PKGREVISION.

3 files changed, 18 insertions, 14 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index ef149ee39a0..6f1c6f7127c 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2004/09/08 02:42:23 danw Exp $
+# $NetBSD: Makefile,v 1.81 2004/09/22 07:38:52 jlam Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system *without* Kerberos
@@ -6,6 +6,7 @@
 
 DISTNAME=       imap-2004a
 PKGNAME=        imap-uw-2004a
+PKGREVISION=	1
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -17,6 +18,8 @@ COMMENT=	University of Washington's IMAP, POP2, and POP3 servers
 USE_BUILDLINK3=	# defined
 USE_LIBTOOL=	# defined
 
+LIBTOOLIZE_PLIST=	yes
+
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_DATA}
 INC_DIR=	${PREFIX}/include/c-client
@@ -141,8 +144,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${LIB_DIR}
 	${RANLIB} ${LIB_DIR}/${CCLIENT_PICLIB}
 	cd ${LIB_DIR}; for file in libc-client.*; do			\
-		f=`${ECHO} $${file} | ${SED} "s|libc-client|libimapuw|g"`; \
-		${TEST} -f $${file} && ${LN} -f $${file} $${f};	\
+		case $$file in						\
+		*.la)	;;						\
+		*)							\
+			f=`${ECHO} $${file} | ${SED} "s|libc-client|libimapuw|g"`; \
+			${TEST} -f $${file} && ${LN} -f $${file} $${f};	\
+			;;						\
+		esac;							\
 	done
 	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 77de8f13760..891aea31860 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/13 18:14:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/22 07:38:52 jlam Exp $
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -20,17 +20,8 @@ include/c-client/rfc822.h
 include/c-client/smtp.h
 include/c-client/tcp.h
 include/c-client/utf8.h
-lib/libc-client.a
 lib/libc-client.la
-lib/libc-client.so
-lib/libc-client.so.${CCLIENT_MAJOR}
-lib/libc-client.so.${CCLIENT_MAJOR}.${CCLIENT_MINOR}
 lib/libc-client_pic.a
-lib/libimapuw.a
-lib/libimapuw.la
-lib/libimapuw.so
-lib/libimapuw.so.${CCLIENT_MAJOR}
-lib/libimapuw.so.${CCLIENT_MAJOR}.${CCLIENT_MINOR}
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
index 6f54bcf5c61..5e4e7fb4689 100644
--- a/mail/imap-uw/buildlink3.mk
+++ b/mail/imap-uw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/23 00:58:25 kim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/09/22 07:38:52 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMAP_UW_BUILDLINK3_MK:=	${IMAP_UW_BUILDLINK3_MK}+
@@ -13,6 +13,11 @@ BUILDLINK_PACKAGES+=	imap-uw
 .if !empty(IMAP_UW_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004
 BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
+#
+# Make "-limapuw" resolve into "-lc-client".
+#
+BUILDLINK_TRANSFORM+=		l:imapuw:c-client
+
 .endif	# IMAP_UW_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"