From 69f7ead5ca320c56495a67f01b4a159ff287e5b9 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 4 Jan 2004 18:42:42 +0000
Subject: [PATCH] kill useless CFLAGS additions, define __STRICT_ANSI__ so that
 log gets a modern prototype, define log=mylog to remove conflict with
 built-in.

---
 textproc/glimpse/Makefile                            |  3 ++-
 textproc/glimpse/patches/patch-Makefile_in           | 12 ++++++++++++
 .../patches/patch-libtemplate_template_Makefile_in   | 11 +++++++++++
 .../patches/patch-libtemplate_util_Makefile_in       | 11 +++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 textproc/glimpse/patches/patch-Makefile_in
 create mode 100644 textproc/glimpse/patches/patch-libtemplate_template_Makefile_in
 create mode 100644 textproc/glimpse/patches/patch-libtemplate_util_Makefile_in

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index f831c27fcdf..8f355c86f82 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/10/28 22:43:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2004/01/04 18:42:42 espie Exp $
 
 COMMENT=	"text search engine"
 
@@ -20,6 +20,7 @@ CONFIGURE_STYLE=	gnu dest old
 pre-configure:
 	chmod ugo+x ${WRKSRC}/configure
 
+CFLAGS+=-D__STRICT_ANSI__ -Dlog=mylog
 VMEM_WARNING=	Yes
 NO_REGRESS=	Yes
 
diff --git a/textproc/glimpse/patches/patch-Makefile_in b/textproc/glimpse/patches/patch-Makefile_in
new file mode 100644
index 00000000000..d72d613a74d
--- /dev/null
+++ b/textproc/glimpse/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2004/01/04 18:42:42 espie Exp $
+--- Makefile.in.orig	2004-01-04 19:38:04.000000000 +0100
++++ Makefile.in	2004-01-04 19:38:10.000000000 +0100
+@@ -32,7 +32,7 @@ TEMPLATESRC     = $(srcdir)/$(TEMPLATEDI
+ COMPRESSDIR	= compress
+ COMPRESSSRC	= $(srcdir)/$(COMPRESSDIR)
+ 
+-CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
++CFLAGS		= @CFLAGS@ -DSTRUCTURED_QUERIES=1
+ ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
+ LINKFLAGS	= @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
+ 
diff --git a/textproc/glimpse/patches/patch-libtemplate_template_Makefile_in b/textproc/glimpse/patches/patch-libtemplate_template_Makefile_in
new file mode 100644
index 00000000000..8558bffe13a
--- /dev/null
+++ b/textproc/glimpse/patches/patch-libtemplate_template_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-libtemplate_template_Makefile_in,v 1.1 2004/01/04 18:42:42 espie Exp $
+--- libtemplate/template/Makefile.in.orig	2004-01-04 19:37:15.000000000 +0100
++++ libtemplate/template/Makefile.in	2004-01-04 19:37:19.000000000 +0100
+@@ -24,7 +24,6 @@ LN_S		= @LN_S@
+ DEBUG		= $(DEBUG_TOP) #-O #-g #-DDEBUG
+ DEBUG_LIBS	=
+ 
+-CFLAGS		= -O
+ INCLUDE		= -I$(srcdir)/../include
+ ALL_CFLAGS	= $(CFLAGS) $(DEBUG) $(INCLUDE)
+ 
diff --git a/textproc/glimpse/patches/patch-libtemplate_util_Makefile_in b/textproc/glimpse/patches/patch-libtemplate_util_Makefile_in
new file mode 100644
index 00000000000..c597622bc9c
--- /dev/null
+++ b/textproc/glimpse/patches/patch-libtemplate_util_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-libtemplate_util_Makefile_in,v 1.1 2004/01/04 18:42:42 espie Exp $
+--- libtemplate/util/Makefile.in.orig	2004-01-04 19:34:53.000000000 +0100
++++ libtemplate/util/Makefile.in	2004-01-04 19:35:05.000000000 +0100
+@@ -19,7 +19,6 @@ INSTALL_FILE 	= @INSTALL_DATA@
+ RANLIB		= @RANLIB@
+ 
+ INCLUDE         = -I$(srcdir)/../include
+-CFLAGS                = -O
+ ALL_CFLAGS	= $(CFLAGS) $(DEBUG) $(INCLUDE)
+ 
+ .c.o: