diff options
author | arved <arved@FreeBSD.org> | 2003-01-20 23:30:52 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2003-01-20 23:30:52 +0800 |
commit | c37cf0a47f9096349a106f0fb6eb3787f56d8604 (patch) | |
tree | a03334df9197d79acebaa3d6ba661ac195d3278a | |
parent | 1b90f2f4ef922c333d3ff8644d26a2768ff566ff (diff) | |
download | freebsd-ports-gnome-c37cf0a47f9096349a106f0fb6eb3787f56d8604.tar.gz freebsd-ports-gnome-c37cf0a47f9096349a106f0fb6eb3787f56d8604.tar.zst freebsd-ports-gnome-c37cf0a47f9096349a106f0fb6eb3787f56d8604.zip |
Update to 3.83
PR: 47179
Submitted by: Oliver Lehmann <lehmann@ans-netz.de>
-rw-r--r-- | graphics/xawtv/Makefile | 2 | ||||
-rw-r--r-- | graphics/xawtv/distinfo | 2 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-Makefile.in | 37 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-common::Subdir.mk | 10 | ||||
-rw-r--r-- | graphics/xawtv/files/patch-x11::Subdir.mk | 8 | ||||
-rw-r--r-- | graphics/xawtv/pkg-plist | 1 | ||||
-rw-r--r-- | multimedia/xawtv/Makefile | 2 | ||||
-rw-r--r-- | multimedia/xawtv/distinfo | 2 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-Makefile.in | 37 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-common::Subdir.mk | 10 | ||||
-rw-r--r-- | multimedia/xawtv/files/patch-x11::Subdir.mk | 8 | ||||
-rw-r--r-- | multimedia/xawtv/pkg-plist | 1 |
12 files changed, 64 insertions, 56 deletions
diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index ae8ee83bd733..8d361d67dd31 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.82 +PORTVERSION= 3.83 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/xawtv/distinfo b/graphics/xawtv/distinfo index a9c55745a896..4bf23900ea2f 100644 --- a/graphics/xawtv/distinfo +++ b/graphics/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a +MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b diff --git a/graphics/xawtv/files/patch-Makefile.in b/graphics/xawtv/files/patch-Makefile.in index 805ffff12195..02d2d6d1c73e 100644 --- a/graphics/xawtv/files/patch-Makefile.in +++ b/graphics/xawtv/files/patch-Makefile.in @@ -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 --git a/graphics/xawtv/files/patch-common::Subdir.mk b/graphics/xawtv/files/patch-common::Subdir.mk index e4b4891b6fb2..6be65b4ade75 100644 --- a/graphics/xawtv/files/patch-common::Subdir.mk +++ b/graphics/xawtv/files/patch-common::Subdir.mk @@ -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 --git a/graphics/xawtv/files/patch-x11::Subdir.mk b/graphics/xawtv/files/patch-x11::Subdir.mk index 7cbe8decea62..edf67d2e389c 100644 --- a/graphics/xawtv/files/patch-x11::Subdir.mk +++ b/graphics/xawtv/files/patch-x11::Subdir.mk @@ -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 --git a/graphics/xawtv/pkg-plist b/graphics/xawtv/pkg-plist index 9027503a413f..5fc2697a72b7 100644 --- a/graphics/xawtv/pkg-plist +++ b/graphics/xawtv/pkg-plist @@ -15,6 +15,7 @@ bin/webcam 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 diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index ae8ee83bd733..8d361d67dd31 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xawtv -PORTVERSION= 3.82 +PORTVERSION= 3.83 CATEGORIES= graphics MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo index a9c55745a896..4bf23900ea2f 100644 --- a/multimedia/xawtv/distinfo +++ b/multimedia/xawtv/distinfo @@ -1 +1 @@ -MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a +MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b diff --git a/multimedia/xawtv/files/patch-Makefile.in b/multimedia/xawtv/files/patch-Makefile.in index 805ffff12195..02d2d6d1c73e 100644 --- a/multimedia/xawtv/files/patch-Makefile.in +++ b/multimedia/xawtv/files/patch-Makefile.in @@ -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 --git a/multimedia/xawtv/files/patch-common::Subdir.mk b/multimedia/xawtv/files/patch-common::Subdir.mk index e4b4891b6fb2..6be65b4ade75 100644 --- a/multimedia/xawtv/files/patch-common::Subdir.mk +++ b/multimedia/xawtv/files/patch-common::Subdir.mk @@ -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 --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk index 7cbe8decea62..edf67d2e389c 100644 --- a/multimedia/xawtv/files/patch-x11::Subdir.mk +++ b/multimedia/xawtv/files/patch-x11::Subdir.mk @@ -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 --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index 9027503a413f..5fc2697a72b7 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -15,6 +15,7 @@ bin/webcam 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 |