From 66b1a366a550344fa7f98eaaade1a838bbb34891 Mon Sep 17 00:00:00 2001
From: lioux <lioux@FreeBSD.org>
Date: Sun, 17 Apr 2005 19:41:42 +0000
Subject: o Update to 0.104 o Auto detect gtk 1.2, only building playdv
 accordingly [1]

PR:		79734 [1]
Submitted by:	ahze [1]
---
 multimedia/libdv/Makefile              | 21 ++++++++++++++++-----
 multimedia/libdv/distinfo              |  4 ++--
 multimedia/libdv/files/patch-configure | 10 ----------
 multimedia/libdv/pkg-plist             |  1 +
 4 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 multimedia/libdv/files/patch-configure

(limited to 'multimedia')

diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 5f6b2791a76c..2ea04115df0f 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdv
-PORTVERSION=	0.103
+PORTVERSION=	0.104
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,16 +18,19 @@ COMMENT=	Quasar DV codec (libdv): software codec for DV video encoding format
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		popt.0:${PORTSDIR}/devel/popt
 
-USE_GNOME=	gnometarget \
-		gtk12
+USE_GNOME=	gnometarget
+WANT_GNOME=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+CONFIGURE_ARGS=	--with-gtk-prefix="${X11BASE}" \
+		--x-includes="${X11BASE}/include" \
+		--x-libraries="${X11BASE}/lib"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/libdata/pkgconfig
 INSTALLS_SHLIB=	yes
 
-MAN1=	dubdv.1 dvconnect.1 encodedv.1 playdv.1
+MAN1=	dubdv.1 dvconnect.1 encodedv.1
 
 PORTDOCS=      AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
 		README.dvconnect README.encoder TODO
@@ -38,6 +41,14 @@ PORTDOCS=      AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
 IGNORE=		"Requires Xv Extension"
 .endif
 
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+MAN1+=		playdv.1
+PLIST_FILES+=	bin/playdv
+.else
+CONFIGURE_ARGS+=--disable-gtk
+.endif
+
 # XXX - work around compiler bug
 # Optimizations -O{1,s,2,3} work
 # However, lack of -O{1,s,2,3} or -O0 BREAK the build
diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo
index ed76a3228b2a..c2d1c7f29811 100644
--- a/multimedia/libdv/distinfo
+++ b/multimedia/libdv/distinfo
@@ -1,2 +1,2 @@
-MD5 (libdv-0.103.tar.gz) = b5c7d0db672a76528e100828dd866a79
-SIZE (libdv-0.103.tar.gz) = 529106
+MD5 (libdv-0.104.tar.gz) = f6b08efce7472daa20685e6e8431f542
+SIZE (libdv-0.104.tar.gz) = 554691
diff --git a/multimedia/libdv/files/patch-configure b/multimedia/libdv/files/patch-configure
deleted file mode 100644
index 5409211ada9e..000000000000
--- a/multimedia/libdv/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Apr  8 05:44:39 2002
-+++ configure	Sat Aug 10 01:08:07 2002
-@@ -7384,6 +7384,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/multimedia/libdv/pkg-plist b/multimedia/libdv/pkg-plist
index 50a166ffbb05..f82b83d9cdb7 100644
--- a/multimedia/libdv/pkg-plist
+++ b/multimedia/libdv/pkg-plist
@@ -5,6 +5,7 @@ bin/playdv
 include/libdv/dv.h
 include/libdv/dv_types.h
 lib/libdv.a
+lib/libdv.la
 lib/libdv.so
 lib/libdv.so.4
 libdata/pkgconfig/libdv.pc
-- 
cgit