Attachment #21239 for bug #37260

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




#

PORTNAME=	xawtv
PORTVERSION=	3.74
CATEGORIES=	graphics
MASTER_SITES=	http://bytesex.org/xawtv/
DISTNAME=	${PORTNAME}_${PORTVERSION}

FILES_X11BASE=	configure Make.config.in
FILES_LOCALBASE=configure

MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \
		radio.1 record.1 rootv.1 scantv.1 showriff.1 streamer.1 \
		subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
		webcam.1 xawtv-remote.1 xawtv.1
MAN5=		xawtvrc.5
MAN8=		v4l-conf.8


Line 1 Link Here

(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.73.tar.gz) = c9a8b96439a877bccd9463bf3331b538	1	MD5 (xawtv_3.74.tar.gz) = e517590defc52441011ca541577bcf8f




--- configure.orig	Wed Apr 10 12:03:15 2002
+++ configure	Sun Apr 14 20:35:36 2002
@@ -2022,7 +2022,7 @@
 	OpenBSD | FreeBSD | NetBSD)
 		# *BSD has important stuff (from ports)
 		# in /usr/local ...
-		CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
+		CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib"
 		FOUND_OS="bsd"
 		VBIFLAGS="-DBSD"
 		;;
 	*)
@@ -2585,10 +2585,10 @@
 /usr/XFree86/include/X11
 
 /usr/include

 /usr/lpp/Xamples/include
 
 /usr/openwin/include
@@ -4374,19 +4374,13 @@
 
 echo "$as_me:4375: 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
+x11conf=%%X11BASE%%/lib/X11
 echo "$as_me:4381: result: $x11conf" >&5
 echo "${ECHO_T}$x11conf" >&6
 
 echo "$as_me:4384: 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
+resdir=%%X11BASE%%/lib/X11
 echo "$as_me:4390: result: $resdir/app-defaults" >&5
 echo "${ECHO_T}$resdir/app-defaults" >&6
 

Lines 1-10 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-font::Makefile.in (-10 lines)
1	--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001
2	+++ font/Makefile.in Sun Sep 2 12:01:45 2001
3	@@ -23,7 +23,6 @@
4	done
5	if test "$(DESTDIR)" = ""; then \
6	(cd $(fontdir); mkfontdir); \
7	- xset fp rehash \|\| true; \
8	fi
9
10




--- src/Makefile.in.orig	Thu Dec 13 13:15:07 2001
+++ src/Makefile.in	Mon Jan 14 20:36:59 2002
@@ -124,12 +124,14 @@
 install-dirs:
 	$(INSTALL_DIR) $(bindir)
 	$(INSTALL_DIR) $(resdir)/app-defaults
-	$(INSTALL_DIR) $(resdir)/de/app-defaults
+	for lang in $(LANG); do \
+	  $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
+	done
 
 install-common:
 	$(INSTALL_DIR) $(bindir)
 	$(INSTALL_DIR) $(resdir)/app-defaults
