Don't hard-wire -lpthread. Fallback to fsync for fdatasync. Depend

on pkg-config as build tool.

4 files changed, 30 insertions, 10 deletions

diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
index faf6d47abca..f62066f3dfe 100644
--- a/x11/xvidcap-gtk2/Makefile
+++ b/x11/xvidcap-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/12 19:52:37 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/28 16:52:25 joerg Exp $
 #
 
 .include "../../x11/xvidcap/Makefile.common"
@@ -9,6 +9,7 @@ COMMENT=		Capture X display to individual frames or MPEG video (GTK2 version)
 CONFLICTS+=		xvidcap<1.1.3nb3
 
 CONFIGURE_ARGS+=	--with-gtk2
+USE_TOOLS+=		pkg-config
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap-gtk2/distinfo b/x11/xvidcap-gtk2/distinfo
index 04e2d2dfd38..aabbfde840c 100644
--- a/x11/xvidcap-gtk2/distinfo
+++ b/x11/xvidcap-gtk2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/12/28 16:52:25 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-ab) = 3e3835f57e204aa24a30b5940afc221d70cfc9f5
+SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
 SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
 SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = f03b83335798a9f06efcfd830cfe02b5ccb1b54e
+SHA1 (patch-ae) = d2b5bf7f73a9e0c3e322911ba2296bbe47e2728f
diff --git a/x11/xvidcap-gtk2/patches/patch-ab b/x11/xvidcap-gtk2/patches/patch-ab
index bd3a8b2de64..842aeefd976 100644
--- a/x11/xvidcap-gtk2/patches/patch-ab
+++ b/x11/xvidcap-gtk2/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/01/12 19:52:38 reed Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/28 16:52:25 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-gtk2/patches/patch-ae b/x11/xvidcap-gtk2/patches/patch-ae
index ac711c252c7..26bc2834f7a 100644
--- a/x11/xvidcap-gtk2/patches/patch-ae
+++ b/x11/xvidcap-gtk2/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/01/12 19:52:37 reed Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/28 16:52:25 joerg Exp $
 
---- src/Makefile.in.orig	Sat Feb 14 12:06:20 2004
+--- 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,14 +195,14 @@ 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