svn commit: r324681 - in head/security/keynote: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Aug 14 03:54:53 2013
New Revision: 324681
URL: http://svnweb.freebsd.org/changeset/ports/324681

Log:
  - Unbreak parallel (-jX) builds by fixing yacc'ed targets dependencies;
    unfortunately, doing it correctly requires GNU make (for order-only
    prerequisites)
  - Standardize Makefile header, define LICENSE (MIT)
  - Install somewhat more complete set of portdocs
  - Install manpages relative to MANPREFIX
  - While here, convert to OptionsNG, utilize PORTDOCS, remove pkg-plist,
    and generally cleanup port's Makefile

Deleted:
  head/security/keynote/pkg-plist
Modified:
  head/security/keynote/Makefile
  head/security/keynote/files/patch-ac

Modified: head/security/keynote/Makefile
==============================================================================
--- head/security/keynote/Makefile	Wed Aug 14 02:18:21 2013	(r324680)
+++ head/security/keynote/Makefile	Wed Aug 14 03:54:53 2013	(r324681)
@@ -1,6 +1,5 @@
-# Created by: se
+# Created by: Stefan Esser <se at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	keynote
 PORTVERSION=	2.3
@@ -11,26 +10,35 @@ MASTER_SITES=	http://www1.cs.columbia.ed
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Trust-Management System
 
-USE_OPENSSL=	YES
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
+LICENSE=	MIT
 
-CONFIGURE_ENV+=	SSLEAY="${OPENSSLBASE}/bin" OPENSSLLIB="${OPENSSLLIB}" \
+USES=		gmake		# required to support parallel (-jX) builds
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	SSLEAY="${OPENSSLBASE}/bin" OPENSSLLIB="${OPENSSLLIB}" \
 		OPENSSLINC="${OPENSSLINC}"
 
 MAN1=		keynote.1
 MAN3=		keynote.3
 MAN5=		keynote.5
+PLIST_FILES=	bin/keynote include/keynote.h lib/libkeynote.a
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/keynote ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/keynote.h ${PREFIX}/include/
-	${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/man5/keynote.5
-	${MKDIR} ${PREFIX}/share/doc/keynote/
-	${INSTALL_DATA} ${WRKSRC}/doc/rfc2704.txt ${PREFIX}/share/doc/keynote/
+	${INSTALL_PROGRAM} ${WRKSRC}/keynote ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/keynote.h ${PREFIX}/include
+	${INSTALL_MAN} ${WRKSRC}/libkeynote.a ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/man/keynote.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/keynote.3 ${MANPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/man/keynote.4 ${MANPREFIX}/man/man5/keynote.5
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/HOWTO.add.crypto ${WRKSRC}/TODO \
+		${WRKSRC}/doc/rfc*.txt ${DOCSDIR}
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/keynote/files/patch-ac
==============================================================================
--- head/security/keynote/files/patch-ac	Wed Aug 14 02:18:21 2013	(r324680)
+++ head/security/keynote/files/patch-ac	Wed Aug 14 03:54:53 2013	(r324681)
@@ -9,3 +9,15 @@
  RMFLAGS2 = -rf
  RMFLAGS = -f
  NROFFFLAGS = -mandoc
+@@ -87,9 +87,11 @@
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
++k.tab.h: | k.tab.c
+ 
+ z.tab.c: keynote-ver.y keynote.h header.h config.h
+ 	$(YACC) $(YACCFLAGS2) keynote-ver.y
++z.tab.h: | z.tab.c
+ 
+ lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
+ 	$(LEX) $(LEXFLAGS) keynote.l