-	$(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
+	$(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
 	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
 	$(INSTALL_PROGRAM) -s streamer $(bindir)
 	$(INSTALL_PROGRAM) -s v4lctl $(bindir)




--- src/motif.c.orig	Mon Sep 17 00:42:53 2001
+++ src/motif.c	Mon Sep 17 00:45:40 2001
@@ -24,6 +24,19 @@
 # include <sys/soundcard.h>
 #endif
 
+#if defined(__FreeBSD__)
+typedef struct mixer_info
+{
+  char id[16];  
+  char name[32];
+  int  modify_counter;
+  int fillers[10];
+} mixer_info;
+
+
+# define SOUND_MIXER_INFO                _IOR ('M', 101, mixer_info)
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include <Xm/Xm.h>

Line 0 Link Here

(-)/usr/ports/graphics/xawtv/patch-font::Makefile.in (+10 lines)
	1	--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001
	2	+++ font/Makefile.in Sun Sep 2 12:01:45 2001
	3	@@ -23,7 +23,6 @@
	4	done
	5	if test "$(DESTDIR)" = ""; then \
	6	(cd $(fontdir); mkfontdir); \
	7	- xset fp rehash \|\| true; \
	8	fi
	9
	10




--- src/Makefile.in.orig	Thu Dec 13 13:15:07 2001
+++ src/Makefile.in	Mon Jan 14 20:36:59 2002
@@ -124,12 +124,14 @@
 install-dirs:
 	$(INSTALL_DIR) $(bindir)
 	$(INSTALL_DIR) $(resdir)/app-defaults
-	$(INSTALL_DIR) $(resdir)/de/app-defaults
+	for lang in $(LANG); do \
+	  $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
+	done
 
 install-common:
 	$(INSTALL_DIR) $(bindir)
 	$(INSTALL_DIR) $(resdir)/app-defaults
-	$(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
+	$(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
 	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
 	$(INSTALL_PROGRAM) -s streamer $(bindir)
 	$(INSTALL_PROGRAM) -s v4lctl $(bindir)




--- src/motif.c.orig	Mon Sep 17 00:42:53 2001
+++ src/motif.c	Mon Sep 17 00:45:40 2001
@@ -24,6 +24,19 @@
 # include <sys/soundcard.h>
 #endif
 
+#if defined(__FreeBSD__)
+typedef struct mixer_info
+{
+  char id[16];  
+  char name[32];
+  int  modify_counter;
+  int fillers[10];
+} mixer_info;
+
+
+# define SOUND_MIXER_INFO                _IOR ('M', 101, mixer_info)
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include <Xm/Xm.h>

Lines 21-26 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (+7 lines)
21	lib/xawtv/snd-oss.so	21	lib/xawtv/snd-oss.so
22	lib/xawtv/write-avi.so	22	lib/xawtv/write-avi.so
23	@dirrm lib/xawtv	23	@dirrm lib/xawtv
		24	man/es/man1/fbtv.1
		25	man/es/man1/scantv.1
		26	man/es/man1/xawtv.1
		27	@dirrm man/es/man1
		28	man/es/man5/xawtvrc.5
		29	@dirrm man/es/man5
		30	@dirrm man/es
24	@cwd %%X11BASE%%	31	@cwd %%X11BASE%%
25	lib/X11/app-defaults/MoTV	32	lib/X11/app-defaults/MoTV
26	lib/X11/fonts/misc/led-iso8859-1.pcf.gz	33	lib/X11/fonts/misc/led-iso8859-1.pcf.gz

Return to bug 37260

Lines 6-12 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (-5 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.73	9	PORTVERSION= 3.74
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}
Lines 30-39 Link Here
30	FILES_X11BASE= configure Make.config.in	30	FILES_X11BASE= configure Make.config.in
31	FILES_LOCALBASE=configure	31	FILES_LOCALBASE=configure
32		32
33	MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \	33	MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \
34	rootv.1 scantv.1 showriff.1 \	34	radio.1 record.1 rootv.1 scantv.1 showriff.1 streamer.1 \
35	streamer.1 subtitles.1 ttv.1 v4lctl.1 \	35	subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
36	webcam.1 xawtv-remote.1 xawtv.1
37	MAN5= xawtvrc.5	36	MAN5= xawtvrc.5
38	MAN8= v4l-conf.8	37	MAN8= v4l-conf.8
39		38

Lines 1-15 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-configure (-13 / +14 lines)
1	--- configure.orig Thu Mar 14 14:51:55 2002	1	--- configure.orig Wed Apr 10 12:03:15 2002
2	+++ configure Fri Mar 15 21:49:45 2002	2	+++ configure Sun Apr 14 20:35:36 2002
3	@@ -2022,7 +2022,7 @@	3	@@ -2022,7 +2022,7 @@
4	OpenBSD \| FreeBSD \| NetBSD)	4	OpenBSD \| FreeBSD \| NetBSD)
5	# *BSD has important stuff (from ports) in	5	# *BSD has important stuff (from ports)
6	# /usr/local ...	6	# in /usr/local ...
7	- CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"	7	- CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
8	+ CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib"	8	+ CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib"
9	PLUGINS="drv0-bsd.so snd-oss.so"	9	FOUND_OS="bsd"
10	VBIFLAGS="-DBSD"
11	;;	10	;;
12	@@ -2586,10 +2586,10 @@	11	*)
		12	@@ -2585,10 +2585,10 @@
13	/usr/XFree86/include/X11	13	/usr/XFree86/include/X11
14		14
15	/usr/include	15	/usr/include
Lines 22-45 Link Here
22	/usr/lpp/Xamples/include	22	/usr/lpp/Xamples/include
23		23
24	/usr/openwin/include	24	/usr/openwin/include
25	@@ -4329,18 +4329,13 @@	25	@@ -4374,19 +4374,13 @@
26	echo "$as_me:4329: checking for X11 config directory" >&5	26
		27	echo "$as_me:4375: checking for X11 config directory" >&5
27	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6	28	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
28	x11conf=/usr/X11R6/lib/X11	29	-x11conf=/usr/X11R6/lib/X11
29	-if test -d /etc/X11; then	30	-if test -d /etc/X11; then
30	- x11conf=/etc/X11	31	- x11conf=/etc/X11
31	-fi	32	-fi
32	+x11conf=%%X11BASE%%/lib/X11	33	+x11conf=%%X11BASE%%/lib/X11
33	echo "$as_me:4335: result: $x11conf" >&5	34	echo "$as_me:4381: result: $x11conf" >&5
34	echo "${ECHO_T}$x11conf" >&6	35	echo "${ECHO_T}$x11conf" >&6
35		36
36	echo "$as_me:4338: checking for X11 app-defaults directory" >&5	37	echo "$as_me:4384: checking for X11 app-defaults directory" >&5
37	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6	38	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
38	-resdir=/usr/X11R6/lib/X11	39	-resdir=/usr/X11R6/lib/X11
39	-if test -d /etc/X11/app-defaults; then	40	-if test -d /etc/X11/app-defaults; then
40	- resdir=/etc/X11	41	- resdir=/etc/X11
41	-fi	42	-fi
42	+resdir=%%X11BASE%%/lib/X11	43	+resdir=%%X11BASE%%/lib/X11
43	echo "$as_me:4344: result: $resdir/app-defaults" >&5	44	echo "$as_me:4390: result: $resdir/app-defaults" >&5
44	echo "${ECHO_T}$resdir/app-defaults" >&6	45	echo "${ECHO_T}$resdir/app-defaults" >&6
45		46

Lines 1-19 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-src::Makefile.in (-19 lines)
1	--- src/Makefile.in.orig Thu Dec 13 13:15:07 2001
2	+++ src/Makefile.in Mon Jan 14 20:36:59 2002
3	@@ -124,12 +124,14 @@
4	install-dirs:
5	$(INSTALL_DIR) $(bindir)
6	$(INSTALL_DIR) $(resdir)/app-defaults
7	- $(INSTALL_DIR) $(resdir)/de/app-defaults
8	+ for lang in $(LANG); do \
9	+ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
10	+ done
11
12	install-common:
13	$(INSTALL_DIR) $(bindir)
14	$(INSTALL_DIR) $(resdir)/app-defaults
15	- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
16	+ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
17	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
18	$(INSTALL_PROGRAM) -s streamer $(bindir)
19	$(INSTALL_PROGRAM) -s v4lctl $(bindir)

Lines 1-22 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-src::motif.c (-22 lines)
1	--- src/motif.c.orig Mon Sep 17 00:42:53 2001
2	+++ src/motif.c Mon Sep 17 00:45:40 2001
3	@@ -24,6 +24,19 @@
4	# include <sys/soundcard.h>
5	#endif
6
7	+#if defined(__FreeBSD__)
8	+typedef struct mixer_info
9	+{
10	+ char id[16];
11	+ char name[32];
12	+ int modify_counter;
13	+ int fillers[10];
14	+} mixer_info;
15	+
16	+
17	+# define SOUND_MIXER_INFO _IOR ('M', 101, mixer_info)
18	+#endif
19	+
20	#include <X11/Xlib.h>
21	#include <X11/Intrinsic.h>
22	#include <Xm/Xm.h>

Line 0 Link Here

(-)/usr/ports/graphics/xawtv/patch-src::Makefile.in (+19 lines)
	1	--- src/Makefile.in.orig Thu Dec 13 13:15:07 2001
	2	+++ src/Makefile.in Mon Jan 14 20:36:59 2002
	3	@@ -124,12 +124,14 @@
	4	install-dirs:
	5	$(INSTALL_DIR) $(bindir)
	6	$(INSTALL_DIR) $(resdir)/app-defaults
	7	- $(INSTALL_DIR) $(resdir)/de/app-defaults
	8	+ for lang in $(LANG); do \
	9	+ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
	10	+ done
	11
	12	install-common:
	13	$(INSTALL_DIR) $(bindir)
	14	$(INSTALL_DIR) $(resdir)/app-defaults
	15	- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
	16	+ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
	17	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
	18	$(INSTALL_PROGRAM) -s streamer $(bindir)
	19	$(INSTALL_PROGRAM) -s v4lctl $(bindir)