From b7a66dc1d93b85aa52d75360255e3f6522d766b7 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 22 Sep 2010 12:47:45 +0000
Subject: [PATCH] Enble threads support, needed for an upcoming aqsis upgrade.
 Use correct AUTOCONF_VERSION and regen PLIST.

ok sthen@
---
 x11/fltk/Makefile                   | 13 ++++++------
 x11/fltk/patches/patch-configure_in | 32 ++++++++++++++++++++++++-----
 x11/fltk/pkg/PLIST                  |  4 ++--
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 42dc345ff81..530788ab818 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2010/07/30 11:29:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2010/09/22 12:47:45 ajacoutot Exp $
 
 COMMENT=	Fast-Light Tool Kit
 
 VER=		1.1.7
 DISTNAME=	fltk-${VER}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	x11
 SHARED_LIBS=	fltk		6.0 \
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xau Xdmcp Xext c m stdc++ z jpeg png
+WANTLIB += X11 Xau Xdmcp Xext c m stdc++ z jpeg png pthread
 
 DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 
@@ -41,9 +41,10 @@ LIB_DEPENDS=	::graphics/jpeg \
 NO_REGRESS=	Yes
 USE_X11=	Yes
 CONFIGURE_STYLE=autoconf no-autoheader
-AUTOCONF_VERSION=2.54
-CONFIGURE_ARGS=	${CONFIGURE_SHARED}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+AUTOCONF_VERSION=2.59
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--enable-threads
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
diff --git a/x11/fltk/patches/patch-configure_in b/x11/fltk/patches/patch-configure_in
index 4661f1e23f5..d7d8aa12095 100644
--- a/x11/fltk/patches/patch-configure_in
+++ b/x11/fltk/patches/patch-configure_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.11 2007/04/01 17:48:42 martynas Exp $
---- configure.in.orig	Sun Jan 15 20:36:16 2006
-+++ configure.in	Sun Apr  1 18:28:51 2007
+$OpenBSD: patch-configure_in,v 1.12 2010/09/22 12:47:45 ajacoutot Exp $
+--- configure.in.orig	Sun Jan 15 19:36:16 2006
++++ configure.in	Tue Sep 21 07:55:56 2010
 @@ -34,9 +34,9 @@ dnl Required file in package...
  AC_INIT(src/Fl.cxx)
  
@@ -14,7 +14,29 @@ $OpenBSD: patch-configure_in,v 1.11 2007/04/01 17:48:42 martynas Exp $
  FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
  
  AC_SUBST(FL_MAJOR_VERSION)
-@@ -647,7 +647,7 @@ case $uname in
+@@ -530,13 +530,6 @@ dnl Check for pthreads for multi-threaded apps...
+ have_pthread=no
+ 
+ if test "x$enable_threads" = xyes; then
+-    AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
+-    AC_CHECK_LIB(pthread, pthread_create)
+-
+-    if test "x$ac_cv_lib_pthread_pthread_create" = xyes -a x$ac_cv_header_pthread_h = xyes; then
+-        have_pthread=yes
+-    else
+-        dnl *BSD uses -pthread option...
+         AC_MSG_CHECKING([for pthread_create using -pthread])
+ 	SAVELIBS="$LIBS"
+ 	LIBS="-pthread $LIBS"
+@@ -546,7 +539,6 @@ if test "x$enable_threads" = xyes; then
+             have_pthread=yes,
+ 	    LIBS="$SAVELIBS")
+         AC_MSG_RESULT([$have_pthread])
+-    fi
+ fi
+ 
+ dnl Define OS-specific stuff...
+@@ -647,7 +639,7 @@ case $uname in
  	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
  	fi
  
@@ -23,7 +45,7 @@ $OpenBSD: patch-configure_in,v 1.11 2007/04/01 17:48:42 martynas Exp $
  	CFLAGS="$CFLAGS $X_CFLAGS"
  	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
  	LDFLAGS="$X_LIBS $LDFLAGS"
-@@ -844,7 +844,7 @@ if test -n "$GCC"; then
+@@ -844,7 +836,7 @@ if test -n "$GCC"; then
          if test "x$with_optim" != x; then
  	    OPTIM="$with_optim $OPTIM"
  	else
diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST
index fd82c128930..f2e09b9094d 100644
--- a/x11/fltk/pkg/PLIST
+++ b/x11/fltk/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.10 2006/10/19 09:41:32 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.11 2010/09/22 12:47:45 ajacoutot Exp $
 bin/fltk-config
-bin/fluid
+@bin bin/fluid
 include/FL/
 include/FL/Enumerations.H
 include/FL/Enumerations.h