Change to use libg++'s method of generating a library PLIST. Now honors

all /etc/mk.conf variables wrt libraries and accounts for them in PLIST.
Some portlint, too.

3 files changed, 13 insertions, 16 deletions

diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 6f62a39243e..2deaec78f2b 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:47 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/05/29 19:57:27 tv Exp $
 #
 
 DISTNAME=		rsaref20
 PKGNAME=		rsaref-2.0
 WRKSRC=			${WRKDIR}/source
 CATEGORIES=		security
-RSA_SITE=		ftp://ftp.rsa.com/rsaref/
 MASTER_SITES=		${RSA_SITE}
 EXTRACT_SUFX=		.tar.Z
 
@@ -15,6 +14,9 @@ RESTRICTED=		"Cryptographic source usable only within the USA"
 MIRROR_DISTFILE=	no
 IS_INTERACTIVE=		yes
 
+RSA_SITE=		ftp://ftp.rsa.com/rsaref/
+PLIST_SRC=		${WRKSRC}/.PLIST
+
 # XXX time-dependent directory; can't give a sensible response
 fetch-list:
 	@${DO_NADA}
@@ -35,15 +37,14 @@ pre-configure:
 	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/md5.h ${WRKSRC}
 	@${LN} -s . ${WRKSRC}/rsaref
 
-do-install:
+post-install:
 	${MKDIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} des.h global.h md2.h md5.h rsa.h rsaref.h \
 			${PREFIX}/include/rsaref
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} librsaref.a librsaref.so.2.0 ${PREFIX}/lib
-	${LN} -sf librsaref.so.2.0 ${PREFIX}/lib/librsaref.so.2
-	${LN} -sf librsaref.so.2.0 ${PREFIX}/lib/librsaref.so
+	@(${CAT} ${PKGDIR}/PLIST.pre; cd ${PREFIX}; \
+		/bin/ls 2>/dev/null -1d lib/librsaref*.a lib/librsaref.so*) \
+		>${PLIST_SRC}
 	${LDCONFIG} || ${TRUE}
 	cd ${WRKDIR}/doc && \
 		${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref
diff --git a/security/rsaref/files/Makefile b/security/rsaref/files/Makefile
index 28bac43e9f2..a3a4f605e6a 100644
--- a/security/rsaref/files/Makefile
+++ b/security/rsaref/files/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/03/28 01:07:53 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/05/29 19:57:27 tv Exp $
 
 LIB=		rsaref
+LIBDIR=		${PREFIX}/lib
 CFLAGS=		-O2 -I.
 SHLIB_MAJOR=	2
 SHLIB_MINOR=	0
-NOPROFILE=	1
 NOLINT=		1
 
 SRCS=	desc.c digit.c md2c.c nn.c prime.c rsa.c r_encode.c r_dh.c \
diff --git a/security/rsaref/pkg/PLIST b/security/rsaref/pkg/PLIST.pre
index 145b9e937e7..5e4c4cec558 100644
--- a/security/rsaref/pkg/PLIST
+++ b/security/rsaref/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/03/18 00:49:33 tv Exp $
+@comment $NetBSD: PLIST.pre,v 1.1 1998/05/29 19:57:27 tv Exp $
 include/rsaref/des.h
 include/rsaref/global.h
 include/rsaref/md2.h
@@ -6,12 +6,8 @@ include/rsaref/md5.h
 include/rsaref/rsa.h
 include/rsaref/rsaref.h
 @dirrm include/rsaref
-lib/librsaref.a
-lib/librsaref.so
-lib/librsaref.so.2
-lib/librsaref.so.2.0
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
 share/doc/rsaref/info.txt
 share/doc/rsaref/rsaref.txt
 @dirrm share/doc/rsaref
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true