Don't hard-code -lpthread. fdatasync might not exist, e.g. on

DragonFly or FreeBSD, so use fsync if it wasn't found.

4 files changed, 30 insertions, 10 deletions

diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 6a369731d49..017a6916557 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/12 19:45:50 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/28 16:37:04 joerg Exp $
 #
 
 .include "Makefile.common"
@@ -8,4 +8,5 @@ COMMENT=		Capture X display to individual frames or MPEG video
 
 CONFIGURE_ARGS+=	--without-gtk2
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo
index 6677d2036e3..ef1bb5bc081 100644
--- a/x11/xvidcap/distinfo
+++ b/x11/xvidcap/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:25 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/12/28 16:37:04 joerg Exp $
 
 SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
 RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
 Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes
 SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
-SHA1 (patch-ab) = 3e3835f57e204aa24a30b5940afc221d70cfc9f5
+SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
 SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
 SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = fc4fa298ed796225ce80ac780cebf46e46f3d21b
+SHA1 (patch-ae) = 73358643d97b9b8771f7a26189a386c32007ec70
diff --git a/x11/xvidcap/patches/patch-ab b/x11/xvidcap/patches/patch-ab
index 5d2fb14df69..f2c4355d282 100644
--- a/x11/xvidcap/patches/patch-ab
+++ b/x11/xvidcap/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/29 00:16:41 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/28 16:37:04 joerg Exp $
 
---- src/capture.c.orig	2004-05-29 01:52:02.000000000 +0200
-+++ src/capture.c	2004-05-29 01:56:27.000000000 +0200
-@@ -643,7 +643,7 @@
+--- src/capture.c.orig	2004-02-14 20:14:20.000000000 +0000
++++ src/capture.c
+@@ -68,6 +68,9 @@
+ #include "control.h"
+ #include "main.h"
+ 
++#ifndef HAVE_FDATASYNC
++#define fdatasync fsync
++#endif
+ 
+ uint16_t mousePointerBlack[] = { 0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832,
+ 33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0 };
+@@ -643,7 +646,7 @@ TCbCaptureSHM(XtPointer xtp, XtIntervalI
              (*job->close) (fp);
          else if (job->flags & FLG_SYNC) {
              if (job->open == (void *(*)(char *, char*))fopen)
diff --git a/x11/xvidcap/patches/patch-ae b/x11/xvidcap/patches/patch-ae
index b72219fb21a..5b159440bc4 100644
--- a/x11/xvidcap/patches/patch-ae
+++ b/x11/xvidcap/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2005/01/10 21:12:28 reed Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/28 16:37:04 joerg Exp $
 
---- src/Makefile.in.orig	2004-02-14 12:06:20.000000000 -0800
+--- src/Makefile.in.orig	2004-02-14 20:06:20.000000000 +0000
 +++ src/Makefile.in
+@@ -177,7 +177,7 @@ target_alias = @target_alias@
+ 
+ AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\"  $(am__append_1)
+ 
+-AM_LDFLAGS = @X_LIBS@ -lpthread $(am__append_2) $(am__append_3)
++AM_LDFLAGS = @X_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $(am__append_2) $(am__append_3)
+ 
+ 
+ # specific xvidcap / gvidcap
 @@ -195,7 +195,7 @@ xvidcap_LDADD = ../Xw/libXw.a  $(am__app
  @WITHGTK2_TRUE@gvidcap_LDFLAGS = $(AM_LDFLAGS) `pkg-config --libs gtk+-2.0`
  @WITHGTK2_TRUE@@WITHGT_TRUE@gvidcap_LDADD = ../gt/libgt.a