diff options
author | wiz <wiz@pkgsrc.org> | 2003-11-11 10:42:32 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2003-11-11 10:42:32 +0000 |
commit | f164e3c423d83b4ebc93b74379866663ac501d9c (patch) | |
tree | 938e26e891940d351cd8360ec8f16bc16a7fb2cc /misc/fep/patches/patch-ak | |
parent | f7268a6d62e2b4af50e01086f471285cf7980397 (diff) | |
download | pkgsrc-f164e3c423d83b4ebc93b74379866663ac501d9c.tar.gz |
Make patches apply again; use sed script in pre-build
to remove stuff after #endif to avoid RCS problems with patches (hi christos!).
Diffstat (limited to 'misc/fep/patches/patch-ak')
-rw-r--r-- | misc/fep/patches/patch-ak | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/misc/fep/patches/patch-ak b/misc/fep/patches/patch-ak index 1d701ada29b..3fcdfed72db 100644 --- a/misc/fep/patches/patch-ak +++ b/misc/fep/patches/patch-ak @@ -1,17 +1,8 @@ -$NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ +$NetBSD: patch-ak,v 1.3 2003/11/11 10:42:32 wiz Exp $ ---- fep_set.c.orig 2003-11-07 11:18:26.000000000 -0500 -+++ fep_set.c 2003-11-07 11:19:08.000000000 -0500 -@@ -3,7 +3,7 @@ - #ifndef lint - static char rcsid[]= - "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)"; --#endif lint -+#endif /* lint */ - - #include <stdio.h> - #include "fep_defs.h" -@@ -67,10 +67,10 @@ +--- fep_set.c.orig Wed May 29 07:31:24 1991 ++++ fep_set.c +@@ -67,10 +67,10 @@ VAR default_unset_vars [] = { #ifdef HASH #define HASHNUM 10 VAR *var_htab[HASHNUM]; @@ -24,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ /* * Functions -@@ -251,12 +251,12 @@ +@@ -251,12 +251,12 @@ show_varlist () for (; vp != (VAR *)0; vp = vp->v_next) printf ("%-16s %s\n", vp->v_name, vp->v_value); } @@ -39,7 +30,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ } #ifdef HASH -@@ -273,7 +273,7 @@ +@@ -273,7 +273,7 @@ static getindex (s) return (sum % HASHNUM); } @@ -48,7 +39,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ /* * Get pointer to VAR. -@@ -288,7 +288,7 @@ +@@ -288,7 +288,7 @@ getvp (name, alloc, lastvp) { #ifdef HASH register i = getindex (name); @@ -57,7 +48,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ VAR *vp, *last = (VAR *)0; #ifdef HASH -@@ -296,7 +296,7 @@ +@@ -296,7 +296,7 @@ getvp (name, alloc, lastvp) if (strcmp (name, vp->v_value) == 0) return (vp); } @@ -66,7 +57,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ for (vp = var_list->v_next, last = var_list; vp; last = vp, vp = vp->v_next) { int r; -@@ -309,7 +309,7 @@ +@@ -309,7 +309,7 @@ getvp (name, alloc, lastvp) else if (r < 0) break; } @@ -75,7 +66,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ if (alloc == 0) return (0); -@@ -327,9 +327,9 @@ +@@ -327,9 +327,9 @@ getvp (name, alloc, lastvp) else { var_htab[i] = vp; } |