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

(-)/usr/ports/graphics/xawtv/Makefile (-11 / +15 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	xawtv
8
PORTNAME=	xawtv
9
PORTVERSION=	3.75
9
PORTVERSION=	3.76
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 24-36 Link Here
24
USE_GMAKE=	yes
24
USE_GMAKE=	yes
25
USE_XPM=	yes
25
USE_XPM=	yes
26
USE_X_PREFIX=	yes
26
USE_X_PREFIX=	yes
27
USE_REINPLACE=	yes
27
28
28
FILES_X11BASE=	configure
29
FILES_LIBJPEG=	console/Subdir.mk debug/Subdir.mk x11/Subdir.mk
29
FILES_LOCALBASE=configure console/Subdir.mk debug/Subdir.mk x11/Subdir.mk
30
30
31
MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 \
31
MAN1=		alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \
32
		radio.1 record.1 rootv.1 scantv.1 showriff.1 streamer.1 \
32
		propwatch.1 radio.1 record.1 rootv.1 scantv.1 showriff.1 \
33
		subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
33
		streamer.1 subtitles.1 ttv.1 v4lctl.1 webcam.1 xawtv-remote.1 \
34
		xawtv.1
34
MAN5=		xawtvrc.5
35
MAN5=		xawtvrc.5
35
MAN8=		v4l-conf.8
36
MAN8=		v4l-conf.8
36
37
Lines 44-54 Link Here
44
PLIST_SUB+=	X11PREFIX=${X11BASE}
45
PLIST_SUB+=	X11PREFIX=${X11BASE}
45
46
46
post-patch:
47
post-patch:
47
.for i in ${FILES_X11BASE}
48
48
	${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i
49
	${REINPLACE_CMD} \
49
.endfor
50
		-e "s|/usr/X11R6|${X11BASE}|g" \
50
.for i in ${FILES_LOCALBASE}
51
		-e "s|/usr/local|${LOCALBASE}|g" \
51
	${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i
52
	${WRKSRC}/configure
53
54
.for i in ${FILES_LIBJPEG}
55
	${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
52
.endfor
56
.endfor
53
57
54
.include <bsd.port.post.mk>
58
.include <bsd.port.post.mk>
(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (xawtv_3.75.tar.gz) = 9ae700538a7b0bbfa7e7aeb971d66930
1
MD5 (xawtv_3.76.tar.gz) = b566d24b1212fd73e2d7a40a64400261
(-)/usr/ports/graphics/xawtv/files/patch-common::Subdir.mk (+11 lines)
Line 0 Link Here
1
--- common/Subdir.mk.orig	Sat Jul 27 10:24:27 2002
2
+++ common/Subdir.mk	Sat Jul 27 10:22:47 2002
3
@@ -16,7 +16,7 @@
4
 	common/midictrl.o
5
 
6
 # RegEdit.c is good old K&R ...
7
-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
8
+#common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
9
 
10
 common/channel-no-x11.o:: common/channel.c
11
 	$(CC) $(CFLAGS) -DNO_X11=1 -Wp,-MD,$*.dep -c -o $@ $<
(-)/usr/ports/graphics/xawtv/files/patch-configure (-34 / +9 lines)
Lines 1-46 Link Here
1
--- configure.orig	Thu Jun 20 10:08:52 2002
1
--- configure.orig	Wed Jul 24 19:13:38 2002
2
+++ configure	Sat Jun 22 16:54:00 2002
2
+++ configure	Sat Jul 27 10:05:07 2002
3
@@ -2028,7 +2028,7 @@
3
@@ -4460,18 +4460,12 @@
4
 	OpenBSD | FreeBSD | NetBSD)
4
 echo "$as_me:4460: checking for X11 config directory" >&5
5
 		# *BSD has important stuff (from ports)
6
 		# in /usr/local ...
7
-		CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
8
+		CFLAGS="-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib"
9
 		FOUND_OS="bsd"
10
 		;;
11
 	*)
12
@@ -2591,10 +2591,10 @@
13
 /usr/XFree86/include/X11
14
 
15
 /usr/include
16
-/usr/local/include
17
+%%LOCALBASE%%/include
18
 /usr/unsupported/include
19
 /usr/athena/include
20
-/usr/local/x11r5/include
21
+%%LOCALBASE%%/x11r5/include
22
 /usr/lpp/Xamples/include
23
 
24
 /usr/openwin/include
25
@@ -4442,19 +4442,13 @@
26
 
27
 echo "$as_me:4443: checking for X11 config directory" >&5
28
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
5
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
29
-x11conf=/usr/X11R6/lib/X11
6
 x11conf=/usr/X11R6/lib/X11
30
-if test -d /etc/X11; then
7
-if test -d /etc/X11; then
31
-	x11conf=/etc/X11
8
-	x11conf=/etc/X11
32
-fi
9
-fi
33
+x11conf=%%X11BASE%%/lib/X11
10
 echo "$as_me:4466: result: $x11conf" >&5
34
 echo "$as_me:4449: result: $x11conf" >&5
35
 echo "${ECHO_T}$x11conf" >&6
11
 echo "${ECHO_T}$x11conf" >&6
36
 
12
 
37
 echo "$as_me:4452: checking for X11 app-defaults directory" >&5
13
 echo "$as_me:4469: checking for X11 app-defaults directory" >&5
38
 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
14
 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
39
-resdir=/usr/X11R6/lib/X11
15
 resdir=/usr/X11R6/lib/X11
40
-if test -d /etc/X11/app-defaults; then
16
-if test -d /etc/X11/app-defaults; then
41
-	resdir=/etc/X11
17
-	resdir=/etc/X11
42
-fi
18
-fi
43
+resdir=%%X11BASE%%/lib/X11
19
 echo "$as_me:4475: result: $resdir/app-defaults" >&5
44
 echo "$as_me:4458: result: $resdir/app-defaults" >&5
45
 echo "${ECHO_T}$resdir/app-defaults" >&6
20
 echo "${ECHO_T}$resdir/app-defaults" >&6
46
 
21
 
(-)/usr/ports/graphics/xawtv/files/patch-console::Subdir.mk (-19 lines)
Lines 1-19 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-debug::Subdir.mk (-13 lines)
Lines 1-13 Link Here
1
--- debug/Subdir.mk.orig	Mon Jun 24 02:12:21 2002
2
+++ debug/Subdir.mk	Mon Jun 24 02:12:46 2002
3
@@ -22,8 +22,8 @@
4
 
5
 debug/xvideo: debug/xvideo.o
6
 
7
-debug/gl     : LDLIBS  := $(THREADLIB) $(MOTIF_LIBS) -lGLU -lGL -ljpeg -lm
8
-debug/hwscan : LDLIBS  := $(ALSA_LIBS) -ljpeg
9
+debug/gl     : LDLIBS  := $(THREADLIB) $(MOTIF_LIBS) -L%%LOCALBASE%%/lib -lGLU -lGL -ljpeg -lm
10
+debug/hwscan : LDLIBS  := $(ALSA_LIBS) -L%%LOCALBASE%%/lib -ljpeg
11
 debug/xvideo : LDLIBS  := $(ATHENA_LIBS)
12
 
13
 debug/gl     : LDFLAGS := $(DLFLAGS)
(-)/usr/ports/graphics/xawtv/files/patch-x11::Subdir.mk (-18 lines)
Lines 1-18 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 (+4 lines)
Lines 1-6 Link Here
1
bin/dump-mixers
1
bin/dump-mixers
2
bin/motv
2
bin/motv
3
bin/ntsc-cc
3
bin/ntsc-cc
4
bin/pia
4
bin/propwatch
5
bin/propwatch
5
bin/record
6
bin/record
6
bin/rootv
7
bin/rootv
Lines 14-21 Link Here
14
bin/xawtv-remote
15
bin/xawtv-remote
15
lib/xawtv/conv-mjpeg.so
16
lib/xawtv/conv-mjpeg.so
16
lib/xawtv/drv0-bsd.so
17
lib/xawtv/drv0-bsd.so
18
lib/xawtv/flt-disor.so
17
lib/xawtv/flt-gamma.so
19
lib/xawtv/flt-gamma.so
18
lib/xawtv/flt-invert.so
20
lib/xawtv/flt-invert.so
21
lib/xawtv/flt-smooth.so
22
lib/xawtv/read-avi.so
19
lib/xawtv/snd-oss.so
23
lib/xawtv/snd-oss.so
20
lib/xawtv/write-avi.so
24
lib/xawtv/write-avi.so
21
@dirrm lib/xawtv
25
@dirrm lib/xawtv

Return to bug 41037