diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-11-01 00:39:36 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-11-01 00:39:36 +0000 |
commit | 0ee4b9379837839e53dd473d203450991f092c9a (patch) | |
tree | 38e0fb0b612ea851bd07b506e23959d597677540 /graphics | |
parent | Use fetch and jot over wget and seq. (diff) |
Update to 3.78
PR: ports/44764
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=69232
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/xawtv/Makefile | 2 | ||||
-rw-r--r-- | graphics/xawtv/distinfo | 2 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-Makefile.in | 17 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-common::Subdir.mk | 13 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-configure | 15 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-x11::Subdir.mk | 28 | ||||
-rw-r--r-- | graphics/xawtv/pkg-plist | 1 |
7 files changed, 56 insertions, 22 deletions
diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index 7d8dc9e0b990..7c5538e36198 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.76 +PORTVERSION= 3.78 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/xawtv/distinfo b/graphics/xawtv/distinfo index 9acb5120fd1d..5eb20ca2a768 100644 --- a/graphics/xawtv/distinfo +++ b/graphics/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261 +MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e diff --git a/graphics/xawtv/files/patch-Makefile.in b/graphics/xawtv/files/patch-Makefile.in index 54af686eae78..eb9b2e03aeaa 100644 --- a/graphics/xawtv/files/patch-Makefile.in +++ b/graphics/xawtv/files/patch-Makefile.in @@ -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 --git a/graphics/xawtv/files/patch-common::Subdir.mk b/graphics/xawtv/files/patch-common::Subdir.mk index a781967ff22e..e4b4891b6fb2 100644 --- a/graphics/xawtv/files/patch-common::Subdir.mk +++ b/graphics/xawtv/files/patch-common::Subdir.mk @@ -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 --git a/graphics/xawtv/files/patch-configure b/graphics/xawtv/files/patch-configure index cdbe16aa09be..6d9ef26b8a6f 100644 --- a/graphics/xawtv/files/patch-configure +++ b/graphics/xawtv/files/patch-configure @@ -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 --git a/graphics/xawtv/files/patch-x11::Subdir.mk b/graphics/xawtv/files/patch-x11::Subdir.mk new file mode 100644 index 000000000000..7cbe8decea62 --- /dev/null +++ b/graphics/xawtv/files/patch-x11::Subdir.mk @@ -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 --git a/graphics/xawtv/pkg-plist b/graphics/xawtv/pkg-plist index ac028d55e8e0..3f24b5f19f2a 100644 --- a/graphics/xawtv/pkg-plist +++ b/graphics/xawtv/pkg-plist @@ -5,6 +5,7 @@ bin/pia bin/propwatch bin/record bin/rootv +bin/showqt bin/showriff bin/streamer bin/subtitles |