cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enble threads support, needed for an upcoming aqsis upgrade.

Browse Source 
Use correct AUTOCONF_VERSION and regen PLIST.

ok sthen@
This commit is contained in:
ajacoutot 2010-09-22 12:47:45 +00:00
parent 6a71f0eaaf
commit b7a66dc1d9
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/fltk/Makefile
View File

@ -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 COMMENT= Fast-Light Tool Kit
VER= 1.1.7 VER= 1.1.7
DISTNAME= fltk-${VER} DISTNAME= fltk-${VER}
REVISION= 1 REVISION= 2
CATEGORIES= x11 CATEGORIES= x11
SHARED_LIBS= fltk 6.0 \ SHARED_LIBS= fltk 6.0 \
@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= 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} DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX}
@ -41,9 +41,10 @@ LIB_DEPENDS= ::graphics/jpeg \
NO_REGRESS= Yes NO_REGRESS= Yes
USE_X11= Yes USE_X11= Yes
CONFIGURE_STYLE=autoconf no-autoheader CONFIGURE_STYLE=autoconf no-autoheader
AUTOCONF_VERSION=2.54 AUTOCONF_VERSION=2.59
CONFIGURE_ARGS= ${CONFIGURE_SHARED} CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ --enable-threads
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \ LIBS="-L${LOCALBASE}/lib" \

32
x11/fltk/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.11 2007/04/01 17:48:42 martynas Exp $ $OpenBSD: patch-configure_in,v 1.12 2010/09/22 12:47:45 ajacoutot Exp $
--- configure.in.orig Sun Jan 15 20:36:16 2006 --- configure.in.orig Sun Jan 15 19:36:16 2006
+++ configure.in Sun Apr 1 18:28:51 2007 +++ configure.in Tue Sep 21 07:55:56 2010
@@ -34,9 +34,9 @@ dnl Required file in package... @@ -34,9 +34,9 @@ dnl Required file in package...
AC_INIT(src/Fl.cxx) 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} FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
AC_SUBST(FL_MAJOR_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.) AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
fi fi
@ -23,7 +45,7 @@ $OpenBSD: patch-configure_in,v 1.11 2007/04/01 17:48:42 martynas Exp $
CFLAGS="$CFLAGS $X_CFLAGS" CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS" CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS" 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 if test "x$with_optim" != x; then
OPTIM="$with_optim $OPTIM" OPTIM="$with_optim $OPTIM"
else else

4
x11/fltk/pkg/PLIST
View File

@ -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/fltk-config
bin/fluid @bin bin/fluid
include/FL/ include/FL/
include/FL/Enumerations.H include/FL/Enumerations.H
include/FL/Enumerations.h include/FL/Enumerations.h