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

(-)/usr/ports/graphics/xawtv/Makefile (-10 / +3 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	xawtv
8
PORTNAME=	xawtv
9
PORTVERSION=	3.74
9
PORTVERSION=	3.75
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 25-34 Link Here
25
USE_XPM=	yes
25
USE_XPM=	yes
26
USE_X_PREFIX=	yes
26
USE_X_PREFIX=	yes
27
27
28
FILES_CFLAGS=	. font i2c man src radio webcam oldstuff/vtx \
28
FILES_X11BASE=	configure
29
		libng libvbi http
29
FILES_LOCALBASE=configure console/Subdir.mk x11/Subdir.mk
30
FILES_X11BASE=	configure Make.config.in
31
FILES_LOCALBASE=configure
32
30
33
MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \
31
MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \
34
		radio.1 record.1 rootv.1 scantv.1 showriff.1 streamer.1 \
32
		radio.1 record.1 rootv.1 scantv.1 showriff.1 streamer.1 \
Lines 51-61 Link Here
51
.endfor
49
.endfor
52
.for i in ${FILES_LOCALBASE}
50
.for i in ${FILES_LOCALBASE}
53
	${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i
51
	${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i
54
.endfor
55
56
post-configure:
57
.for i in ${FILES_CFLAGS}
58
	${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile
59
.endfor
52
.endfor
60
53
61
.include <bsd.port.post.mk>
54
.include <bsd.port.post.mk>
(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (xawtv_3.74.tar.gz) = e517590defc52441011ca541577bcf8f
1
MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930
(-)/usr/ports/graphics/xawtv/files/patch-Makefile.in (+21 lines)
Line 0 Link Here
1
--- Makefile.in.orig	Wed Jun 19 17:13:15 2002
2
+++ Makefile.in	Sat Jun 22 20:23:09 2002
3
@@ -58,17 +58,7 @@
4
 FOUND_ZVBI	:= @FOUND_ZVBI@
5
 
6
 # build final cflags
7
-CFLAGS	:= @CFLAGS@
8
-CFLAGS	+= $(WARN_FLAGS)
9
-CFLAGS	+= $(LFS_FLAGS)
10
-CFLAGS	+= $(X11_FLAGS)
11
-CFLAGS	+= $(LIB_FLAGS)
12
-CFLAGS	+= -DCONFIGFILE='"$(config)"'
13
-CFLAGS	+= -DLIBDIR='"$(libdir)"'
14
-CFLAGS	+= -DVERSION='"$(VERSION)"'
15
-
16
-# shared objects need -fPIC
17
-%.so : CFLAGS += -fPIC
18
+CFLAGS	+= @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC
19
 
20
 
21
 #########################################################
(-)/usr/ports/graphics/xawtv/files/patch-configure (-10 / +10 lines)
Lines 1-15 Link Here
1
--- configure.orig	Wed Apr 10 12:03:15 2002
1
--- configure.orig	Thu Jun 20 10:08:52 2002
2
+++ configure	Sun Apr 14 20:35:36 2002
2
+++ configure	Sat Jun 22 16:54:00 2002
3
@@ -2022,7 +2022,7 @@
3
@@ -2028,7 +2028,7 @@
4
 	OpenBSD | FreeBSD | NetBSD)
4
 	OpenBSD | FreeBSD | NetBSD)
5
 		# *BSD has important stuff (from ports)
5
 		# *BSD has important stuff (from ports)
6
 		# in /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="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib"
9
 		FOUND_OS="bsd"
9
 		FOUND_OS="bsd"
10
 		;;
10
 		;;
11
 	*)
11
 	*)
12
@@ -2585,10 +2585,10 @@
12
@@ -2591,10 +2591,10 @@
13
 /usr/XFree86/include/X11
13
 /usr/XFree86/include/X11
14
 
14
 
15
 /usr/include
15
 /usr/include
Lines 22-46 Link Here
22
 /usr/lpp/Xamples/include
22
 /usr/lpp/Xamples/include
23
 
23
 
24
 /usr/openwin/include
24
 /usr/openwin/include
25
@@ -4374,19 +4374,13 @@
25
@@ -4442,19 +4442,13 @@
26
 
26
 
27
 echo "$as_me:4375: checking for X11 config directory" >&5
27
 echo "$as_me:4443: checking for X11 config directory" >&5
28
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
28
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
29
-x11conf=/usr/X11R6/lib/X11
29
-x11conf=/usr/X11R6/lib/X11
30
-if test -d /etc/X11; then
30
-if test -d /etc/X11; then
31
-	x11conf=/etc/X11
31
-	x11conf=/etc/X11
32
-fi
32
-fi
33
+x11conf=%%X11BASE%%/lib/X11
33
+x11conf=%%X11BASE%%/lib/X11
34
 echo "$as_me:4381: result: $x11conf" >&5
34
 echo "$as_me:4449: result: $x11conf" >&5
35
 echo "${ECHO_T}$x11conf" >&6
35
 echo "${ECHO_T}$x11conf" >&6
36
 
36
 
37
 echo "$as_me:4384: checking for X11 app-defaults directory" >&5
37
 echo "$as_me:4452: checking for X11 app-defaults directory" >&5
38
 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
39
-resdir=/usr/X11R6/lib/X11
39
-resdir=/usr/X11R6/lib/X11
40
-if test -d /etc/X11/app-defaults; then
40
-if test -d /etc/X11/app-defaults; then
41
-	resdir=/etc/X11
41
-	resdir=/etc/X11
42
-fi
42
-fi
43
+resdir=%%X11BASE%%/lib/X11
43
+resdir=%%X11BASE%%/lib/X11
44
 echo "$as_me:4390: result: $resdir/app-defaults" >&5
44
 echo "$as_me:4458: result: $resdir/app-defaults" >&5
45
 echo "${ECHO_T}$resdir/app-defaults" >&6
45
 echo "${ECHO_T}$resdir/app-defaults" >&6
46
 
46
 
(-)/usr/ports/graphics/xawtv/files/patch-console::Subdir.mk (+19 lines)
Line 0 Link Here
1
--- console/Subdir.mk.orig	Sat Jun 22 17:04:53 2002
2
+++ console/Subdir.mk	Sat Jun 22 17:05:30 2002
3
@@ -65,11 +65,11 @@
4
 # libraries to link
5
 console/fbtv     : LDLIBS  := \
6
 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
7
-	$(FS_LIBS) -ljpeg -lm
8
-console/ttv      : LDLIBS  := $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm
9
-console/scantv   : LDLIBS  := $(THREAD_LIBS) $(VBI_LIBS) -ljpeg
10
-console/streamer : LDLIBS  := $(THREAD_LIBS) -ljpeg -lm
11
-console/webcam   : LDLIBS  := $(THREAD_LIBS) -ljpeg
12
+	$(FS_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
13
+console/ttv      : LDLIBS  := $(THREAD_LIBS) $(AA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
14
+console/scantv   : LDLIBS  := $(THREAD_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg
15
+console/streamer : LDLIBS  := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
16
+console/webcam   : LDLIBS  := $(THREAD_LIBS) -L%%LOCALBASE%%/lib -ljpeg
17
 console/radio    : LDLIBS  := $(CURSES_LIBS)
18
 console/record   : LDLIBS  := $(CURSES_LIBS)
19
 console/v4l-conf : LDLIBS  := $(ATHENA_LIBS)
(-)/usr/ports/graphics/xawtv/files/patch-libvbi::os.h (-8 lines)
Lines 1-8 Link Here
1
--- libvbi/os.h.orig	Sun Mar 10 13:20:37 2002
2
+++ libvbi/os.h	Sun Mar 10 13:19:45 2002
3
@@ -1,4 +1,4 @@
4
-#ifndef OS_H
5
+#if !defined(OS_H) && !defined(BSD)
6
 #define OS_H
7
 
8
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBsd__) \
(-)/usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk (+18 lines)
Line 0 Link Here
1
--- x11/Subdir.mk.orig	Sat Jun 22 17:13:04 2002
2
+++ x11/Subdir.mk	Sat Jun 22 17:13:43 2002
3
@@ -83,12 +83,12 @@
4
 # libraries to link
5
 x11/xawtv        : LDLIBS  := \
6
 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
7
-	$(ATHENA_LIBS) $(VBI_LIBS) -ljpeg -lm
8
+	$(ATHENA_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
9
 x11/motv         : LDLIBS  := \
10
 	$(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
11
-	$(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -lm
12
+	$(MOTIF_LIBS) $(VBI_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
13
 x11/mtt          : LDLIBS  := $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS)
14
-x11/v4lctl       : LDLIBS  := $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm
15
+x11/v4lctl       : LDLIBS  := $(THREAD_LIBS) $(ATHENA_LIBS) -L%%LOCALBASE%%/lib -ljpeg -lm
16
 x11/rootv        : LDLIBS  := $(ATHENA_LIBS)
17
 x11/xawtv-remote : LDLIBS  := $(ATHENA_LIBS)
18
 x11/propwatch    : LDLIBS  := $(ATHENA_LIBS)
(-)/usr/ports/graphics/xawtv/pkg-plist (-7 / +12 lines)
Lines 1-11 Link Here
1
bin/alevtd
2
bin/dump-mixers
1
bin/dump-mixers
3
bin/motv
2
bin/motv
4
bin/ntsc-cc
3
bin/ntsc-cc
5
bin/propwatch
4
bin/propwatch
6
bin/record
5
bin/record
7
bin/rootv
6
bin/rootv
8
bin/scantv
9
bin/showriff
7
bin/showriff
10
bin/streamer
8
bin/streamer
11
bin/subtitles
9
bin/subtitles
Lines 22-39 Link Here
22
lib/xawtv/write-avi.so
20
lib/xawtv/write-avi.so
23
@dirrm lib/xawtv
21
@dirrm lib/xawtv
24
man/es/man1/fbtv.1
22
man/es/man1/fbtv.1
23
man/es/man1/rootv.1
25
man/es/man1/scantv.1
24
man/es/man1/scantv.1
25
man/es/man1/streamer.1
26
man/es/man1/subtitles.1
27
man/es/man1/ttv.1
28
man/es/man1/v4lctl.1
26
man/es/man1/xawtv.1
29
man/es/man1/xawtv.1
27
@dirrm man/es/man1
30
man/es/man1/xawtv-remote.1
28
man/es/man5/xawtvrc.5
31
man/es/man5/xawtvrc.5
32
man/es/man8/v4l-conf.8
33
man/fr/man1/xawtv.1
34
@dirrm man/es/man1
29
@dirrm man/es/man5
35
@dirrm man/es/man5
36
@dirrm man/es/man8
30
@dirrm man/es
37
@dirrm man/es
38
@dirrm man/fr/man1
39
@dirrm man/fr
31
@cwd %%X11BASE%%
40
@cwd %%X11BASE%%
32
lib/X11/app-defaults/MoTV
41
lib/X11/app-defaults/MoTV
33
lib/X11/fonts/misc/led-iso8859-1.pcf.gz
34
lib/X11/fonts/misc/led-iso8859-15.pcf.gz
35
lib/X11/fonts/misc/led-iso8859-2.pcf.gz
36
lib/X11/fonts/misc/led-koi8-r.pcf.gz
37
lib/X11/de/app-defaults/MoTV
42
lib/X11/de/app-defaults/MoTV
38
lib/X11/it/app-defaults/MoTV
43
lib/X11/it/app-defaults/MoTV
39
@dirrm lib/X11/de/app-defaults
44
@dirrm lib/X11/de/app-defaults

Return to bug 39669