From olivleh1@kartoffel.salatschuessel.net  Fri Jan 17 15:59:08 2003
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 42BF337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Jan 2003 15:59:08 -0800 (PST)
Received: from kartoffel.salatschuessel.net (p5084B25E.dip.t-dialin.net [80.132.178.94])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6600843ED8
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Jan 2003 15:58:58 -0800 (PST)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.12.6/8.12.6) with ESMTP id h0HNwTAW087384;
	Sat, 18 Jan 2003 00:58:29 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from root@localhost)
	by kartoffel.salatschuessel.net (8.12.6/8.12.6/Submit) id h0HNwTMk087383;
	Sat, 18 Jan 2003 00:58:29 +0100 (CET)
Message-Id: <200301172358.h0HNwTMk087383@kartoffel.salatschuessel.net>
Date: Sat, 18 Jan 2003 00:58:29 +0100 (CET)
From: Oliver Lehmann <lehmann@ans-netz.de>
Reply-To: Oliver Lehmann <lehmann@ans-netz.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <lehmann@ans-netz.de>
Subject: update-port: graphics/xawtv
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         47179
>Category:       ports
>Synopsis:       update-port: graphics/xawtv
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 17 16:00:13 PST 2003
>Closed-Date:    Mon Jan 20 07:31:20 PST 2003
>Last-Modified:  Mon Jan 20 07:31:20 PST 2003
>Originator:     Oliver Lehmann
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #2: Mon Jan 13 08:18:55 CET 2003 olivleh1@kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/KARTOFFEL i386


>Description:
	xawtv 3.82 -> 3.83
>How-To-Repeat:
>Fix:


--- xawtv.patch begins here ---
diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile
--- xawtv.old/Makefile	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/Makefile	Sat Jan 18 00:21:01 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xawtv
-PORTVERSION=	3.82
+PORTVERSION=	3.83
 CATEGORIES=	graphics
 MASTER_SITES=	http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo
--- xawtv.old/distinfo	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/distinfo	Sat Jan 18 00:22:05 2003
@@ -1 +1 @@
-MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a
+MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b
diff -ruN xawtv.old/files/patch-Makefile.in /usr/ports/graphics/xawtv/files/patch-Makefile.in
--- xawtv.old/files/patch-Makefile.in	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/files/patch-Makefile.in	Sat Jan 18 00:43:28 2003
@@ -1,24 +1,27 @@
---- Makefile.in.orig	Thu Nov 14 17:07:24 2002
-+++ Makefile.in	Tue Nov 19 23:59:02 2002
-@@ -65,20 +65,9 @@
+--- Makefile.in.orig	Tue Jan  7 16:17:13 2003
++++ Makefile.in	Sat Jan 18 00:43:02 2003
+@@ -65,23 +65,11 @@
  USE_MMX		:= @USE_MMX@
  
  # build final cflags
--CFLAGS	:= @CFLAGS@
--CFLAGS	+= $(WARN_FLAGS)
--CFLAGS	+= $(LFS_FLAGS)
--CFLAGS	+= $(X11_FLAGS)
--CFLAGS	+= $(LIB_FLAGS)
--CFLAGS	+= -DCONFIGFILE='"$(config)"'
--CFLAGS	+= -DLIBDIR='"$(libdir)"'
--CFLAGS	+= -DDATADIR='"$(datadir)"'
--CFLAGS	+= -DVERSION='"$(VERSION)"'
-+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC
- CXXFLAGS = $(CFLAGS)
+-CFLAGS   := @CFLAGS@
+-CFLAGS   += $(WARN_FLAGS)
+-CFLAGS   += $(LFS_FLAGS)
+-CFLAGS   += $(X11_FLAGS)
+-CFLAGS   += $(LIB_FLAGS)
+-CFLAGS   += -DCONFIGFILE='"$(config)"'
+-CFLAGS   += -DLIBDIR='"$(libdir)"'
+-CFLAGS   += -DDATADIR='"$(datadir)"'
+-CFLAGS   += -DVERSION='"$(VERSION)"'
++CFLAGS   += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC
+ CXXFLAGS := $(CFLAGS)
  
--# shared objects need -fPIC
--%.so : CFLAGS += -fPIC
+ # for gcc3
+ #CFLAGS   += -std-gnu99
 -
+-# shared objects need -fPIC
+-%.so : CFLAGS   += -fPIC
+-%.so : CXXFLAGS += -fPIC
+ 
  # libraries
  LDLIBS  := @LDLIBS@
