Bug 67716

Summary: [patch] x11/xscreensaver-gnome breaks in the presence of libutils
Product: Ports & Packages Reporter: Volker Stolz <vs>
Component: Individual Port(s)Assignee: Volker Stolz <vs>
Status: Closed FIXED    
Severity: Affects Only Me CC: gnome
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Volker Stolz freebsd_committer freebsd_triage 2004-06-08 16:40:21 UTC 
The port snaps up a wrong util.h if libutil.h is installed:

gmake[1]: Entering directory `/usr/ports/x11/xscreensaver-gnome/work/xscreensaver-4.16/hacks'
cc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c -I. -I. -I./../utils -I..  -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/X11R6/include/libglade-2.0   -I/usr/local/include/libxml2 -I/usr/local/include   -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include   -DSTANDALONE -DHAVE_CONFIG_H -O -pipe -g  -I/usr/local/include  -I/usr/X11R6/include phosphor.c
In file included from phosphor.c:34:
/usr/local/include/util.h:95: syntax error before `/'
gmake[1]: *** [phosphor.o] Error 1
gmake[1]: Leaving directory `/usr/ports/x11/xscreensaver-gnome/work/xscreensaver-4.16/hacks'
gmake: *** [all] Error 5
*** Error code 2
 
Stop in /usr/ports/x11/xscreensaver-gnome.
xscreensaver-gnome@menelaos [17:10:37]> pkg_info -W /usr/local/include/util.h
/usr/local/include/util.h was installed by package libutils-1.0.3_1

Fix: HAVE_UTIL_H is tested via configure. I think this should read libutil.h,
because that's where forkpty comes from. Note that the following patch
works with both with and without libutils installed. This bug should
be reported upstream, since ./configure ist testing the wrong things
(and will mean that things are a bit out-of-sync in our port:
- with libutils, it will use the correct header-file
- without libutils, the libutil.h will be #ifdef'ed out, but still dtrt)

If nobody objects, I'll commit this and do the reporting.
How-To-Repeat: - Install libutils
- Try to build xscreensaver
Comment 1 Joe Marcus Clarke freebsd_committer freebsd_triage 2004-06-08 18:59:14 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->vs

You are approved to commit this.  In the future, just send us an email.
Comment 2 Volker Stolz freebsd_committer freebsd_triage 2004-06-09 08:32:40 UTC 
State Changed
From-To: open->closed

Fixed.