- re-do do-install target

- re-do rsaref Makefile using our library framework instead
- convert patch-aa to a unified diff

security/rsaref/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 1999/11/24 03:01:08 brad Exp $
+# $OpenBSD: Makefile,v 1.10 1999/12/13 00:34:11 brad Exp $
 # $FreeBSD: Makefile,v 1.3 1997/07/17 15:12:58 max Exp $
 
 PKGNAME=	rsaref-2.0
@@ -19,25 +19,24 @@ WRKSRC=	${WRKDIR}/source
 
 pre-configure:
 	@cp ${FILESDIR}/Makefile ${WRKSRC}
+	@cp ${FILESDIR}/shlib_version ${WRKSRC}
 	@cd ${WRKSRC} && \
 		cp des.h _des.h && \
 		cp md2.h _md2.h && \
 		cp md5.h _md5.h
 
 do-install:
-	@cd ${WRKSRC} && \
-		${INSTALL_DATA} rsa.h _des.h _md2.h _md5.h rsaref.h global.h \
-			${PREFIX}/include
-	@cd ${WRKSRC} && ${INSTALL_DATA} librsaref.a ${PREFIX}/lib
-	@install -d -m 555 ${PREFIX}/share/doc/rsaref
-	@cd ${WRKDIR}/doc && \
-		${INSTALL_DATA} info.txt rsaref.txt \
-			${PREFIX}/share/doc/rsaref
-
-post-install:
-	@if [ x"${NO_SHARED_LIBS}" = "x" ]; then \
-		${INSTALL_DATA} ${WRKSRC}/librsaref.so.2.0 ${PREFIX}/lib; \
-		${LDCONFIG} -m ${PREFIX}/lib; \
+	@mkdir -p ${PREFIX}/share/doc/rsaref
+.for f in rsa.h _des.h _md2.h _md5.h rsaref.h global.h
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
+.endfor
+.for f in info.txt rsaref.txt
+	${INSTALL_DATA} ${WRKDIR}/doc/${f} ${PREFIX}/share/doc/rsaref
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/librsaref.a ${PREFIX}/lib
+	@if [ -f ${WRKSRC}/librsaref.so.2.0 ]; then \
+	 ${INSTALL_DATA} ${WRKSRC}/librsaref.so.2.0 ${PREFIX}/lib; \
+	 ${LDCONFIG} -m ${PREFIX}/lib; \
 	fi
 
 .include <bsd.port.mk>

security/rsaref/files/Makefile

@@ -1,30 +1,8 @@
-O= o
-SO= so
-LIB= ar
+LIB=	rsaref
 
-.SUFFIXES: .c .so .o
+SRCS=	desc.c digit.c md2c.c md5c.c nn.c prime.c rsa.c r_encode.c r_dh.c \
+	r_enhanc.c r_keygen.c r_random.c r_stdlib.c
 
-.c.so:
-	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+NOPROFILE=yes
 
-RSAREFLIB=librsaref.a
-.if (${MACHINE_ARCH} != "alpha")
-SORSAREFLIB=librsaref.so.2.0
-.endif
-
-all: ${RSAREFLIB} ${SORSAREFLIB}
-
-$(RSAREFLIB) : desc.$(O) digit.$(O) md2c.$(O) md5c.$(O) nn.$(O) prime.$(O)\
-  rsa.$(O) r_encode.$(O) r_dh.$(O) r_enhanc.$(O) r_keygen.$(O) r_random.$(O)\
-  r_stdlib.$(O)
-	$(LIB) rc $@ $>
-	ranlib $@
-
-$(SORSAREFLIB) : desc.$(SO) digit.$(SO) md2c.$(SO) md5c.$(SO) nn.$(SO) prime.$(SO)\
-  rsa.$(SO) r_encode.$(SO) r_dh.$(SO) r_enhanc.$(SO) r_keygen.$(SO) r_random.$(SO)\
-  r_stdlib.$(SO)
-.if (${MACHINE_ARCH} != "mips")
-	${LD} -x -Bshareable -Bforcearchive -o $@ $>
-.else
-	${LD} -x -shared --whole-archive -o $@ $>
-.endif
+.include <bsd.lib.mk>

security/rsaref/files/shlib_version

@@ -0,0 +1,2 @@
+major=2
+minor=0

security/rsaref/patches/patch-aa

@@ -1,23 +1,15 @@
-*** rsaref.h.bak	Fri Mar 25 22:01:49 1994
---- rsaref.h	Sun Feb  2 22:30:11 1997
-***************
-*** 8,16 ****
-  #ifndef _RSAREF_H_
-  #define _RSAREF_H_ 1
-  
-! #include "md2.h"
-! #include "md5.h"
-! #include "des.h"
-  
-  #ifdef __cplusplus
-  extern "C" {
---- 8,16 ----
-  #ifndef _RSAREF_H_
-  #define _RSAREF_H_ 1
-  
-! #include "_md2.h"
-! #include "_md5.h"
-! #include "_des.h"
-  
-  #ifdef __cplusplus
-  extern "C" {
+--- rsaref.h.orig	Fri Mar 25 14:01:49 1994
++++ rsaref.h	Sun Dec 12 18:46:08 1999
+@@ -8,9 +8,9 @@
+ #ifndef _RSAREF_H_
+ #define _RSAREF_H_ 1
+ 
+-#include "md2.h"
+-#include "md5.h"
+-#include "des.h"
++#include "_md2.h"
++#include "_md5.h"
++#include "_des.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {