Date: Wed, 30 Oct 2002 22:08:22 +0100 (CET) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/44764: update-port: graphics/xawtv Message-ID: <200210302108.g9UL8M8m037611@kartoffel.salatschuessel.net>
next in thread | raw e-mail | index | archive | help
>Number: 44764 >Category: ports >Synopsis: update-port: graphics/xawtv >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 30 13:10:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 21 02:27:44 CEST 2002 olivleh1@kartoffel.salatschuessel.net:/usr/obj/i386/usr/src/sys/KARTOFFEL i386 >Description: xawtv update 3.75 -> 3.78 >How-To-Repeat: >Fix: --- xawtv.patch begins here --- diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile --- xawtv.old/Makefile Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/Makefile Wed Oct 30 20:22:36 2002 @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.76 +PORTVERSION= 3.78 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo --- xawtv.old/distinfo Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/distinfo Wed Oct 30 21:01:36 2002 @@ -1 +1 @@ -MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261 +MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e diff -ruN xawtv.old/files/patch-Makefile.in /usr/ports/graphics/xawtv/files/patch-Makefile.in --- xawtv.old/files/patch-Makefile.in Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/files/patch-Makefile.in Wed Oct 30 21:02:56 2002 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed Jun 19 11:13:15 2002 -+++ Makefile.in Mon Jun 24 02:07:45 2002 -@@ -58,17 +58,7 @@ +--- Makefile.in.orig Mon Sep 9 16:05:39 2002 ++++ Makefile.in Wed Oct 30 20:54:40 2002 +@@ -62,15 +62,7 @@ FOUND_ZVBI := @FOUND_ZVBI@ # build final cflags @@ -12,10 +12,9 @@ -CFLAGS += -DCONFIGFILE='"$(config)"' -CFLAGS += -DLIBDIR='"$(libdir)"' -CFLAGS += -DVERSION='"$(VERSION)"' -- --# shared objects need -fPIC --%.so : CFLAGS += -fPIC -+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC - +-CXXFLAGS = $(CFLAGS) ++CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC ++CXXFLAGS += $(CFLAGS) - ######################################################### + # shared objects need -fPIC +-%.so : CFLAGS += -fPIC 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 Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/files/patch-common::Subdir.mk Wed Oct 30 21:11:56 2002 @@ -1,11 +1,16 @@ ---- common/Subdir.mk.orig Sat Jul 27 10:24:27 2002 -+++ common/Subdir.mk Sat Jul 27 10:22:47 2002 -@@ -16,7 +16,7 @@ +--- common/Subdir.mk.orig Wed Oct 30 21:06:25 2002 ++++ common/Subdir.mk Wed Oct 30 21:06:41 2002 +@@ -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/channel-no-x11.o: CFLAGS += -DNO_X11=1 +#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 - $(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $< + @$(echo_compile_c) +- @$(compile_c) ++ @$(compile_c) -DNO_X11=1 + @$(fixup_deps) diff -ruN xawtv.old/files/patch-configure /usr/ports/graphics/xawtv/files/patch-configure --- xawtv.old/files/patch-configure Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/files/patch-configure Wed Oct 30 20:59:26 2002 @@ -1,21 +1,22 @@ ---- configure.orig Wed Jul 24 19:13:38 2002 -+++ configure Sat Jul 27 10:05:07 2002 -@@ -4460,18 +4460,12 @@ - echo "$as_me:4460: checking for X11 config directory" >&5 +--- configure.orig Wed Oct 30 12:26:42 2002 ++++ configure Wed Oct 30 20:59:10 2002 +@@ -5749,9 +5749,6 @@ + echo "$as_me:$LINENO: checking for X11 config directory" >&5 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6 x11conf=/usr/X11R6/lib/X11 -if test -d /etc/X11; then - x11conf=/etc/X11 -fi - echo "$as_me:4466: result: $x11conf" >&5 + echo "$as_me:$LINENO: result: $x11conf" >&5 echo "${ECHO_T}$x11conf" >&6 - echo "$as_me:4469: checking for X11 app-defaults directory" >&5 +@@ -5759,9 +5756,6 @@ + echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6 resdir=/usr/X11R6/lib/X11 -if test -d /etc/X11/app-defaults; then - resdir=/etc/X11 -fi - echo "$as_me:4475: result: $resdir/app-defaults" >&5 + echo "$as_me:$LINENO: result: $resdir/app-defaults" >&5 echo "${ECHO_T}$resdir/app-defaults" >&6 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 Thu Jan 1 01:00:00 1970 +++ /usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk Wed Oct 30 21:15:40 2002 @@ -0,0 +1,28 @@ +--- x11/Subdir.mk.orig Wed Oct 30 21:15:02 2002 ++++ x11/Subdir.mk Wed Oct 30 21:15:26 2002 +@@ -110,8 +110,8 @@ + x11/pia : LDFLAGS := $(DLFLAGS) + + # compile flags +-x11/complete-xaw.o : CFLAGS += -DATHENA=1 +-x11/complete-motif.o : CFLAGS += -DMOTIF=1 ++#x11/complete-xaw.o : CFLAGS += -DATHENA=1 ++#x11/complete-motif.o : CFLAGS += -DMOTIF=1 + + + # i18n +@@ -122,12 +122,12 @@ + # local targets + 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 + @$(echo_compile_c) +- @$(compile_c) ++ @$(compile_c) -DMOTIF=1 + @$(fixup_deps) + + diff -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist --- xawtv.old/pkg-plist Wed Oct 30 20:22:29 2002 +++ /usr/ports/graphics/xawtv/pkg-plist Wed Oct 30 22:02:40 2002 @@ -5,6 +5,7 @@ bin/propwatch bin/record bin/rootv +bin/showqt bin/showriff bin/streamer bin/subtitles --- xawtv.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210302108.g9UL8M8m037611>