Upgrade to keynote 2.2 and take over maintainership

Approved by:	se (previous maintainer)

5 files changed, 45 insertions, 10 deletions

diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index af63b7338745..6ef6cfcbfbba 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	keynote
-PORTVERSION=	2.b4
+PORTVERSION=	2.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.cis.upenn.edu/~angelos/Code/
-DISTNAME=	keynote-2-beta4
 
-MAINTAINER=	se@FreeBSD.org
+MAINTAINER=	kris@FreeBSD.org
 
 USE_OPENSSL=	RSA
+GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/KeyNote-2-beta4
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ENV+=	SSLEAY="${OPENSSLBASE}/bin" OPENSSLLIB="${OPENSSLLIB}" \
+		OPENSSLINC="${OPENSSLINC}"
 
 MAN1=		keynote.1
 MAN3=		keynote.3
@@ -23,11 +26,11 @@ MAN4=		keynote.4
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keynote ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/libkeynote.a ${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/man/keynote.1 ${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKSRC}/man/keynote.3 ${PREFIX}/man/man3/
 	${INSTALL_DATA} ${WRKSRC}/man/keynote.4 ${PREFIX}/man/man4/
 	${MKDIR} ${PREFIX}/share/doc/keynote/
-	${INSTALL_DATA} ${WRKSRC}/doc/keynote-spec ${PREFIX}/share/doc/keynote/
-	${INSTALL_DATA} ${WRKSRC}/doc/keynote-spec.nroff ${PREFIX}/share/doc/keynote/
+	${INSTALL_DATA} ${WRKSRC}/doc/rfc2704.txt ${PREFIX}/share/doc/keynote/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/keynote/distinfo b/security/keynote/distinfo
index acb0c483123a..fee6d687b8d1 100644
--- a/security/keynote/distinfo
+++ b/security/keynote/distinfo
@@ -1 +1 @@
-MD5 (keynote-2-beta4.tar.gz) = be6b7357ae552fa78009f4242552608d
+MD5 (keynote-2.2.tar.gz) = 653e72922a70491b3a50961c97a8db63
diff --git a/security/keynote/files/patch-ac b/security/keynote/files/patch-ac
new file mode 100644
index 000000000000..86790f0f4278
--- /dev/null
+++ b/security/keynote/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Nov 29 11:36:21 1999
++++ Makefile.in	Fri Mar 24 19:22:32 2000
+@@ -41,7 +41,7 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
++CFLAGS ?= -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
diff --git a/security/keynote/files/patch-ad b/security/keynote/files/patch-ad
new file mode 100644
index 000000000000..ec214e9b19ff
--- /dev/null
+++ b/security/keynote/files/patch-ad
@@ -0,0 +1,21 @@
+--- configure.orig	Wed Oct 20 22:04:39 1999
++++ configure	Fri Mar 24 19:38:46 2000
+@@ -1256,7 +1256,7 @@
+ fi
+ 
+ 
+-LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\
++LIBS="-L/usr/lib -L/usr/local/lib -L${OPENSSLLIB} -L/usr/ssl/lib -L/usr/openssl/lib\
+  -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib"
+ 
+ echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
+@@ -1421,7 +1421,8 @@
+ 
+ 
+ CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\
+- -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\
++ -I/usr/local/ssl/include -I${OPENSSLINC}\
++ -I/usr/openssl/include -I/usr/pkg/include\
+  -I/usr/local/openssl/include -I/pkg/include"
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
diff --git a/security/keynote/pkg-plist b/security/keynote/pkg-plist
index 9420699ad4dc..91c8a2ef9cae 100644
--- a/security/keynote/pkg-plist
+++ b/security/keynote/pkg-plist
@@ -1,4 +1,4 @@
 bin/keynote
-share/doc/keynote/keynote-spec
-share/doc/keynote/keynote-spec.nroff
+lib/libkeynote.a
+share/doc/keynote/rfc2704.txt
 @dirrm share/doc/keynote/