- 
diff -ruN xawtv.old/files/patch-common::Subdir.mk /usr/ports/graphics/xawtv/files/patch-common::Subdir.mk
--- xawtv.old/files/patch-common::Subdir.mk	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/files/patch-common::Subdir.mk	Sat Jan 18 00:45:18 2003
@@ -1,15 +1,15 @@
---- common/Subdir.mk.orig	Wed Oct 30 21:06:25 2002
-+++ common/Subdir.mk	Wed Oct 30 21:06:41 2002
+--- common/Subdir.mk.orig	Tue Jan  7 16:16:34 2003
++++ common/Subdir.mk	Sat Jan 18 00:44:45 2003
 @@ -16,10 +16,10 @@
  	common/midictrl.o
  
  # RegEdit.c is good old K&R ...
--common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
+-common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
 -common/channel-no-x11.o: CFLAGS += -DNO_X11=1 
-+#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
++#common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
 +#common/channel-no-x11.o: CFLAGS += -DNO_X11=1 
  
- common/channel-no-x11.o:: common/channel.c
+ common/channel-no-x11.o: common/channel.c
  	@$(echo_compile_c)
 -	@$(compile_c)
 +	@$(compile_c) -DNO_X11=1
diff -ruN xawtv.old/files/patch-x11::Subdir.mk /usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk
--- xawtv.old/files/patch-x11::Subdir.mk	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk	Sat Jan 18 00:46:46 2003
@@ -1,5 +1,5 @@
---- x11/Subdir.mk.orig	Wed Oct 30 21:15:02 2002
-+++ x11/Subdir.mk	Wed Oct 30 21:15:26 2002
+--- x11/Subdir.mk.orig	Tue Jan  7 16:17:05 2003
++++ x11/Subdir.mk	Sat Jan 18 00:46:26 2003
 @@ -110,8 +110,8 @@
  x11/pia          : LDFLAGS := $(DLFLAGS)
  
@@ -13,13 +13,13 @@
  # i18n
 @@ -122,12 +122,12 @@
  # local targets
- x11/complete-xaw.o:: x11/complete.c
+ x11/complete-xaw.o: x11/complete.c
  	@$(echo_compile_c)
 -	@$(compile_c)
 +	@$(compile_c) -DATHENA=1
  	@$(fixup_deps)
  
- x11/complete-motif.o:: x11/complete.c
+ x11/complete-motif.o: x11/complete.c
  	@$(echo_compile_c)
 -	@$(compile_c)
 +	@$(compile_c) -DMOTIF=1
diff -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist
--- xawtv.old/pkg-plist	Sat Jan 18 00:20:55 2003
+++ /usr/ports/graphics/xawtv/pkg-plist	Sat Jan 18 00:54:46 2003
@@ -15,6 +15,7 @@
 bin/xawtv
 bin/xawtv-remote
 lib/xawtv/bilinear.so
+lib/xawtv/conv-audio.so
 lib/xawtv/conv-mjpeg.so
 lib/xawtv/cubic.so
 lib/xawtv/drv0-bsd.so
--- xawtv.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: arved 
State-Changed-When: Sat Jan 18 09:41:17 PST 2003 
State-Changed-Why:  
Build fails: 
cc -g -march=k6 -g -march=k6 -I/usr/local/include -L/usr/local/lib -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/X11R6/include -I/usr/X11R6/include/X11/fonts -I. -I./vbistuff -I./x11 -I./jwz -I./common -I./console -I./x11 -I./structs -I./libng -Llibng -DCONFIGFILE="/usr/X11R6/lib/X11/xawtvrc" -DLIBDIR="/usr/X11R6/lib/xawtv" -DDATADIR="/usr/X11R6/share/xawtv" -DVERSION="3.83" -fPIC -Wp,-MD,mk/x11_xt.tmp -c -o x11/xt.o x11/xt.c 
x11/xt.c: In function `EventAction': 
x11/xt.c:1938: too many arguments to function `event_dispatch' 
gmake: *** [x11/xt.o] Error 1 
rm libng/plugins/conv-audio.o 
*** Error code 2 

Stop in /usr/home/tilman/ports/xawtv. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=47179 
State-Changed-From-To: feedback->closed 
State-Changed-By: arved 
State-Changed-When: Mon Jan 20 07:31:03 PST 2003 
State-Changed-Why:  
Committed, thanks 

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