From ahze@blueheron.ahze.net  Sun Apr 10 02:18:27 2005
Return-Path: <ahze@blueheron.ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5253716A4CE; Sun, 10 Apr 2005 02:18:27 +0000 (GMT)
Received: from imf16aec.mail.bellsouth.net (imf16aec.mail.bellsouth.net [205.152.59.64])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6D4A343D2F; Sun, 10 Apr 2005 02:18:26 +0000 (GMT)
	(envelope-from ahze@blueheron.ahze.net)
Received: from blueheron.ahze.net ([68.209.163.3])
          by imf16aec.mail.bellsouth.net
          (InterMail vM.5.01.06.11 201-253-122-130-111-20040605) with ESMTP
          id <20050410021825.SKVD1995.imf16aec.mail.bellsouth.net@blueheron.ahze.net>;
          Sat, 9 Apr 2005 22:18:25 -0400
Received: (from root@localhost)
	by blueheron.ahze.net (8.13.3/8.13.1/Submit) id j3A2ILw5010821;
	Sat, 9 Apr 2005 22:18:21 -0400 (EDT)
	(envelope-from ahze)
Message-Id: <200504100218.j3A2ILw5010821@blueheron.ahze.net>
Date: Sat, 9 Apr 2005 22:18:21 -0400 (EDT)
From: Michael Johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lioux@freebsd.org
Subject: [PATCH] multimedia/libdv: auto-detect gtk1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         79734
>Category:       ports
>Synopsis:       [PATCH] multimedia/libdv: auto-detect gtk1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lioux
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 10 02:20:18 GMT 2005
>Closed-Date:    Sun Apr 17 19:41:55 GMT 2005
>Last-Modified:  Sun Apr 17 19:41:55 GMT 2005
>Originator:     Michael Johnson
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.4-STABLE FreeBSD 5.4-STABLE #81: Mon Apr  4 21:13:41 EDT
>Description:
- Auto-detect gtk1.2 

>How-To-Repeat:
>Fix:

--- libdv-0.103.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/libdv/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	23 Jul 2004 19:10:16 -0000	1.25
+++ Makefile	10 Apr 2005 02:14:21 -0000
@@ -18,8 +18,8 @@
 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
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -27,7 +27,7 @@
 		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 +38,15 @@
 IGNORE=		"Requires Xv Extension"
 .endif
 
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+MAN1+=		playdv.1
+PLIST_SUB+=	GTK=""
+.else
+CONFIGURE_ARGS+=--disable-gtk
+PLIST_SUB+=	GTK="@comment "
+.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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/libdv/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist	21 Jul 2004 00:33:05 -0000	1.8
+++ pkg-plist	10 Apr 2005 02:14:29 -0000
@@ -1,7 +1,7 @@
 bin/dubdv
 bin/dvconnect
 bin/encodedv
-bin/playdv
+%%GTK%%bin/playdv
 include/libdv/dv.h
 include/libdv/dv_types.h
 lib/libdv.a
--- libdv-0.103.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lioux  
Responsible-Changed-By: ahze 
Responsible-Changed-When: Sun Apr 10 02:21:16 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79734 
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Sun Apr 17 19:41:53 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79734 
>Unformatted:
