ports/60194: [maintainer fix] the port is built incorrectly with the option WITHOUT_X11

[Eugene Ossintsev]

>Number:         60194
>Category:       ports
>Synopsis:       [maintainer fix] the port is built incorrectly with the option WITHOUT_X11
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 12 15:20:18 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Eugene Ossintsev
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD badger.home 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Nov 18 21:23:42 CET 2003 root at badger.home:/usr/obj/usr/src/sys/BADGER i386
>Description:
Added a patch to the original OCaml's configure script to fix building the
port with the option WITHOUT_X11. Besides, pkg-plist is fixed, too.
>How-To-Repeat:
	
>Fix:
diff -ruN ocaml.orig/Makefile ocaml/Makefile
--- ocaml.orig/Makefile	Fri Dec 12 00:55:06 2003
+++ ocaml/Makefile	Thu Dec 11 14:24:49 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocaml
 PORTVERSION=	3.07
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME}/ \
@@ -82,9 +83,7 @@
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-with-pthread
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	-tk-no-x11 -no-tk
-.else
+.if !defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	-x11include ${X11BASE}/include \
 			-x11lib ${X11BASE}/lib
 .if defined(WITHOUT_TK)
diff -ruN ocaml.orig/files/patch-configure ocaml/files/patch-configure
--- ocaml.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ ocaml/files/patch-configure	Thu Dec 11 13:40:17 2003
@@ -0,0 +1,125 @@
+--- configure.orig	Thu Sep 25 10:17:13 2003
++++ configure	Thu Dec 11 13:39:49 2003
+@@ -1097,116 +1097,14 @@
+ x11_include="not found"
+ x11_link="not found"
+ 
+-for dir in \
+-    $x11_include_dir          \
+-                              \
+-    /usr/X11R6/include        \
+-    /usr/include/X11R6        \
+-    /usr/local/X11R6/include  \
+-    /usr/local/include/X11R6  \
+-    /opt/X11R6/include        \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-    /opt/X11/include          \
+-                              \
+-    /usr/X11R5/include        \
+-    /usr/include/X11R5        \
+-    /usr/local/X11R5/include  \
+-    /usr/local/include/X11R5  \
+-    /usr/local/x11r5/include  \
+-    /opt/X11R5/include        \
+-                              \
+-    /usr/X11R4/include        \
+-    /usr/include/X11R4        \
+-    /usr/local/X11R4/include  \
+-    /usr/local/include/X11R4  \
+-                              \
+-    /usr/X386/include         \
+-    /usr/x386/include         \
+-    /usr/XFree86/include/X11  \
+-                              \
+-    /usr/include              \
+-    /usr/local/include        \
+-    /usr/unsupported/include  \
+-    /usr/athena/include       \
+-    /usr/lpp/Xamples/include  \
+-                              \
+-    /usr/openwin/include      \
+-    /usr/openwin/share/include \
+-    ; \
+-do
+-  if test -f $dir/X11/X.h; then
+-    x11_include=$dir
+-    break
+-  fi
+-done
+-
+-if test "$x11_include" = "not found"; then
+-  x11_try_lib_dir=''
+-else
+-  x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
++if [ -n "$x11_include_dir" ]; then
++    x11_include="$x11_include_dir"
+ fi
+ 
+-for dir in \
+-    $x11_lib_dir          \
+-    $x11_try_lib_dir      \
+-                          \
+-    /usr/X11R6/lib        \
+-    /usr/lib/X11R6        \
+-    /usr/local/X11R6/lib  \
+-    /usr/local/lib/X11R6  \
+-    /opt/X11R6/lib        \
+-                          \
+-    /usr/X11/lib          \
+-    /usr/lib/X11          \
+-    /usr/local/X11/lib    \
+-    /usr/local/lib/X11    \
+-    /opt/X11/lib          \
+-                          \
+-    /usr/X11R5/lib        \
+-    /usr/lib/X11R5        \
+-    /usr/local/X11R5/lib  \
+-    /usr/local/lib/X11R5  \
+-    /usr/local/x11r5/lib  \
+-    /opt/X11R5/lib        \
+-                          \
+-    /usr/X11R4/lib        \
+-    /usr/lib/X11R4        \
+-    /usr/local/X11R4/lib  \
+-    /usr/local/lib/X11R4  \
+-                          \
+-    /usr/X386/lib         \
+-    /usr/x386/lib         \
+-    /usr/XFree86/lib/X11  \
+-                          \
+-    /usr/lib              \
+-    /usr/local/lib        \
+-    /usr/unsupported/lib  \
+-    /usr/athena/lib       \
+-    /usr/lpp/Xamples/lib  \
+-    /lib/usr/lib/X11      \
+-                          \
+-    /usr/openwin/lib      \
+-    /usr/openwin/share/lib \
+-    ; \
+-do
+-  if test -f $dir/libX11.a || \
+-     test -f $dir/libX11.so || \
+-     test -f $dir/libX11.dll.a || \
+-     test -f $dir/libX11.sa; then
+-    if test $dir = /usr/lib; then
+-      x11_link="-lX11"
+-    else
+-      x11_link="-L$dir -lX11"
+-      x11_libs="-L$dir"
+-    fi
+-    break
+-  fi
+-done
+-
++if [ -n "$x11_lib_dir" ]; then
++    x11_link="-L$x11_lib_dir -lX11"
++    x11_libs="-L$x11_lib_dir"
++fi
+ 
+ if test "$x11_include" = "not found" || test "$x11_link" = "not found"
+ then
diff -ruN ocaml.orig/pkg-plist ocaml/pkg-plist
--- ocaml.orig/pkg-plist	Fri Dec 12 00:55:06 2003
+++ ocaml/pkg-plist	Thu Dec 11 12:44:43 2003
@@ -662,7 +662,7 @@
 lib/ocaml/libasmrunp.a
 lib/ocaml/libbigarray.a
 lib/ocaml/libcamlrun.a
-lib/ocaml/libgraphics.a
+%%X11%%lib/ocaml/libgraphics.a
 lib/ocaml/libmldbm.a
 lib/ocaml/libnums.a
 lib/ocaml/libstr.a
>Release-Note:
>Audit-Trail:
>Unformatted: