Redo previous rework to generate yacc/lex output again and remove generated

copies from the import as they don't compile clean across all archs.

crypto/dist/ipsec-tools/src/libipsec/policy_parse.h

@@ -1,29 +0,0 @@
-/*	$NetBSD: policy_parse.h,v 1.2 2005/11/21 14:20:28 manu Exp $	*/
-
-typedef union {
-	u_int num;
-	u_int32_t num32;
-	struct _val {
-		int len;
-		char *buf;
-	} val;
-} YYSTYPE;
-#define	DIR	257
-#define	PRIORITY	258
-#define	PLUS	259
-#define	PRIO_BASE	260
-#define	PRIO_OFFSET	261
-#define	ACTION	262
-#define	PROTOCOL	263
-#define	MODE	264
-#define	LEVEL	265
-#define	LEVEL_SPECIFY	266
-#define	IPADDRESS	267
-#define	PORT	268
-#define	ME	269
-#define	ANY	270
-#define	SLASH	271
-#define	HYPHEN	272
-
-
-extern YYSTYPE __libipseclval;

crypto/dist/ipsec-tools/src/setkey/parse.h

@@ -1,64 +0,0 @@
-/*	$NetBSD: parse.h,v 1.2 2005/11/21 14:20:36 manu Exp $	*/
-
-typedef union {
-	int num;
-	unsigned long ulnum;
-	vchar_t val;
-	struct addrinfo *res;
-} YYSTYPE;
-#define	EOT	257
-#define	SLASH	258
-#define	BLCL	259
-#define	ELCL	260
-#define	ADD	261
-#define	GET	262
-#define	DELETE	263
-#define	DELETEALL	264
-#define	FLUSH	265
-#define	DUMP	266
-#define	EXIT	267
-#define	PR_ESP	268
-#define	PR_AH	269
-#define	PR_IPCOMP	270
-#define	PR_ESPUDP	271
-#define	PR_TCP	272
-#define	F_PROTOCOL	273
-#define	F_AUTH	274
-#define	F_ENC	275
-#define	F_REPLAY	276
-#define	F_COMP	277
-#define	F_RAWCPI	278
-#define	F_MODE	279
-#define	MODE	280
-#define	F_REQID	281
-#define	F_EXT	282
-#define	EXTENSION	283
-#define	NOCYCLICSEQ	284
-#define	ALG_AUTH	285
-#define	ALG_AUTH_NOKEY	286
-#define	ALG_ENC	287
-#define	ALG_ENC_NOKEY	288
-#define	ALG_ENC_DESDERIV	289
-#define	ALG_ENC_DES32IV	290
-#define	ALG_ENC_OLD	291
-#define	ALG_COMP	292
-#define	F_LIFETIME_HARD	293
-#define	F_LIFETIME_SOFT	294
-#define	F_LIFEBYTE_HARD	295
-#define	F_LIFEBYTE_SOFT	296
-#define	DECSTRING	297
-#define	QUOTEDSTRING	298
-#define	HEXSTRING	299
-#define	STRING	300
-#define	ANY	301
-#define	SPDADD	302
-#define	SPDDELETE	303
-#define	SPDDUMP	304
-#define	SPDFLUSH	305
-#define	F_POLICY	306
-#define	PL_REQUESTS	307
-#define	F_AIFLAGS	308
-#define	TAGGED	309
-
-
-extern YYSTYPE yylval;

lib/libipsec/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/15 04:27:32 jmc Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/16 16:25:07 jmc Exp $
 
 USE_SHLIBDIR=	yes
 WARNS=	0	# Will be fixed later
@@ -20,14 +20,14 @@ CPPFLAGS+=-DINET6
 .PATH:	${DIST}/src/libipsec
 
 SRCS=	ipsec_dump_policy.c ipsec_get_policylen.c ipsec_strerror.c	\
-	pfkey.c pfkey_dump.c policy_parse.c policy_token.c key_debug.c
+	pfkey.c pfkey_dump.c policy_parse.y policy_token.l key_debug.c
+
+LPREFIX+=__libipsec
+YPREFIX+=__libipsec
+YHEADER=policy_parse.h
 
 MAN=	ipsec_set_policy.3 ipsec_strerror.3
 MLINKS+=ipsec_set_policy.3 ipsec_get_policylen.3 \
 	ipsec_set_policy.3 ipsec_dump_policy.3
 
 .include <bsd.lib.mk>
-
-# Don't auto-frob .y or .l files.
-.l.c .y.c .y.h:
-	@true

sbin/setkey/Makefile

@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2005/12/15 14:27:21 jmc Exp $
-
-WARNS=  0       # Will be fixed later
+# $NetBSD: Makefile,v 1.9 2005/12/16 16:25:07 jmc Exp $
 
 .include <bsd.own.mk>
 
 PROG=	setkey
-SRCS=	setkey.c parse.c token.c
+SRCS=	setkey.c parse.y token.l
 MAN=	setkey.8
 
+YHEADER=parse.h
+
 DIST=	${NETBSDSRCDIR}/crypto/dist/ipsec-tools
 
 CPPFLAGS+= -I${DIST}/src/setkey -I${DIST}/src/libipsec
@@ -25,7 +25,3 @@ CPPFLAGS+=-DINET6
 .PATH: ${DIST}/src/setkey 
 
 .include <bsd.prog.mk>
-
-# Don't auto-frob .y or .l files.
-.l.c .y.c .y.h:
-	@true