ports/58836: Fix port: x11-wm/obconf

[Tim Bishop]

>Number:         58836
>Category:       ports
>Synopsis:       Fix port: x11-wm/obconf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 02 08:40:19 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD inferno.sixth.bishnet.net 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #5: Sun Oct 12 21:44:24 BST 2003 tdb at inferno.sixth.bishnet.net:/usr/obj/usr/src/sys/INFERNO i386

>Description:
	The openbox port installs the required header file in a
	location that the obconf port doesn't expect. To fix this,
	patch the obconf code as given in this patch.

>How-To-Repeat:
>Fix:
	Apply patch below.

--- obconf-1.5-fix.diff begins here ---
diff -ruN obconf.bak/files/patch-src_main.h obconf/files/patch-src_main.h
--- obconf.bak/files/patch-src_main.h	Thu Jan  1 01:00:00 1970
+++ obconf/files/patch-src_main.h	Sun Nov  2 16:28:46 2003
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+Openbox 3.0 port installs headers in a 3.0 subdirectory.
+
+--- src/main.h.bak	Sun Nov  2 16:25:33 2003
++++ src/main.h	Sun Nov  2 16:25:43 2003
+@@ -19,7 +19,7 @@
+ #ifndef obconf__main_h
+ #define obconf__main_h
+ 
+-#include "openbox/parse.h"
++#include "openbox/3.0/parse.h"
+ 
+ #include <gtk/gtk.h>
+ #include <glade/glade-xml.h>
diff -ruN obconf.bak/files/patch-src_tree.c obconf/files/patch-src_tree.c
--- obconf.bak/files/patch-src_tree.c	Thu Jan  1 01:00:00 1970
+++ obconf/files/patch-src_tree.c	Sun Nov  2 16:28:54 2003
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+Openbox 3.0 port installs headers in a 3.0 subdirectory.
+
+--- src/tree.c.bak	Sun Nov  2 16:25:50 2003
++++ src/tree.c	Sun Nov  2 16:26:08 2003
+@@ -18,7 +18,7 @@
+ 
+ #include "tree.h"
+ #include "main.h"
+-#include "openbox/parse.h"
++#include "openbox/3.0/parse.h"
+ 
+ #include <sys/types.h>
+ #include <signal.h>
diff -ruN obconf.bak/files/patch-src_tree.h obconf/files/patch-src_tree.h
--- obconf.bak/files/patch-src_tree.h	Thu Jan  1 01:00:00 1970
+++ obconf/files/patch-src_tree.h	Sun Nov  2 16:29:00 2003
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+Openbox 3.0 port installs headers in a 3.0 subdirectory.
+
+--- src/tree.h.bak	Sun Nov  2 16:27:44 2003
++++ src/tree.h	Sun Nov  2 16:26:24 2003
+@@ -19,7 +19,7 @@
+ #ifndef obconf__tree_h
+ #define obconf__tree_h
+ 
+-#include "openbox/parse.h"
++#include "openbox/3.0/parse.h"
+ 
+ xmlNodePtr tree_get_node(const gchar *path, const gchar *def);
+ 
--- obconf-1.5-fix.diff ends here ---


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