Split up Makefile into a Makefile.common so it can be reused

for a xvidcap-gtk2 package. Remove the XVIDCAP_GTK2_GUI usage.

Add note to DESCRiption to clarify the version of this xvidcap.

4 files changed, 27 insertions, 36 deletions

diff --git a/x11/xvidcap/DESCR b/x11/xvidcap/DESCR
index 5f1e3dd46e5..55458c6c3c7 100644
--- a/x11/xvidcap/DESCR
+++ b/x11/xvidcap/DESCR
@@ -1,3 +1,5 @@
 xvidcap is a tool (like Lotus ScreenCam and Camtasia) that captures
 movement on a selected area of an X11 screen to files. Frame output
 formats include: XWD, PPM, PNG, MNG, JPEG and MPEG.
+
+This is the Xt Intrinsics version.
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index f5e9cb55fad..6a369731d49 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,40 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/01/10 21:12:28 reed Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/12 19:45:50 reed Exp $
 #
 
-DISTNAME=		xvidcap-1.1.3
-PKGREVISION=		2
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xvidcap/}
+.include "Makefile.common"
 
-MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://xvidcap.sourceforge.net/
+PKGREVISION=		3
 COMMENT=		Capture X display to individual frames or MPEG video
 
-USE_BUILDLINK3=		yes
-USE_X11=		yes
-GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-gtk2
 
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		XVIDCAP_GTK2_GUI
-
-.if defined(XVIDCAP_GTK2_GUI) && !empty(XVIDCAP_GTK2_GUI:M[Yy][Ee][Ss])
-PLIST_SUBST+=		GTK2_GUI=
-CONFIGURE_ARGS+=	--with-gtk2
-.  include "../../x11/gtk2/buildlink3.mk"
-
-post-install:
-	${RM} -f ${PREFIX}/${PKGMANDIR}/man1/gvidcap.1 ; \
-	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/xvidcap.1 \
-		${PREFIX}/${PKGMANDIR}/man1/gvidcap.1
-
-.else
-PLIST_SUBST+=		GTK2_GUI='@comment '
-.endif
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common
new file mode 100644
index 00000000000..0c3443d8cd7
--- /dev/null
+++ b/x11/xvidcap/Makefile.common
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.common,v 1.1 2005/01/12 19:45:50 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/}
+
+MAINTAINER=		reed@reedmedia.net
+HOMEPAGE=		http://xvidcap.sourceforge.net/
+
+USE_BUILDLINK3=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/xvidcap/PLIST b/x11/xvidcap/PLIST
index 18dbd4db014..ae97f884bb9 100644
--- a/x11/xvidcap/PLIST
+++ b/x11/xvidcap/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/10 21:12:28 reed Exp $
-${GTK2_GUI}bin/gvidcap
+@comment $NetBSD: PLIST,v 1.3 2005/01/12 19:45:50 reed Exp $
 bin/xvidcap
-${GTK2_GUI}man/man1/gvidcap.1
 man/man1/xvidcap.1
 share/doc/xvidcap_${PKGVERSION}/AUTHORS
 share/doc/xvidcap_${PKGVERSION}/ChangeLog