diff options
| author | skrll <skrll> | 2001-03-24 18:33:55 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2001-03-24 18:33:55 +0000 |
| commit | 840877c10102b1579589d565750427750351f0b9 (patch) | |
| tree | 78a1ee49fb053e6de30465f369a4b16fd5d60223 /net | |
| parent | 4f2e50c7bfd952c5e19a3a0506d3fdb65cc86a5d (diff) | |
| download | pkgsrc-840877c10102b1579589d565750427750351f0b9.tar.gz | |
Use PTL2 as the pthreads library so that knode actually does something.
Diffstat (limited to 'net')
| -rw-r--r-- | net/kdenetwork2/Makefile | 4 | ||||
| -rw-r--r-- | net/kdenetwork2/files/patch-sum | 4 | ||||
| -rw-r--r-- | net/kdenetwork2/patches/patch-ab | 43 | ||||
| -rw-r--r-- | net/kdenetwork2/patches/patch-ac | 15 |
4 files changed, 63 insertions, 3 deletions
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 175cdb4baca..90623d400ef 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 16:07:17 skrll Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/24 18:33:55 skrll Exp $ # DISTNAME= kdenetwork-2.1 @@ -8,7 +8,7 @@ COMMENT= Network modules for the KDE integrated X11 desktop DEPENDS= gdbm>=1.7.3:../../databases/gdbm DEPENDS+= uulib-0.5.13:../../converters/uulib -DEPENDS+= pth>=1.3.7:../../devel/pth +DEPENDS+= ptl>=2.1.7:../../devel/ptl2 DEPENDS+= kdesupport-2.1:../../converters/kdesupport2 DEPENDS+= kdebase-2.1:../../x11/kdebase2 diff --git a/net/kdenetwork2/files/patch-sum b/net/kdenetwork2/files/patch-sum index b67445b6ea7..3ea8a61d051 100644 --- a/net/kdenetwork2/files/patch-sum +++ b/net/kdenetwork2/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1.1.1 2001/03/14 16:07:17 skrll Exp $ +$NetBSD: patch-sum,v 1.2 2001/03/24 18:33:56 skrll Exp $ SHA1 (patch-aa) = 9b45c31d4bfcc2282cdc20f9e2654e3d4c973abb +SHA1 (patch-ab) = b80dc81cceb67460333a6cff4d86e88c13ccd321 +SHA1 (patch-ac) = 1624833e0c5fffa271001ed4f38c67d1e1b51967 diff --git a/net/kdenetwork2/patches/patch-ab b/net/kdenetwork2/patches/patch-ab new file mode 100644 index 00000000000..833cc59e821 --- /dev/null +++ b/net/kdenetwork2/patches/patch-ab @@ -0,0 +1,43 @@ +$NetBSD: patch-ab,v 1.1 2001/03/24 18:33:56 skrll Exp $ + +--- configure.orig Wed Feb 21 11:02:49 2001 ++++ configure +@@ -8026,14 +8026,14 @@ + + + +-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:8031: checking for pthread_create in -lpthread" >&5 ++echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6 ++echo "configure:8031: checking for pthread_create in -lPTL" >&5 + ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" ++LIBS="-lPTL $LIBS" + cat > conftest.$ac_ext <<EOF + #line 8039 "configure" + #include "confdefs.h" +@@ -8064,7 +8064,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- LIBPTHREAD="-lpthread" ++ LIBPTHREAD="-lPTL" + else + echo "$ac_t""no" 1>&6 + fi +@@ -8253,6 +8253,11 @@ + freebsd*) + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" + echo "Setting FreeBSD pthread compilation options" ++ ;; ++ netbsd*) ++ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ++ USE_THREADS="-I${LOCALBASE}/PTL/include" ++ echo "Setting NetBSD pthread compilation options" + ;; + aix*) + CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" diff --git a/net/kdenetwork2/patches/patch-ac b/net/kdenetwork2/patches/patch-ac new file mode 100644 index 00000000000..f289353e9cd --- /dev/null +++ b/net/kdenetwork2/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2001/03/24 18:33:56 skrll Exp $ + +--- knode/Makefile.in.orig Wed Feb 21 11:01:34 2001 ++++ knode/Makefile.in +@@ -203,8 +203,8 @@ + x_includes = @x_includes@ + x_libraries = @x_libraries@ + +-KDE_CXXFLAGS = $(USE_THREADS) +-INCLUDES = $(all_includes) ++KDE_CXXFLAGS = ++INCLUDES = $(USE_THREADS) $(all_includes) + SUBDIRS = pics filters + + bin_PROGRAMS = knode |