>Number:         25652
>Category:       pkg
>Synopsis:       x11/fltk: multiple corrections
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu May 20 17:25:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6.2
>Organization:
	
>Environment:
System: NetBSD saruman 1.6.2 NetBSD 1.6.2 (saruman) #12: Tue Mar 16 22:18:14 CET 2004 charlie@saruman:/usr/src/sys/arch/i386/compile/saruman i386
Architecture: i386
Machine: i386
>Description:
The internal help browser of fluid cant find its html documentation.
This is true for the FLTK and the Fluid documentation.

Actual the patch-ab to configure.in seems to be obsolet, since autoconf is 
never called.

Flkt supports jpeg/png via the usual libraries libjpeg and libpng. During
configure this libraries are not found. So this feature is broken.

>How-To-Repeat:
Install fltk from pkgsrc and run fluid. Choose the documentation 
from the help menu.
>Fix:
Remove the obsolete file patch-ab from the patches subdir. 
Patch the Makefile in the pkgsrc dir with the supplied patch.
Replace patch-ac following patch. Do the usual stuff and have fun.

------------------ cut here -----------------------------------------------
--- Makefile.orig	Mon May 17 19:02:50 2004
+++ Makefile	Mon May 17 18:57:10 2004
@@ -28,6 +28,8 @@
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL}
 
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
------------------ cut here -----------------------------------------------
--- configure.orig	Tue May 18 17:55:00 2004
+++ configure	Tue May 18 17:55:07 2004
@@ -855,6 +855,8 @@
   --enable-debug          turn on debugging default=no
   --enable-gl             turn on OpenGL support default=yes
   --enable-shared         turn on shared libraries default=no
+  --enable-libtool=LIBTOOL_PATH
+                          turn on building with libtool [default=no]
   --enable-threads        enable multi-threading support
   --enable-xft            turn on Xft support default=no
   --enable-xdbe           turn on Xdbe support default=no
@@ -1370,7 +1372,22 @@
   enableval="$enable_shared"
 
 fi;
-if test x$enable_shared = xyes; then
+
+# Check whether --enable-libtool or --disable-libtool was given.
+if test "${enable_libtool+set}" = set; then
+  enableval="$enable_libtool"
+
+if test x$enable_libtool != xno; then
+    LIBTOOL="$enable_libtool"
+    enable_shared=no
+else
+    LIBTOOL=""
+fi
+fi
+
+
+if test "$enable_shared" = "yes"; then
+
     PICFLAG=1
     SHAREDSUFFIX=""
     FLUID="fluid-shared"
@@ -1471,6 +1488,20 @@
     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
 fi
 
+if test "x$LIBTOOL" != "x"; then
+    LINKFLTK="../src/libfltk.la"
+    if test "x$LINKFLTKGL" != "x"; then
+        LINKFLTKGL="../src/libfltk_gl.la"
+    fi
+    if test "x$LINKFLTKIMG" != "x"; then
+        LINKFLTKIMG="../src/libfltk_images.la"
+    fi
+    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
+    DSONAME="libfltk.la"
+    FLDSONAME="libfltk_forms.la"
+    GLDSONAME="libfltk_gl.la"
+    IMGDSONAME="libfltk_images.la"
+fi
 
 
 
@@ -9607,7 +9638,7 @@
 	    ;;
     esac
 
-    CXX="$CC"
+#    CXX="$CC"
 
     # Show all standard warnings + unused variables when compiling...
     OPTIM="-Wall -Wunused $OPTIM"
@@ -9852,7 +9883,7 @@
 
 else
     cat >>confdefs.h <<_ACEOF
-#define FLTK_DOCDIR "$prefix/share/doc/fltk"
+#define FLTK_DOCDIR "$prefix/share/doc/html/fltk"
 _ACEOF
 
 fi
@@ -10495,6 +10526,7 @@
 s,@GLLIBNAME@,$GLLIBNAME,;t t
 s,@IMGLIBNAME@,$IMGLIBNAME,;t t
 s,@LIBNAME@,$LIBNAME,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LINKFLTK@,$LINKFLTK,;t t
 s,@LINKFLTKGL@,$LINKFLTKGL,;t t
 s,@LINKFLTKIMG@,$LINKFLTKIMG,;t t
------------------ cut here -----------------------------------------------

-- 
  Karl Uwe Lockhoff - charlie@maphya.de
>Release-Note:
>Audit-Trail:
>Unformatted: