Attachment #27933 for bug #47179

View | Details | Raw Unified | Return to bug 47179
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.82	9	PORTVERSION= 3.83
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://bytesex.org/xawtv/	11	MASTER_SITES= http://bytesex.org/xawtv/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}

Line 1 Link Here

(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a	1	MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b




--- 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)
 
 # for gcc3
 #CFLAGS   += -std-gnu99
-
-# shared objects need -fPIC
-%.so : CFLAGS   += -fPIC
-%.so : CXXFLAGS += -fPIC
 
 # libraries
 LDLIBS  := @LDLIBS@
 




--- 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/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
 	@$(echo_compile_c)
-	@$(compile_c)
+	@$(compile_c) -DNO_X11=1




--- 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)
 

 # 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

Lines 15-20 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (+1 lines)
15	bin/xawtv	15	bin/xawtv
16	bin/xawtv-remote	16	bin/xawtv-remote
17	lib/xawtv/bilinear.so	17	lib/xawtv/bilinear.so
		18	lib/xawtv/conv-audio.so
18	lib/xawtv/conv-mjpeg.so	19	lib/xawtv/conv-mjpeg.so
19	lib/xawtv/cubic.so	20	lib/xawtv/cubic.so
20	lib/xawtv/drv0-bsd.so	21	lib/xawtv/drv0-bsd.so

Return to bug 47179

Lines 1-24 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-Makefile.in (-17 / +20 lines)
1	--- Makefile.in.orig Thu Nov 14 17:07:24 2002	1	--- Makefile.in.orig Tue Jan 7 16:17:13 2003
2	+++ Makefile.in Tue Nov 19 23:59:02 2002	2	+++ Makefile.in Sat Jan 18 00:43:02 2003
3	@@ -65,20 +65,9 @@	3	@@ -65,23 +65,11 @@
4	USE_MMX := @USE_MMX@	4	USE_MMX := @USE_MMX@
5		5
6	# build final cflags	6	# build final cflags
7	-CFLAGS := @CFLAGS@	7	-CFLAGS := @CFLAGS@
8	-CFLAGS += $(WARN_FLAGS)	8	-CFLAGS += $(WARN_FLAGS)
9	-CFLAGS += $(LFS_FLAGS)	9	-CFLAGS += $(LFS_FLAGS)
10	-CFLAGS += $(X11_FLAGS)	10	-CFLAGS += $(X11_FLAGS)
11	-CFLAGS += $(LIB_FLAGS)	11	-CFLAGS += $(LIB_FLAGS)
12	-CFLAGS += -DCONFIGFILE='"$(config)"'	12	-CFLAGS += -DCONFIGFILE='"$(config)"'
13	-CFLAGS += -DLIBDIR='"$(libdir)"'	13	-CFLAGS += -DLIBDIR='"$(libdir)"'
14	-CFLAGS += -DDATADIR='"$(datadir)"'	14	-CFLAGS += -DDATADIR='"$(datadir)"'
15	-CFLAGS += -DVERSION='"$(VERSION)"'	15	-CFLAGS += -DVERSION='"$(VERSION)"'
16	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC	16	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC
17	CXXFLAGS = $(CFLAGS)	17	CXXFLAGS := $(CFLAGS)
18		18
19	-# shared objects need -fPIC	19	# for gcc3
20	-%.so : CFLAGS += -fPIC	20	#CFLAGS += -std-gnu99
21	-	21	-
		22	-# shared objects need -fPIC
		23	-%.so : CFLAGS += -fPIC
		24	-%.so : CXXFLAGS += -fPIC
		25
22	# libraries	26	# libraries
23	LDLIBS := @LDLIBS@	27	LDLIBS := @LDLIBS@
24

Lines 1-15 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-common::Subdir.mk (-5 / +5 lines)
1	--- common/Subdir.mk.orig Wed Oct 30 21:06:25 2002	1	--- common/Subdir.mk.orig Tue Jan 7 16:16:34 2003
2	+++ common/Subdir.mk Wed Oct 30 21:06:41 2002	2	+++ common/Subdir.mk Sat Jan 18 00:44:45 2003
3	@@ -16,10 +16,10 @@	3	@@ -16,10 +16,10 @@
4	common/midictrl.o	4	common/midictrl.o
5		5
6	# RegEdit.c is good old K&R ...	6	# RegEdit.c is good old K&R ...
7	-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes	7	-common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
8	-common/channel-no-x11.o: CFLAGS += -DNO_X11=1	8	-common/channel-no-x11.o: CFLAGS += -DNO_X11=1
9	+#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes	9	+#common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
10	+#common/channel-no-x11.o: CFLAGS += -DNO_X11=1	10	+#common/channel-no-x11.o: CFLAGS += -DNO_X11=1
11		11
12	common/channel-no-x11.o:: common/channel.c	12	common/channel-no-x11.o: common/channel.c
13	@$(echo_compile_c)	13	@$(echo_compile_c)
14	- @$(compile_c)	14	- @$(compile_c)
15	+ @$(compile_c) -DNO_X11=1	15	+ @$(compile_c) -DNO_X11=1

Lines 1-5 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk (-4 / +4 lines)
1	--- x11/Subdir.mk.orig Wed Oct 30 21:15:02 2002	1	--- x11/Subdir.mk.orig Tue Jan 7 16:17:05 2003
2	+++ x11/Subdir.mk Wed Oct 30 21:15:26 2002	2	+++ x11/Subdir.mk Sat Jan 18 00:46:26 2003
3	@@ -110,8 +110,8 @@	3	@@ -110,8 +110,8 @@
4	x11/pia : LDFLAGS := $(DLFLAGS)	4	x11/pia : LDFLAGS := $(DLFLAGS)
5		5
Lines 13-25 Link Here
13	# i18n	13	# i18n
14	@@ -122,12 +122,12 @@	14	@@ -122,12 +122,12 @@
15	# local targets	15	# local targets
16	x11/complete-xaw.o:: x11/complete.c	16	x11/complete-xaw.o: x11/complete.c
17	@$(echo_compile_c)	17	@$(echo_compile_c)
18	- @$(compile_c)	18	- @$(compile_c)
19	+ @$(compile_c) -DATHENA=1	19	+ @$(compile_c) -DATHENA=1
20	@$(fixup_deps)	20	@$(fixup_deps)
21		21
22	x11/complete-motif.o:: x11/complete.c	22	x11/complete-motif.o: x11/complete.c
23	@$(echo_compile_c)	23	@$(echo_compile_c)
24	- @$(compile_c)	24	- @$(compile_c)
25	+ @$(compile_c) -DMOTIF=1	25	+ @$(compile_c) -DMOTIF=1