Attachment #26193 for bug #44764

View | Details | Raw Unified | Return to bug 44764
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.76	9	PORTVERSION= 3.78
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.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261	1	MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e




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

-CFLAGS	+= -DCONFIGFILE='"$(config)"'
-CFLAGS	+= -DLIBDIR='"$(libdir)"'
-CFLAGS	+= -DVERSION='"$(VERSION)"'
-CXXFLAGS = $(CFLAGS)
+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
 
 
 # shared objects need -fPIC
-%.so : CFLAGS += -fPIC




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




--- 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:$LINENO: result: $x11conf" >&5
 echo "${ECHO_T}$x11conf" >&6
 
@@ -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:$LINENO: result: $resdir/app-defaults" >&5
 echo "${ECHO_T}$resdir/app-defaults" >&6
 




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

Lines 5-10 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (+1 lines)
5	bin/propwatch	5	bin/propwatch
6	bin/record	6	bin/record
7	bin/rootv	7	bin/rootv
		8	bin/showqt
8	bin/showriff	9	bin/showriff
9	bin/streamer	10	bin/streamer
10	bin/subtitles	11	bin/subtitles

Return to bug 44764

Lines 1-6 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-Makefile.in (-9 / +8 lines)
1	--- Makefile.in.orig Wed Jun 19 11:13:15 2002	1	--- Makefile.in.orig Mon Sep 9 16:05:39 2002
2	+++ Makefile.in Mon Jun 24 02:07:45 2002	2	+++ Makefile.in Wed Oct 30 20:54:40 2002
3	@@ -58,17 +58,7 @@	3	@@ -62,15 +62,7 @@
4	FOUND_ZVBI := @FOUND_ZVBI@	4	FOUND_ZVBI := @FOUND_ZVBI@
5		5
6	# build final cflags	6	# build final cflags
Lines 12-21 Link Here
12	-CFLAGS += -DCONFIGFILE='"$(config)"'	12	-CFLAGS += -DCONFIGFILE='"$(config)"'
13	-CFLAGS += -DLIBDIR='"$(libdir)"'	13	-CFLAGS += -DLIBDIR='"$(libdir)"'
14	-CFLAGS += -DVERSION='"$(VERSION)"'	14	-CFLAGS += -DVERSION='"$(VERSION)"'
15	-	15	-CXXFLAGS = $(CFLAGS)
16	-# shared objects need -fPIC	16	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC
17	-%.so : CFLAGS += -fPIC	17	+CXXFLAGS += $(CFLAGS)
18	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC
19
20		18
21	#########################################################	19	# shared objects need -fPIC
		20	-%.so : CFLAGS += -fPIC

Lines 1-11 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-common::Subdir.mk (-4 / +9 lines)
1	--- common/Subdir.mk.orig Sat Jul 27 10:24:27 2002	1	--- common/Subdir.mk.orig Wed Oct 30 21:06:25 2002
2	+++ common/Subdir.mk Sat Jul 27 10:22:47 2002	2	+++ common/Subdir.mk Wed Oct 30 21:06:41 2002
3	@@ -16,7 +16,7 @@	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/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
9		11
10	common/channel-no-x11.o:: common/channel.c	12	common/channel-no-x11.o:: common/channel.c
11	$(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $<	13	@$(echo_compile_c)
		14	- @$(compile_c)
		15	+ @$(compile_c) -DNO_X11=1
		16	@$(fixup_deps)

Lines 1-21 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-configure (-7 / +8 lines)
1	--- configure.orig Wed Jul 24 19:13:38 2002	1	--- configure.orig Wed Oct 30 12:26:42 2002
2	+++ configure Sat Jul 27 10:05:07 2002	2	+++ configure Wed Oct 30 20:59:10 2002
3	@@ -4460,18 +4460,12 @@	3	@@ -5749,9 +5749,6 @@
4	echo "$as_me:4460: checking for X11 config directory" >&5	4	echo "$as_me:$LINENO: checking for X11 config directory" >&5
5	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6	5	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
6	x11conf=/usr/X11R6/lib/X11	6	x11conf=/usr/X11R6/lib/X11
7	-if test -d /etc/X11; then	7	-if test -d /etc/X11; then
8	- x11conf=/etc/X11	8	- x11conf=/etc/X11
9	-fi	9	-fi
10	echo "$as_me:4466: result: $x11conf" >&5	10	echo "$as_me:$LINENO: result: $x11conf" >&5
11	echo "${ECHO_T}$x11conf" >&6	11	echo "${ECHO_T}$x11conf" >&6
12		12
13	echo "$as_me:4469: checking for X11 app-defaults directory" >&5	13	@@ -5759,9 +5756,6 @@
		14	echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
14	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6	15	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
15	resdir=/usr/X11R6/lib/X11	16	resdir=/usr/X11R6/lib/X11
16	-if test -d /etc/X11/app-defaults; then	17	-if test -d /etc/X11/app-defaults; then
17	- resdir=/etc/X11	18	- resdir=/etc/X11
18	-fi	19	-fi
19	echo "$as_me:4475: result: $resdir/app-defaults" >&5	20	echo "$as_me:$LINENO: result: $resdir/app-defaults" >&5
20	echo "${ECHO_T}$resdir/app-defaults" >&6	21	echo "${ECHO_T}$resdir/app-defaults" >&6
21		22

Line 0 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk (+28 lines)
	1	--- x11/Subdir.mk.orig Wed Oct 30 21:15:02 2002
	2	+++ x11/Subdir.mk Wed Oct 30 21:15:26 2002
	3	@@ -110,8 +110,8 @@
	4	x11/pia : LDFLAGS := $(DLFLAGS)
	5
	6	# compile flags
	7	-x11/complete-xaw.o : CFLAGS += -DATHENA=1
	8	-x11/complete-motif.o : CFLAGS += -DMOTIF=1
	9	+#x11/complete-xaw.o : CFLAGS += -DATHENA=1
	10	+#x11/complete-motif.o : CFLAGS += -DMOTIF=1
	11
	12
	13	# i18n
	14	@@ -122,12 +122,12 @@
	15	# local targets
	16	x11/complete-xaw.o:: x11/complete.c
	17	@$(echo_compile_c)
	18	- @$(compile_c)
	19	+ @$(compile_c) -DATHENA=1
	20	@$(fixup_deps)
	21
	22	x11/complete-motif.o:: x11/complete.c
	23	@$(echo_compile_c)
	24	- @$(compile_c)
	25	+ @$(compile_c) -DMOTIF=1
	26	@$(fixup_deps)
	27
	28