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

- remove -lpthread related patches/chunks.

Browse Source
This commit is contained in:
jasper 2012-09-21 13:17:45 +00:00
parent 7331be73e4
commit 73450cbf84
10 changed files with 20 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
textproc/aspell/core/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.27 2012/01/17 10:59:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2012/09/21 13:17:45 jasper Exp $
COMMENT= spell checker designed to eventually replace Ispell
DISTNAME= aspell-0.60.6.1
REVISION= 0
SHARED_LIBS += aspell 17.0 # .16.4
SHARED_LIBS += pspell 17.0 # .16.4
DIST_SUBDIR= aspell

103
textproc/aspell/core/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.5 2012/01/17 10:59:27 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.6 2012/09/21 13:17:45 jasper Exp $
--- configure.orig Mon Jul 4 10:58:50 2011
+++ configure Tue Jan 17 10:55:18 2012
@@ -2645,7 +2645,7 @@ fi
@ -10,107 +10,6 @@ $OpenBSD: patch-configure,v 1.5 2012/01/17 10:59:27 ajacoutot Exp $
fi
@@ -17958,100 +17958,7 @@ _ACEOF
fi
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# #
-# Posix lock function tests #
-# #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-
-{ echo "$as_me:$LINENO: checking if posix mutexes are supported" >&5
-echo $ECHO_N "checking if posix mutexes are supported... $ECHO_C" >&6; }
-
-ORIG_LIBS="$LIBS"
-
-for l in '' '-lpthread'
-do
- if test -z "$use_posix_mutex"
- then
- LIBS="$l $ORIG_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-pthread_mutex_t lck;
- pthread_mutex_init(&lck, 0);
- pthread_mutex_lock(&lck);
- pthread_mutex_unlock(&lck);
- pthread_mutex_destroy(&lck);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- PTHREAD_LIB=$l
- use_posix_mutex=1
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-done
-
-LIBS="$ORIG_LIBS"
-
-if test "$use_posix_mutex"
-then
- if test -z "$PTHREAD_LIB"
- then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: yes (in $PTHREAD_LIB)" >&5
-echo "${ECHO_T}yes (in $PTHREAD_LIB)" >&6; }
- fi
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_MUTEX 1
-_ACEOF
-
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: WARNING: Unable to find locking mechanism, Aspell will not be thread safe." >&5
-echo "$as_me: WARNING: Unable to find locking mechanism, Aspell will not be thread safe." >&2;}
-fi
-
-
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# Terminal function tests #
@@ -20216,10 +20123,10 @@ XGETTEXT!$XGETTEXT$ac_delim
XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim

4
textproc/hyperestraier/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2011/03/28 15:09:26 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2012/09/21 13:17:45 jasper Exp $
COMMENT= high performance full-text search system
DISTNAME= hyperestraier-1.4.13
REVISION= 4
REVISION= 5
CATEGORIES= textproc
SHARED_LIBS= estraier 8.38

19
textproc/hyperestraier/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.3 2009/01/27 17:17:09 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.4 2012/09/21 13:17:45 jasper Exp $
--- configure.orig Tue Dec 25 02:47:49 2007
+++ configure Tue Jan 27 10:03:06 2009
@@ -2395,7 +2395,7 @@ then
@ -10,23 +10,6 @@ $OpenBSD: patch-configure,v 1.3 2009/01/27 17:17:09 ajacoutot Exp $
fi
if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
then
@@ -2960,13 +2960,13 @@ fi
# For libraries of pthreads
-echo "$as_me:$LINENO: checking for main in -lpthread" >&5
-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for main in -pthread" >&5
+echo $ECHO_N "checking for main in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -3019,7 +3019,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6

4
textproc/icu4c/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2012/07/05 10:05:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.25 2012/09/21 13:17:45 jasper Exp $
COMMENT= International Components for Unicode
VERSION= 49.1.2
DISTNAME= icu4c-${VERSION:S/./_/g}-src
PKGNAME= icu4c-${VERSION}
REVISION = 1
REVISION = 2
SO_VERSION= 5.0
.for _lib in icudata icui18n icuio icule iculx icutest icutu icuuc
SHARED_LIBS+= ${_lib} ${SO_VERSION}

55
textproc/icu4c/patches/patch-source_configure
View File

