ports/113531: textproc/glimpse: TEMP_DIR follows non-staticc declaration

[Scot Hetzel]

>Number:         113531
>Category:       ports
>Synopsis:       textproc/glimpse: TEMP_DIR follows non-staticc declaration
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 10 16:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Scot Hetzel
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010.hetzel.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Fri May 25 17:09:04 CDT 2007     swhetzel at hp010.hetzel.org:/usr/src/7x/sys-p4/amd64/compile/GENERIC.debug  amd64

>Description:
While building kdevelop on -CURRENT after the xorg 7.2 and gcc 4.2 import, glimpse fails to build due to this error:

./glimpse.c:26: error: static declaration of 'TEMP_DIR' follows non-static declaration

>How-To-Repeat:
cd /usr/ports/textproc/glimpse
make build
:
cc -c -O -O2 -fno-strict-aliasing -pipe  -DISO_CHAR_SET=1 -D__STRICT_ANSI__ -DSTRUCTURED_QUERIES=1 -DHAVE_DIRENT_H=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_UTIME_NULL=1 -DHAVE_STRDUP=1 -DHAVE_LIBM=1 -DSTRUCTURED_QUERIES=1 -DAGREP_POINTER=1 -I./../agrep -I./../libtemplate/include -DBUILDCAST=1 -o buildcast.o ./glimpse.c
./glimpse.c:26: error: static declaration of 'TEMP_DIR' follows non-static declaration
./glimpse.c:21: error: previous declaration of 'TEMP_DIR' was here
*** Error code 1

Stop in /usr/ports/textproc/glimpse/work/glimpse-4.13.1/index.

>Fix:
found the fix on the debians-bugs-list:

http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg18813.html

add the attached patch for glimpse.c to the ports files directory.

Patch attached with submission follows:

--- index/glimpse.c.orig	Tue Mar  2 01:37:55 1999
+++ index/glimpse.c	Sun Jun 10 11:11:49 2007
@@ -18,12 +18,13 @@
 extern char  INDEX_DIR[MAX_LINE_LEN];
 extern struct stat istbuf;
 
-extern char	*TEMP_DIR; /* directory to store glimpse temporary files, usually /tmp unless -T is specified */
 #ifdef BUILDCAST
 /* TEMP_DIR is normally defined in ../main.c; if we're building
  * buildcast, that's not linked in, so we need to define one here. */
 /* char * TEMP_DIR = NULL; */
 static char * TEMP_DIR = "/tmp";
+#else
+extern char     *TEMP_DIR; /* directory to store glimpse temporary files, usually /tmp unless -T is specified */
 #endif /* BUILDCAST */
 extern int indexable_char[256];
 extern int GenerateHash;


>Release-Note:
>Audit-Trail:
>Unformatted: