Get rid of xvidcap-gtk2 patches and distinfo.

Used shared info from x11/xvidcap instead.
(For the gtk2 version only patch addition is include of sys/time/.h)
patch-ae adjusted to work with both packages.

3 files changed, 37 insertions, 10 deletions

diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common
index 223fd6840e1..2f9414e9a88 100644
--- a/x11/xvidcap/Makefile.common
+++ b/x11/xvidcap/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2006/05/17 01:53:18 reed Exp $
+# $NetBSD: Makefile.common,v 1.5 2006/05/17 05:06:28 reed Exp $
 #
 
-# Note: when upgrading version, be sure to update distinfo in xvidcap-gtk2 also
 DISTNAME=		xvidcap-1.1.3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xvidcap/}
@@ -9,6 +8,9 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xvidcap/}
 MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://xvidcap.sourceforge.net/
 
+PATCHDIR=		${.CURDIR}/../../x11/xvidcap/patches
+DISTINFO_FILE=		${.CURDIR}/../../x11/xvidcap/distinfo
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-forced-embedded-ffmpeg
 
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo
index a026e48947b..6dd6877446c 100644
--- a/x11/xvidcap/distinfo
+++ b/x11/xvidcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/17 01:53:18 reed Exp $
+$NetBSD: distinfo,v 1.7 2006/05/17 05:06:28 reed Exp $
 
 SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
 RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
 SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
 SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
 SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = 73358643d97b9b8771f7a26189a386c32007ec70
+SHA1 (patch-ae) = fd0a2640446f6e5ee2f1ca4d883e5d6878e69f1e
 SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4
 SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
diff --git a/x11/xvidcap/patches/patch-ae b/x11/xvidcap/patches/patch-ae
index 5b159440bc4..431809ea9cb 100644
--- a/x11/xvidcap/patches/patch-ae
+++ b/x11/xvidcap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/12/28 16:37:04 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2006/05/17 05:06:28 reed Exp $
 
---- src/Makefile.in.orig	2004-02-14 20:06:20.000000000 +0000
-+++ src/Makefile.in
-@@ -177,7 +177,7 @@ target_alias = @target_alias@
+--- src/Makefile.in.orig	2004-02-14 12:06:20.000000000 -0800
++++ src/Makefile.in	2006-05-16 21:57:37.000000000 -0700
+@@ -177,7 +177,7 @@
  
  AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\"  $(am__append_1)
  
@@ -11,12 +11,37 @@ $NetBSD: patch-ae,v 1.2 2005/12/28 16:37:04 joerg Exp $
  
  
  # specific xvidcap / gvidcap
-@@ -195,7 +195,7 @@ xvidcap_LDADD = ../Xw/libXw.a  $(am__app
+@@ -195,14 +195,15 @@
  @WITHGTK2_TRUE@gvidcap_LDFLAGS = $(AM_LDFLAGS) `pkg-config --libs gtk+-2.0`
  @WITHGTK2_TRUE@@WITHGT_TRUE@gvidcap_LDADD = ../gt/libgt.a
  
 -man1_MANS = ../man/xvidcap.man ../man/gvidcap.man
-+man1_MANS = ../man/xvidcap.man
++@WITHGTK2_TRUE@man1_MANS = ../man/gvidcap.man
++@WITHGTK2_FALSE@man1_MANS = ../man/xvidcap.man
  
  EXTRA_DIST = mkresfile.sh
  subdir = src
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-@WITHGTK2_TRUE@bin_PROGRAMS = xvidcap$(EXEEXT) gvidcap$(EXEEXT)
++@WITHGTK2_TRUE@bin_PROGRAMS =  gvidcap$(EXEEXT)
+ @WITHGTK2_FALSE@bin_PROGRAMS = xvidcap$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+ 
+@@ -1800,10 +1801,12 @@
+ 	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
++@WITHGTK2_TRUE@docdir=${datadir}/doc/${PACKAGE_TARNAME}-gtk2-${PACKAGE_VERSION}
++@WITHGTK2_FALSE@docdir=${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+ install-data-hook:
+-	mkdir -p ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+-	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+-	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
++	mkdir -p ${docdir}
++	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${docdir}
++@WITHGTK2_FALSE@	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+ 
+ uninstall-hook:
+ 	rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}