@ -1,55 +0,0 @@
$OpenBSD: patch-source_configure,v 1.9 2012/06/22 07:07:14 ajacoutot Exp $
--- source/configure.orig Fri Jun 1 16:56:18 2012
+++ source/configure Thu Jun 21 08:31:02 2012
@@ -5844,13 +5844,13 @@ if test $threads = true; then
# If this fails, then we must test for HPUX specials, before
# moving on to a more generic test
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5
-$as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -pthread" >&5
+$as_echo_n "checking for pthread_attr_init in -pthread... " >&6; }
if ${ac_cv_lib_pthread_pthread_attr_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5885,7 +5885,7 @@ if test "x$ac_cv_lib_pthread_pthread_attr_init" = xyes
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi
@@ -5973,13 +5973,13 @@ fi
ICU_USE_THREADS=1
else
# For HP 11
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5
-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -pthread" >&5
+$as_echo_n "checking for pthread_mutex_init in -pthread... " >&6; }
if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6014,7 +6014,7 @@ if test "x$ac_cv_lib_pthread_pthread_mutex_init" = xye
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi

3
textproc/libical/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2012/03/23 11:58:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2012/09/21 13:17:46 jasper Exp $
COMMENT= implementation of basic iCAL protocols
DISTNAME= libical-0.48
REVISION= 0
SHARED_LIBS += ical 2.0 # 48.0
SHARED_LIBS += icalss 2.0 # 48.0

39
textproc/libical/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.4 2012/03/23 11:58:23 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.5 2012/09/21 13:17:46 jasper Exp $
Don't use built-in timezone, but the system one.
@ -15,40 +15,3 @@ Don't use built-in timezone, but the system one.
*)
use_builtin_timezone=yes
os_win32=no
@@ -16235,8 +16239,8 @@ _ACEOF
case "${host}" in
*-*-freebsdelf4* )
- { $as_echo "$as_me:$LINENO: result: checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&5
-$as_echo "checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&6; }
+ { $as_echo "$as_me:$LINENO: result: checking for pthread_create in -pthread... -pthread (FreeBSD 4.x style)" >&5
+$as_echo "checking for pthread_create in -pthread... -pthread (FreeBSD 4.x style)" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD /**/
@@ -16245,13 +16249,13 @@ _ACEOF
PTHREAD_LIBS=-pthread;;
*)
- { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -16320,7 +16324,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD /**/
_ACEOF
- PTHREAD_LIBS=-lpthread
+ PTHREAD_LIBS=-pthread
fi;;
esac

9
textproc/ruby-hyperestraier/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2011/09/16 11:41:41 espie Exp $
# $OpenBSD: Makefile,v 1.29 2012/09/21 13:17:46 jasper Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= Ruby interface to hyperestraier
DISTNAME= hyperestraier-1.4.13
PKGNAME= ruby-hyperestraier-1.0.0
REVISION = 21
REVISION = 22
CATEGORIES= textproc
HOMEPAGE= http://hyperestraier.sourceforge.net/
@ -44,6 +44,11 @@ CONFIGURE_ENV = RUBY=${RUBY} RDOC=`echo ${RUBY} | sed s/ruby/rdoc/`
WRKSRC= ${WRKDIST}/rubynative
SUBST_VARS += RUBY
pre-configure:
${SUBST_CMD} ${WRKSRC}/estcmd.rb
post-install:
.if ${FLAVOR:L:Mruby19}
mv ${PREFIX}/bin/estcmd{,19}.rb

4
textproc/ruby-hyperestraier/patches/patch-rubynative_estcmd_rb
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-rubynative_estcmd_rb,v 1.2 2007/04/30 17:30:40 bernd Exp $
$OpenBSD: patch-rubynative_estcmd_rb,v 1.3 2012/09/21 13:17:46 jasper Exp $
--- rubynative/estcmd.rb.orig Tue Feb 20 00:13:15 2007
+++ rubynative/estcmd.rb Thu Apr 12 14:42:29 2007
@@ -1,4 +1,4 @@
-#! /usr/bin/ruby -w
+#! /usr/bin/env ruby
+#! ${RUBY}
#--
# Ruby binding of Hyper Estraier
# Copyright (C) 2004-2007 Mikio Hirabayashi