Fix errno. Use correct thread library, not the hard-wired -lpthread.

5 files changed, 43 insertions, 2 deletions

diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 74a59ca3d1d..19a2848def8 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/10/13 13:06:27 markd Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/17 14:51:23 joerg Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -15,4 +15,5 @@ USE_DIRS+=		xdg-1.1
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index d764d51c48f..3047a8708b2 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2005/12/11 11:34:39 markd Exp $
+$NetBSD: distinfo,v 1.30 2005/12/17 14:51:23 joerg Exp $
 
 SHA1 (kdeedu-3.5.0.tar.bz2) = 8708afafae3d482ced966a6a2ea7fa6dcfede3b0
 RMD160 (kdeedu-3.5.0.tar.bz2) = c4eb7501a2c9914e9ec303c6ac7fa295c0bd629e
@@ -6,3 +6,6 @@ Size (kdeedu-3.5.0.tar.bz2) = 30006209 bytes
 SHA1 (patch-aa) = cef7d7721efdd4193b6559fabd42115b35491790
 SHA1 (patch-ab) = 6f7122f34d2894489b933d90644022f71192b023
 SHA1 (patch-ac) = 46e3c0ebf7172f937d919087bc06272fb377b4ae
+SHA1 (patch-ad) = 387b16275e1e04d18cb25d1f19e95e47e531e4ef
+SHA1 (patch-ae) = 643cc5c94c96d8cc5d0b601e8210998ff7fb3ab1
+SHA1 (patch-af) = 75798ce6bc4edf3563fbdebc21b9a04127732e4b
diff --git a/misc/kdeedu3/patches/patch-ad b/misc/kdeedu3/patches/patch-ad
new file mode 100644
index 00000000000..219887d15d6
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/12/17 14:51:23 joerg Exp $
+
+--- kstars/kstars/indi/Makefile.in.orig	2005-12-17 13:27:27.000000000 +0000
++++ kstars/kstars/indi/Makefile.in
+@@ -579,7 +579,7 @@ liblilxml_a_SOURCES = lilxml.c
+ libindicom_a_SOURCES = indicom.c fitsrw.c base64.c
+ noinst_LIBRARIES = liblilxml.a libindicom.a
+ indiserver_SOURCES = indiserver.c fq.c
+-indiserver_LDADD = liblilxml.a -lpthread $(LIBSOCKET)
++indiserver_LDADD = liblilxml.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $(LIBSOCKET)
+ lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp
+ lx200generic_LDADD = liblilxml.a libindicom.a -lm
+ lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp
diff --git a/misc/kdeedu3/patches/patch-ae b/misc/kdeedu3/patches/patch-ae
new file mode 100644
index 00000000000..74bc5517185
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2005/12/17 14:51:23 joerg Exp $
+
+--- kstars/kstars/indi/fli_ccd.c.orig	2005-12-17 14:01:02.000000000 +0000
++++ kstars/kstars/indi/fli_ccd.c
+@@ -65,7 +65,6 @@ double max(void);
+ FITS_HDU_LIST * create_fits_header (FITS_FILE *ofp, uint width, uint height, uint bpp);
+ 
+ extern char* me;
+-extern int errno;
+ 
+ #define mydev           "FLI CCD"
+ 
diff --git a/misc/kdeedu3/patches/patch-af b/misc/kdeedu3/patches/patch-af
new file mode 100644
index 00000000000..9ddbe8dd278
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.3 2005/12/17 14:51:23 joerg Exp $
+
+--- kstars/kstars/indi/fli_wheel.c.orig	2005-12-17 14:01:50.000000000 +0000
++++ kstars/kstars/indi/fli_wheel.c
+@@ -59,7 +59,6 @@ double min(void);
+ double max(void);
+ 
+ extern char* me;
+-extern int errno;
+ 
+ #define mydev           "FLI Wheel"
+