On Fri, Jul 07, 2017 at 09:23:30PM +0200, Marc Espie wrote:
> This is a collaboration of sort with FreeBSD.
> 
> To me very specific, working on fixing depends made me look at fixing yacc
> support, and at the same time, I looked at FreeBSD, and they did this
> already (with different code, our share/mk are wildly divergent), so this
> comforted me this was doable and probably not too painful.
> 
> So far so good. It has surprisingly little impact on base.
> I'm currently building xenocara as well, and intend to put this thru
> a ports build as well.
> 
> What this does:
> - change the .y -> .c rule for bsd.prog.mk/bsd.lib.mk (thru bsd.sys.mk)
> 
> so that it does .y -> .c/.h, thus changing the name of the generated .h file
> 
> - add an explicit dependency (+ the same rule, more or less) in bsd.dep.mk
> so that the .c and .h are tied correctly, and so that the .h is cleaned
> as well.
> 
> 
> What this does not:
> - change the default rule in sys.mk for yacc files, because that would break
> posix compatibility, and impact way more software we don't have a direct
> interest in maintaining.
> 
> Impact: surprisingly few programs.  A lot of other stuff actually has ad-hoc
> rules that could probably be cleansed afterwards.
> 
> 
> Considering how much of a headache, having the framework do something sane
> by default, even if this involves changing a few files, seems like a good
> thing to me...
> 
> After running that build, I think it's reaching the stage where I'm actually
> asking for review and okays.
> 
> Index: games/atc/lex.l
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/games/atc/lex.l,v
> retrieving revision 1.4
> diff -u -p -r1.4 lex.l
> --- games/atc/lex.l   27 Oct 2009 23:59:23 -0000      1.4
> +++ games/atc/lex.l   7 Jul 2017 11:15:08 -0000
> @@ -43,7 +43,7 @@
>   * For more info on this and all of my stuff, mail edja...@berkeley.edu.
>   */
>  
> -#include "y.tab.h"
> +#include "grammar.h"
>  
>  extern int   line;
>  
> Index: sbin/wsconsctl/map_scan.l
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/sbin/wsconsctl/map_scan.l,v
> retrieving revision 1.6
> diff -u -p -r1.6 map_scan.l
> --- sbin/wsconsctl/map_scan.l 19 Nov 2015 19:48:27 -0000      1.6
> +++ sbin/wsconsctl/map_scan.l 7 Jul 2017 11:05:29 -0000
> @@ -39,7 +39,7 @@
>  #include <limits.h>
>  #include <err.h>
>  #include "wsconsctl.h"
> -#include "y.tab.h"
> +#include "map_parse.h"
>  
>  void
>  map_scan_setinput(char *str)
> Index: share/mk/bsd.dep.mk
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/share/mk/bsd.dep.mk,v
> retrieving revision 1.20
> diff -u -p -r1.20 bsd.dep.mk
> --- share/mk/bsd.dep.mk       5 Jul 2017 13:30:01 -0000       1.20
> +++ share/mk/bsd.dep.mk       7 Jul 2017 11:04:37 -0000
> @@ -38,6 +38,17 @@ tags:
>  ${i:R:S/$/.o/} ${i:R:S/$/.po/} ${i:R:S/$/.so/} ${i:R:S/$/.do/}: $i
>  .endfor
>  
> +# give us better rules for yacc
> +
> +.if ${YFLAGS:M-d}
> +# loop may not trigger
> +.  for f in ${SRCS:M*.y}     
> +${f:.y=.c} ${f:.y=.h}: $f
> +     ${YACC.y} -o ${f:.y=.c} ${.IMPSRC}
> +.  endfor
> +CLEANFILES += ${SRCS:M*.y:.y=.h}
> +.endif
> +
>  CLEANFILES += ${DEPS} .depend
>  
>  BUILDFIRST ?=
> Index: share/mk/bsd.sys.mk
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/share/mk/bsd.sys.mk,v
> retrieving revision 1.12
> diff -u -p -r1.12 bsd.sys.mk
> --- share/mk/bsd.sys.mk       5 Jul 2017 13:31:40 -0000       1.12
> +++ share/mk/bsd.sys.mk       7 Jul 2017 10:32:40 -0000
> @@ -10,18 +10,5 @@ CPPFLAGS+= -nostdinc -idirafter ${DESTDI
>  CXXFLAGS+= -idirafter ${DESTDIR}/usr/include/g++
>  .endif
>  
> -.if defined(PARALLEL)
> -# Yacc
> -.y:
> -     ${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
> -     ${LINK.c} -o ${.TARGET} ${.TARGET:R}.tab.c ${LDLIBS}
> -     rm -f ${.TARGET:R}.tab.c
>  .y.c:
> -     ${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
> -     mv ${.TARGET:R}.tab.c ${.TARGET}
> -.y.o:
> -     ${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
> -     ${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.tab.c
> -     rm -f ${.TARGET:R}.tab.c
> -     if test -f ${.TARGET:R}.d; then sed -i -e 
> 's,${.TARGET:R}.tab.c,${.IMPSRC},' ${.TARGET:R}.d; fi
> -.endif
> +     ${YACC.y} -o ${.TARGET} ${.IMPSRC}
> Index: usr.bin/m4/Makefile
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.bin/m4/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- usr.bin/m4/Makefile       4 Jul 2017 08:39:57 -0000       1.15
> +++ usr.bin/m4/Makefile       7 Jul 2017 11:13:24 -0000
> @@ -14,11 +14,4 @@ DPADD= ${LIBM} ${LIBUTIL}
>  SRCS=        eval.c expr.c look.c main.c misc.c gnum4.c trace.c tokenizer.l 
> parser.y
>  MAN= m4.1
>  
> -parser.c parser.h: parser.y
> -     ${YACC} -o parser.c -d ${.ALLSRC}
> -
> -tokenizer.o: parser.h
> -
> -CLEANFILES+=parser.c parser.h tokenizer.o
> -
>  .include <bsd.prog.mk>
> Index: usr.bin/rdist/Makefile
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.bin/rdist/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- usr.bin/rdist/Makefile    12 Jul 2014 03:32:00 -0000      1.19
> +++ usr.bin/rdist/Makefile    7 Jul 2017 11:07:00 -0000
> @@ -5,7 +5,6 @@ PROG= rdist
>  CFLAGS+=-I. -I${.CURDIR}
>  SRCS=        gram.y child.c client.c common.c distopt.c docmd.c expand.c \
>       isexec.c lookup.c message.c rdist.c
> -CLEANFILES+=gram.c y.tab.h
>  WARNINGS=yes
>  
>  .include <bsd.prog.mk>
> Index: usr.bin/rdist/client.c
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.bin/rdist/client.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 client.c
> --- usr.bin/rdist/client.c    9 Dec 2015 19:39:10 -0000       1.35
> +++ usr.bin/rdist/client.c    7 Jul 2017 11:07:43 -0000
> @@ -39,7 +39,7 @@
>  #include <unistd.h>
>  
>  #include "client.h"
> -#include "y.tab.h"
> +#include "gram.h"
>  
>  /*
>   * Routines used in client mode to communicate with remove server.
> Index: usr.bin/rdist/docmd.c
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.bin/rdist/docmd.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 docmd.c
> --- usr.bin/rdist/docmd.c     20 Jan 2015 09:00:16 -0000      1.32
> +++ usr.bin/rdist/docmd.c     7 Jul 2017 11:07:59 -0000
> @@ -39,7 +39,7 @@
>  #include <unistd.h>
>  
>  #include "client.h"
> -#include "y.tab.h"
> +#include "gram.h"
>  
>  /*
>   * Functions for rdist that do command (cmd) related activities.
> Index: usr.bin/rdist/rdist.c
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.bin/rdist/rdist.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 rdist.c
> --- usr.bin/rdist/rdist.c     8 Feb 2015 23:40:34 -0000       1.30
> +++ usr.bin/rdist/rdist.c     7 Jul 2017 11:07:15 -0000
> @@ -38,7 +38,7 @@
>  #include <unistd.h>
>  
>  #include "client.h"
> -#include "y.tab.h"
> +#include "gram.h"
>  
>  
>  /*
> Index: usr.sbin/config/scan.l
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.sbin/config/scan.l,v
> retrieving revision 1.23
> diff -u -p -r1.23 scan.l
> --- usr.sbin/config/scan.l    19 Nov 2015 19:48:27 -0000      1.23
> +++ usr.sbin/config/scan.l    7 Jul 2017 11:10:47 -0000
> @@ -48,7 +48,7 @@
>  #include <string.h>
>  #include <unistd.h>
>  #include "config.h"
> -#include "y.tab.h"
> +#include "gram.h"
>  
>  int  yyline;
>  const char *yyfile;
After a full bulk, no parts of xenocara are affected and just five ports.

Fixes are trivial in each case.
Index: mail/smtp-vilter/patches/patch-backend_vilter-attachment_Makefile
===================================================================
RCS file: 
/cvs/ports/mail/smtp-vilter/patches/patch-backend_vilter-attachment_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-backend_vilter-attachment_Makefile
--- mail/smtp-vilter/patches/patch-backend_vilter-attachment_Makefile   23 Jan 
2014 15:45:18 -0000      1.2
+++ mail/smtp-vilter/patches/patch-backend_vilter-attachment_Makefile   9 Jul 
2017 08:37:47 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-backend_vilter-attachment_Makefile,v 1.2 2014/01/23 15:45:18 
jasper Exp $
---- backend/vilter-attachment/Makefile.orig    Sun Nov 12 12:39:17 2006
-+++ backend/vilter-attachment/Makefile Thu Jan 23 16:41:39 2014
-@@ -14,7 +14,7 @@ NOPROFILE=   1
+Index: backend/vilter-attachment/Makefile
+--- backend/vilter-attachment/Makefile.orig
++++ backend/vilter-attachment/Makefile
+@@ -5,7 +5,6 @@ SRCS=          vilter-attachment.c parse.y scan.l
+ 
+ YFLAGS=               -d -p attachment
+ LFLAGS=               -Pattachment -olex.yy.c
+-CLEANFILES+=  y.tab.h parse.c scan.c
+ 
+ LIBDIR=       /usr/local/lib/smtp-vilter
+ NOMAN=                1
+@@ -14,7 +13,7 @@ NOPROFILE=   1
  CFLAGS+=      -Wall -fPIC -I${.CURDIR} -I${.CURDIR}/../../include \
                -I/usr/src/gnu/usr.sbin/sendmail/include
  
Index: mail/smtp-vilter/patches/patch-backend_vilter-attachment_scan_l
===================================================================
RCS file: mail/smtp-vilter/patches/patch-backend_vilter-attachment_scan_l
diff -N mail/smtp-vilter/patches/patch-backend_vilter-attachment_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-backend_vilter-attachment_scan_l     9 Jul 
2017 08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: backend/vilter-attachment/scan.l
+--- backend/vilter-attachment/scan.l.orig
++++ backend/vilter-attachment/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smtp-vilter/patches/patch-backend_vilter-clamd_Makefile
===================================================================
RCS file: 
/cvs/ports/mail/smtp-vilter/patches/patch-backend_vilter-clamd_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-backend_vilter-clamd_Makefile
--- mail/smtp-vilter/patches/patch-backend_vilter-clamd_Makefile        23 Jan 
2014 15:45:18 -0000      1.2
+++ mail/smtp-vilter/patches/patch-backend_vilter-clamd_Makefile        9 Jul 
2017 08:37:47 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-backend_vilter-clamd_Makefile,v 1.2 2014/01/23 15:45:18 jasper 
Exp $
---- backend/vilter-clamd/Makefile.orig Sun Nov 12 12:39:17 2006
-+++ backend/vilter-clamd/Makefile      Thu Jan 23 16:41:39 2014
-@@ -14,7 +14,7 @@ NOPROFILE=   1
+Index: backend/vilter-clamd/Makefile
+--- backend/vilter-clamd/Makefile.orig
++++ backend/vilter-clamd/Makefile
+@@ -5,7 +5,6 @@ SRCS=          vilter-clamd.c parse.y scan.l
+ 
+ YFLAGS=               -d -p clamd
+ LFLAGS=       -Pclamd -olex.yy.c
+-CLEANFILES+=  y.tab.h parse.c scan.c
+ 
+ LIBDIR=       /usr/local/lib/smtp-vilter
+ NOMAN=                1
+@@ -14,7 +13,7 @@ NOPROFILE=   1
  CFLAGS+=      -Wall -fPIC -I${.CURDIR} -I${.CURDIR}/../../include \
                -I/usr/src/gnu/usr.sbin/sendmail/include
  
Index: mail/smtp-vilter/patches/patch-backend_vilter-clamd_scan_l
===================================================================
RCS file: mail/smtp-vilter/patches/patch-backend_vilter-clamd_scan_l
diff -N mail/smtp-vilter/patches/patch-backend_vilter-clamd_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-backend_vilter-clamd_scan_l  9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: backend/vilter-clamd/scan.l
+--- backend/vilter-clamd/scan.l.orig
++++ backend/vilter-clamd/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smtp-vilter/patches/patch-backend_vilter-icap_Makefile
===================================================================
RCS file: 
/cvs/ports/mail/smtp-vilter/patches/patch-backend_vilter-icap_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-backend_vilter-icap_Makefile
--- mail/smtp-vilter/patches/patch-backend_vilter-icap_Makefile 23 Jan 2014 
15:45:18 -0000      1.2
+++ mail/smtp-vilter/patches/patch-backend_vilter-icap_Makefile 9 Jul 2017 
08:37:47 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-backend_vilter-icap_Makefile,v 1.2 2014/01/23 15:45:18 jasper 
Exp $
---- backend/vilter-icap/Makefile.orig  Sun Nov 12 12:39:17 2006
-+++ backend/vilter-icap/Makefile       Thu Jan 23 16:41:39 2014
-@@ -14,7 +14,7 @@ NOPROFILE=   1
+Index: backend/vilter-icap/Makefile
+--- backend/vilter-icap/Makefile.orig
++++ backend/vilter-icap/Makefile
+@@ -5,7 +5,6 @@ SRCS=          vilter-icap.c parse.y scan.l
+ 
+ YFLAGS=               -d -p icap
+ LFLAGS=       -Picap -olex.yy.c
+-CLEANFILES+=  y.tab.h parse.c scan.c
+ 
+ LIBDIR=       /usr/local/lib/smtp-vilter
+ NOMAN=                1
+@@ -14,7 +13,7 @@ NOPROFILE=   1
  CFLAGS+=      -Wall -fPIC -I${.CURDIR} -I${.CURDIR}/../../include \
                -I/usr/src/gnu/usr.sbin/sendmail/include
  
Index: mail/smtp-vilter/patches/patch-backend_vilter-icap_scan_l
===================================================================
RCS file: mail/smtp-vilter/patches/patch-backend_vilter-icap_scan_l
diff -N mail/smtp-vilter/patches/patch-backend_vilter-icap_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-backend_vilter-icap_scan_l   9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: backend/vilter-icap/scan.l
+--- backend/vilter-icap/scan.l.orig
++++ backend/vilter-icap/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smtp-vilter/patches/patch-backend_vilter-regex_Makefile
===================================================================
RCS file: 
/cvs/ports/mail/smtp-vilter/patches/patch-backend_vilter-regex_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-backend_vilter-regex_Makefile
--- mail/smtp-vilter/patches/patch-backend_vilter-regex_Makefile        23 Jan 
2014 15:45:18 -0000      1.2
+++ mail/smtp-vilter/patches/patch-backend_vilter-regex_Makefile        9 Jul 
2017 08:37:47 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-backend_vilter-regex_Makefile,v 1.2 2014/01/23 15:45:18 jasper 
Exp $
---- backend/vilter-regex/Makefile.orig Sun Nov 12 12:39:17 2006
-+++ backend/vilter-regex/Makefile      Thu Jan 23 16:41:39 2014
-@@ -14,7 +14,7 @@ NOPROFILE=   1
+Index: backend/vilter-regex/Makefile
+--- backend/vilter-regex/Makefile.orig
++++ backend/vilter-regex/Makefile
+@@ -5,7 +5,6 @@ SRCS=          vilter-regex.c parse.y scan.l
+ 
+ YFLAGS=               -d -p regex
+ LFLAGS=               -Pregex -olex.yy.c
+-CLEANFILES+=  y.tab.h parse.c scan.c
+ 
+ LIBDIR=       /usr/local/lib/smtp-vilter
+ NOMAN=                1
+@@ -14,7 +13,7 @@ NOPROFILE=   1
  CFLAGS+=      -Wall -fPIC -I${.CURDIR} -I${.CURDIR}/../../include \
                -I/usr/src/gnu/usr.sbin/sendmail/include
  
Index: mail/smtp-vilter/patches/patch-backend_vilter-regex_scan_l
===================================================================
RCS file: mail/smtp-vilter/patches/patch-backend_vilter-regex_scan_l
diff -N mail/smtp-vilter/patches/patch-backend_vilter-regex_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-backend_vilter-regex_scan_l  9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: backend/vilter-regex/scan.l
+--- backend/vilter-regex/scan.l.orig
++++ backend/vilter-regex/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smtp-vilter/patches/patch-backend_vilter-spamd_Makefile
===================================================================
RCS file: 
/cvs/ports/mail/smtp-vilter/patches/patch-backend_vilter-spamd_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-backend_vilter-spamd_Makefile
--- mail/smtp-vilter/patches/patch-backend_vilter-spamd_Makefile        23 Jan 
2014 15:45:18 -0000      1.2
+++ mail/smtp-vilter/patches/patch-backend_vilter-spamd_Makefile        9 Jul 
2017 08:37:47 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-backend_vilter-spamd_Makefile,v 1.2 2014/01/23 15:45:18 jasper 
Exp $
---- backend/vilter-spamd/Makefile.orig Sun Nov 12 12:39:17 2006
-+++ backend/vilter-spamd/Makefile      Thu Jan 23 16:41:39 2014
-@@ -14,7 +14,7 @@ NOPROFILE=   1
+Index: backend/vilter-spamd/Makefile
+--- backend/vilter-spamd/Makefile.orig
++++ backend/vilter-spamd/Makefile
+@@ -5,7 +5,6 @@ SRCS=          vilter-spamd.c parse.y scan.l
+ 
+ YFLAGS=               -d -p spamd
+ LFLAGS=               -Pspamd -olex.yy.c
+-CLEANFILES+=  y.tab.h parse.c scan.c
+ 
+ LIBDIR=       /usr/local/lib/smtp-vilter
+ NOMAN=                1
+@@ -14,7 +13,7 @@ NOPROFILE=   1
  CFLAGS+=      -Wall -fPIC -I${.CURDIR} -I${.CURDIR}/../../include \
                -I/usr/src/gnu/usr.sbin/sendmail/include
  
Index: mail/smtp-vilter/patches/patch-backend_vilter-spamd_scan_l
===================================================================
RCS file: mail/smtp-vilter/patches/patch-backend_vilter-spamd_scan_l
diff -N mail/smtp-vilter/patches/patch-backend_vilter-spamd_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-backend_vilter-spamd_scan_l  9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: backend/vilter-spamd/scan.l
+--- backend/vilter-spamd/scan.l.orig
++++ backend/vilter-spamd/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile
===================================================================
RCS file: mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile
diff -N mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smtp-vilter/patches/patch-bin_smtp-vilter_Makefile     9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: bin/smtp-vilter/Makefile
+--- bin/smtp-vilter/Makefile.orig
++++ bin/smtp-vilter/Makefile
+@@ -12,7 +12,7 @@ YFLAGS=              -d -p vilter
+ LFLAGS=               -Pvilter -olex.yy.c
+ LINTFLAGS+=   -u
+ 
+-CLEANFILES+=  y.tab.h rt-dynamic
++CLEANFILES+=  rt-dynamic
+ 
+ MAN=          smtp-vilter.8 smtp-vilter.conf.5
+ MANDIR=       /usr/local/man/cat
Index: mail/smtp-vilter/patches/patch-bin_smtp-vilter_scan_l
===================================================================
RCS file: /cvs/ports/mail/smtp-vilter/patches/patch-bin_smtp-vilter_scan_l,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bin_smtp-vilter_scan_l
--- mail/smtp-vilter/patches/patch-bin_smtp-vilter_scan_l       23 Jan 2014 
15:45:18 -0000      1.3
+++ mail/smtp-vilter/patches/patch-bin_smtp-vilter_scan_l       9 Jul 2017 
08:37:47 -0000
@@ -1,6 +1,16 @@
 $OpenBSD: patch-bin_smtp-vilter_scan_l,v 1.3 2014/01/23 15:45:18 jasper Exp $
---- bin/smtp-vilter/scan.l.orig        Sun Jan 21 13:09:38 2007
-+++ bin/smtp-vilter/scan.l     Fri Oct 23 09:41:00 2009
+Index: bin/smtp-vilter/scan.l
+--- bin/smtp-vilter/scan.l.orig
++++ bin/smtp-vilter/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
 @@ -52,6 +52,7 @@ logfile                      { return LOGFILE; }
  config-file           { return CFGFILE; }
  statfile              { return STATFILE; }
Index: mail/ldapvacation/patches/patch-src_ldapvacation_Makefile
===================================================================
RCS file: mail/ldapvacation/patches/patch-src_ldapvacation_Makefile
diff -N mail/ldapvacation/patches/patch-src_ldapvacation_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/ldapvacation/patches/patch-src_ldapvacation_Makefile   9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/ldapvacation/Makefile
+--- src/ldapvacation/Makefile.orig
++++ src/ldapvacation/Makefile
+@@ -3,8 +3,6 @@
+ PROG=         ldapvacation
+ SRCS=         ldapvacation.c parse.y scan.l
+ 
+-CLEANFILES+=  y.tab.h
+-
+ CFLAGS+=      -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
+ LDADD+=               -L/usr/local/lib -lldap_r -llber -lpthread
+ LINTFLAGS+=   -u
Index: mail/ldapvacation/patches/patch-src_ldapvacation_scan_l
===================================================================
RCS file: mail/ldapvacation/patches/patch-src_ldapvacation_scan_l
diff -N mail/ldapvacation/patches/patch-src_ldapvacation_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/ldapvacation/patches/patch-src_ldapvacation_scan_l     9 Jul 2017 
08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/ldapvacation/scan.l
+--- src/ldapvacation/scan.l.orig
++++ src/ldapvacation/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: mail/smsmail/patches/patch-src_Makefile
===================================================================
RCS file: mail/smsmail/patches/patch-src_Makefile
diff -N mail/smsmail/patches/patch-src_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smsmail/patches/patch-src_Makefile     9 Jul 2017 08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Makefile
+--- src/Makefile.orig
++++ src/Makefile
+@@ -3,8 +3,6 @@
+ PROG=         smsmail
+ SRCS=         smsmail.c parse.y scan.l
+ 
+-CLEANFILES+=  y.tab.h
+-
+ CFLAGS+=      -pthread -Wall -I/usr/local/include -DLDAP_DEPRECATED
+ LDADD+=               -L/usr/local/lib -lldap_r -llber -lpthread
+ LINTFLAGS+=   -u
Index: mail/smsmail/patches/patch-src_scan_l
===================================================================
RCS file: mail/smsmail/patches/patch-src_scan_l
diff -N mail/smsmail/patches/patch-src_scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/smsmail/patches/patch-src_scan_l       9 Jul 2017 08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/scan.l
+--- src/scan.l.orig
++++ src/scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: sysutils/tabled/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tabled/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- sysutils/tabled/patches/patch-Makefile      23 Jan 2015 13:01:16 -0000      
1.1
+++ sysutils/tabled/patches/patch-Makefile      9 Jul 2017 08:37:47 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Makefile,v 1.1 2015/01/23 13:01:16 naddy Exp $
---- Makefile.orig      Sat Apr 14 08:26:17 2007
-+++ Makefile   Fri Jan 23 13:52:10 2015
-@@ -6,7 +6,7 @@ SRCS=          tabled.c pickup.c imsg.c buffer.c pftable.c soc
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -6,13 +6,13 @@ SRCS=                tabled.c pickup.c imsg.c buffer.c 
pftable.c soc
  
  SUBDIR=               tablec
  
@@ -10,3 +11,10 @@ $OpenBSD: patch-Makefile,v 1.1 2015/01/2
  
  YFLAGS=               -d
  LFLAGS=               -olex.yy.c
+ LINTFLAGS+=   -u
+ 
+-CLEANFILES+=  y.tab.h rt-dynamic
++CLEANFILES+=  rt-dynamic
+ 
+ MAN=          tabled.8 tabled.conf.5
+ MANDIR=               /usr/local/man/cat
Index: sysutils/tabled/patches/patch-scan_l
===================================================================
RCS file: sysutils/tabled/patches/patch-scan_l
diff -N sysutils/tabled/patches/patch-scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ sysutils/tabled/patches/patch-scan_l        9 Jul 2017 08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: scan.l
+--- scan.l.orig
++++ scan.l
+@@ -19,7 +19,7 @@
+ 
+ #include <string.h>
+ 
+-#include "y.tab.h"
++#include "parse.h"
+ 
+ %}
+ 
Index: math/moo/patches/patch-Makefile
===================================================================
RCS file: math/moo/patches/patch-Makefile
diff -N math/moo/patches/patch-Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ math/moo/patches/patch-Makefile     9 Jul 2017 08:37:47 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1,8 +1,7 @@
+ PROG=         moo
+-SRCS=         moo.c scan.c
++SRCS=         moo.y scan.l
+ CPPFLAGS+=    -I${.CURDIR}
+ COPTS+=               -Wall -W -Wno-unused -Wshadow -pedantic -std=c99
+-CLEANFILES+=  moo.c y.tab.h scan.c lex.yy.c
+ 
+ LOCALBASE?=/usr/local
+ BINDIR=${LOCALBASE}/bin
Index: math/moo/patches/patch-scan_l
===================================================================
RCS file: math/moo/patches/patch-scan_l
diff -N math/moo/patches/patch-scan_l
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ math/moo/patches/patch-scan_l       9 Jul 2017 08:37:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: scan.l
+--- scan.l.orig
++++ scan.l
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ 
+ #include "extern.h"
+-#include "y.tab.h"
++#include "moo.h"
+ 
+ %}
+ 

Reply via email to