From pav@hood.oook.cz  Sun Feb  1 15:34:56 2004
Return-Path: <pav@hood.oook.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5A24D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Feb 2004 15:34:56 -0800 (PST)
Received: from hood.oook.cz (hood.oook.cz [212.27.205.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4146C43D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Feb 2004 15:34:54 -0800 (PST)
	(envelope-from pav@hood.oook.cz)
Received: from hood.oook.cz (localhost.oook.cz [127.0.0.1])
	by hood.oook.cz (8.12.10/8.12.10) with ESMTP id i11NYqf6043460
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 2 Feb 2004 00:34:53 +0100 (CET)
	(envelope-from pav@hood.oook.cz)
Received: (from pav@localhost)
	by hood.oook.cz (8.12.10/8.12.10/Submit) id i11NYqia043459;
	Mon, 2 Feb 2004 00:34:52 +0100 (CET)
	(envelope-from pav)
Message-Id: <200402012334.i11NYqia043459@hood.oook.cz>
Date: Mon, 2 Feb 2004 00:34:52 +0100 (CET)
From: Pav Lucistnik <pav@freebsd.org>
Reply-To: Pav Lucistnik <pav@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update multimedia/goggles to 0.7.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62237
>Category:       ports
>Synopsis:       update multimedia/goggles to 0.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lioux
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 01 15:40:14 PST 2004
>Closed-Date:    Thu Feb 19 05:41:23 PST 2004
>Last-Modified:  Thu Feb 19 05:41:23 PST 2004
>Originator:     Pav Lucistnik
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Jan 30 00:23:59 CET 2004 root@hood.oook.cz:/usr/obj/usr/src/sys/PAV i386


	
>Description:
Update Goggles to latest version, 0.7.2

Also, make default device a bit more clevel on -CURRENT.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/goggles/Makefile,v
retrieving revision 1.9
diff -a -u -r1.9 Makefile
--- Makefile	18 Dec 2003 23:28:30 -0000	1.9
+++ Makefile	1 Feb 2004 23:31:57 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Goggles
-PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTVERSION=	0.7.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.fifthplanet.net/files/
 
@@ -27,11 +26,11 @@
 		--with-fox=${LOCALBASE} \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:S/G/g/}-${PORTVERSION}
 
 pre-everything::
 .ifndef(WITH_DVD_DEVICE)
-	@${ECHO_MSG} '===> The default DVD device is /dev/acd0c'
+	@${ECHO_MSG} '===> The default DVD device is ${DEFAULT_DVD_DEVICE}'
 	@${ECHO_MSG} "===> You can choose any DVD device at Ogle's command line"
 	@${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default'
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
@@ -42,20 +41,17 @@
 .ifdef(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
+.if ${OSVERSION} < 500000
 DEFAULT_DVD_DEVICE=/dev/acd0c
+.else
+DEFAULT_DVD_DEVICE=/dev/acd0
+.endif
 .endif
 
 post-patch:
 # point to specific device
 	@${REINPLACE_CMD} -E -e \
-		's|\"/dev/dvd\"|\"${DEFAULT_DVD_DEVICE}\"|' \
-		${WRKSRC}/src/dvdwindow.cpp
-# hack to enable correct CPPFLAGS
-	@${REINPLACE_CMD} -E -e \
-		's|@CPPFLAGS@|${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}|' \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lFOX|-lFOX-1.1|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.h" -or -name "configure" | ${XARGS} \
-		${REINPLACE_CMD} -e 's|include <fox/|include <fox-1.1/|g'
+		's|\"/dev/acd0c\"|\"${DEFAULT_DVD_DEVICE}\"|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/goggles/distinfo,v
retrieving revision 1.5
diff -a -u -r1.5 distinfo
--- distinfo	10 Nov 2003 01:21:20 -0000	1.5
+++ distinfo	1 Feb 2004 23:31:57 -0000
@@ -1 +1,2 @@
-MD5 (Goggles-0.5.6.tar.gz) = 3bb4b5cd2058ea381422c0a3af968f8f
+MD5 (Goggles-0.7.2.tar.gz) = 38dc3a2080cb2b530a397560dcccdaaf
+SIZE (Goggles-0.7.2.tar.gz) = 417094
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lioux 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sun Feb 1 15:40:36 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62237 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Feb 19 05:41:16 PST 2004 
State-Changed-Why:  
Committed. 

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