Date: Tue, 5 Apr 2016 15:48:37 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412564 - in head/security/keynote: . files Message-ID: <201604051548.u35Fmbnp050716@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Apr 5 15:48:36 2016 New Revision: 412564 URL: https://svnweb.freebsd.org/changeset/ports/412564 Log: - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/security/keynote/Makefile head/security/keynote/files/patch-Makefile.in head/security/keynote/files/patch-configure head/security/keynote/files/patch-keynote-ver.y head/security/keynote/files/patch-keynote.y head/security/keynote/files/patch-man__keynote.4 Modified: head/security/keynote/Makefile ============================================================================== --- head/security/keynote/Makefile Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/Makefile Tue Apr 5 15:48:36 2016 (r412564) @@ -34,6 +34,8 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/keynote.3 ${STAGEDIR}${MANPREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/man/keynote.4 \ ${STAGEDIR}${MANPREFIX}/man/man5/keynote.5 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/HOWTO.add.crypto ${WRKSRC}/TODO \ ${WRKSRC}/doc/rfc*.txt ${STAGEDIR}${DOCSDIR} Modified: head/security/keynote/files/patch-Makefile.in ============================================================================== --- head/security/keynote/files/patch-Makefile.in Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/files/patch-Makefile.in Tue Apr 5 15:48:36 2016 (r412564) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Nov 29 11:36:21 1999 -+++ Makefile.in Fri Mar 24 19:22:32 2000 -@@ -41,7 +41,7 @@ +--- Makefile.in.orig 2000-09-26 23:16:27 UTC ++++ Makefile.in +@@ -41,7 +41,7 @@ YACCFLAGS2 = -d -p kv -b z YACCFLAGS = -d -p kn -b k LEXFLAGS2 = -Pkv -s -i LEXFLAGS = -Cr -Pkn -s -i @@ -9,7 +9,7 @@ RMFLAGS2 = -rf RMFLAGS = -f NROFFFLAGS = -mandoc -@@ -87,9 +87,11 @@ +@@ -87,9 +87,11 @@ $(TARGET2): $(TARGET) $(OBJS2) k.tab.c: keynote.y header.h keynote.h assertion.h config.h $(YACC) $(YACCFLAGS) keynote.y Modified: head/security/keynote/files/patch-configure ============================================================================== --- head/security/keynote/files/patch-configure Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/files/patch-configure Tue Apr 5 15:48:36 2016 (r412564) @@ -1,6 +1,6 @@ ---- configure.orig Wed Oct 20 22:04:39 1999 -+++ configure Fri Mar 24 19:38:46 2000 -@@ -1256,7 +1256,7 @@ +--- configure.orig 2000-09-26 23:16:28 UTC ++++ configure +@@ -1256,7 +1256,7 @@ else fi @@ -9,7 +9,7 @@ -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 @@ +@@ -1421,7 +1421,8 @@ fi CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\ Modified: head/security/keynote/files/patch-keynote-ver.y ============================================================================== --- head/security/keynote/files/patch-keynote-ver.y Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/files/patch-keynote-ver.y Tue Apr 5 15:48:36 2016 (r412564) @@ -1,6 +1,6 @@ ---- keynote-ver-orig.y Tue Oct 12 00:34:29 1999 -+++ keynote-ver.y Wed May 28 14:47:32 2003 -@@ -48,7 +48,7 @@ +--- keynote-ver.y.orig 1999-10-11 22:34:29 UTC ++++ keynote-ver.y +@@ -48,7 +48,7 @@ program: expr | STRING { if (kn_add_authorizer(sessid, $1) != 0) return keynote_errno; free($1); @@ -9,7 +9,7 @@ expr: VSTRING EQ STRING { int i = kn_add_action(sessid, $1, $3, 0); -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ expr: VSTRING EQ STRING { int i = k return i; free($1); free($3); Modified: head/security/keynote/files/patch-keynote.y ============================================================================== --- head/security/keynote/files/patch-keynote.y Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/files/patch-keynote.y Tue Apr 5 15:48:36 2016 (r412564) @@ -1,6 +1,6 @@ ---- keynote-orig.y Wed Jun 14 08:28:23 2000 -+++ keynote.y Wed May 28 14:47:32 2003 -@@ -90,17 +90,17 @@ +--- keynote.y.orig 2000-06-14 06:28:23 UTC ++++ keynote.y +@@ -90,17 +90,17 @@ grammarswitch: LOCINI { keynote_exceptio | PRIVATEKEY { keynote_exceptionflag = keynote_donteval = 0; } STRING { keynote_lex_remove($3); keynote_privkey = $3; @@ -21,7 +21,7 @@ keyexp: notemptykeypredicate AND { if (($1 == 0) && !keynote_justrecord) keynote_donteval = 1; -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ keyexp: notemptykeypredicate AND { if (( $$ = get_kth($1); else $$ = 0; @@ -30,7 +30,7 @@ keylist: key { /* Don't do anything if we're just recording */ -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ keylist: key keynote_kth_array[$1]++; keylistcount++; @@ -39,7 +39,7 @@ key: str { if (keynote_donteval) -@@ -192,10 +192,10 @@ +@@ -192,10 +192,10 @@ key: str { break; } } @@ -52,7 +52,7 @@ localconstants: VARIABLE EQQ STRING { -@@ -264,12 +264,12 @@ +@@ -264,12 +264,12 @@ localconstants: VARIABLE EQQ STRING if (i != RESULT_TRUE) return -1; @@ -67,7 +67,7 @@ prog: /* Nada */ { $$ = 0; } | notemptyprog { -@@ -284,7 +284,7 @@ +@@ -284,7 +284,7 @@ prog: /* Nada */ { $$ = 0; } $$ = $1; else $$ = $4; @@ -76,7 +76,7 @@ notemptyprog: expr HINT afterhint { -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ notemptyprog: expr HINT afterhint $$ = keynote_current_session->ks_values_num - 1; else $$ = 0; @@ -85,7 +85,7 @@ afterhint: str { if (keynote_exceptionflag || keynote_donteval) $$ = 0; -@@ -314,7 +314,7 @@ +@@ -314,7 +314,7 @@ afterhint: str { if (keynote_exceptionf free($1); } } @@ -94,7 +94,7 @@ expr: OPENPAREN expr CLOSEPAREN { $$ = $2; } -@@ -333,19 +333,19 @@ +@@ -333,19 +333,19 @@ expr: OPENPAREN expr CLOSEPAREN { $ | floatexp { $$ = $1; } | stringexp { $$ = $1; } | TRUE { $$ = 1; } @@ -117,7 +117,7 @@ numex: numex PLUS numex { $$ = $1 + $3; } | numex MINUS numex { $$ = $1 - $3; } -@@ -383,7 +383,7 @@ +@@ -383,7 +383,7 @@ numex: numex PLUS numex { $$ = $1 + $ $$ = (int) floor(atof($2)); free($2); } @@ -126,7 +126,7 @@ floatex: floatex PLUS floatex { $$ = ($1 + $3); } | floatex MINUS floatex { $$ = ($1 - $3); } -@@ -417,7 +417,7 @@ +@@ -417,7 +417,7 @@ floatex: floatex PLUS floatex { $$ = $$ = atof($2); free($2); } @@ -135,7 +135,7 @@ stringexp: str EQ str { if (keynote_exceptionflag || keynote_donteval) -@@ -578,7 +578,7 @@ +@@ -578,7 +578,7 @@ stringexp: str EQ str { free($1); } } @@ -144,7 +144,7 @@ str: str DOTT str { if (keynote_exceptionflag || keynote_donteval) $$ = (char *) NULL; -@@ -604,7 +604,7 @@ +@@ -604,7 +604,7 @@ str: str DOTT str { if (keynote_exce return -1; } } @@ -153,7 +153,7 @@ strnotconcat: STRING { $$ = $1; } | OPENPAREN str CLOSEPAREN { $$ = $2; } -@@ -659,7 +659,7 @@ +@@ -659,7 +659,7 @@ strnotconcat: STRING { if (keynote_lex_add($$, LEXTYPE_CHAR) == -1) return -1; } Modified: head/security/keynote/files/patch-man__keynote.4 ============================================================================== --- head/security/keynote/files/patch-man__keynote.4 Tue Apr 5 15:48:31 2016 (r412563) +++ head/security/keynote/files/patch-man__keynote.4 Tue Apr 5 15:48:36 2016 (r412564) @@ -1,5 +1,5 @@ ---- man/keynote.4.orig Tue Sep 26 16:16:32 2000 -+++ man/keynote.4 Sat Dec 1 01:52:33 2001 +--- man/keynote.4.orig 2000-09-26 23:16:32 UTC ++++ man/keynote.4 @@ -20,7 +20,7 @@ .\" PURPOSE. .\"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604051548.u35Fmbnp050716>