Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Sep 2001 15:11:42 +0200 (CEST)
From:      "Thomas E. Zander" <riggs@f113.hadiko.de>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/30264: Update port: graphics/xawtv
Message-ID:  <200109021311.f82DBgx43532@f113.hadiko.de>

next in thread | raw e-mail | index | archive | help

>Number:         30264
>Category:       ports
>Synopsis:       Update port: graphics/xawtv
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 02 06:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 4.4-RC i386
>Organization:
>Environment:
System: FreeBSD f113.hadiko.de 4.4-RC FreeBSD 4.4-RC #0: Fri Aug 17 00:34:57 CEST 2001 root@f113.hadiko.de:/usr/obj/usr/src/sys/MARVIN i386
>Description:
	The update of xawtv is needed because MASTER_SITE has changed
	and the old version is not available anymore
>How-To-Repeat:
>Fix:

The following lines contain a complete diff for the xawtv directory:



diff -ruN xawtv-old/Makefile xawtv/Makefile
--- xawtv-old/Makefile	Mon Mar 26 01:27:07 2001
+++ xawtv/Makefile	Sun Sep  2 14:19:45 2001
@@ -2,13 +2,13 @@
 # Date created:        03 March 2001
 # Whom:                George Reid <greid@ukug.uk.freebsd.org>
 #
-# $FreeBSD: ports/graphics/xawtv/Makefile,v 1.2 2001/03/25 23:27:07 kris Exp $
+# $FreeBSD$
 #
 
 PORTNAME=       xawtv
-PORTVERSION=	3.37
+PORTVERSION=	3.60
 CATEGORIES=     graphics
-MASTER_SITES=   http://www.strusel007.de/linux/xawtv/
+MASTER_SITES=   http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
@@ -21,13 +21,21 @@
 
 GNU_CONFIGURE=	yes
 
+USE_GMAKE=	yes
+
 USE_X_PREFIX=	yes
 
-SEDFILES=	. font i2c man src radio contrib/cc webcam oldstuff/vtx \
+SEDFILES=	. font i2c man src radio tools webcam oldstuff/vtx \
 		libng libvbi http
 
-MAN1=		alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \
-		v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
+MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
+		rootv.1 scantv.1 showriff.1 \
+		streamer.1 subtitles.1 ttv.1 v4lctl.1 \
+		webcam.1 xawtv-remote.1 xawtv.1
+
+MAN5=		xawtvrc.5
+
+MAN8=		v4l-conf.8
 
 post-configure:
 .for M in ${SEDFILES}
@@ -35,9 +43,9 @@
 		${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile)
 .endfor
 
-post-install:
-.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf
-	@gzip ${PREFIX}/lib/X11/fonts/misc/$F
-.endfor
+#post-install:
+#.for F in led-koi8-r.pcf led-iso8859-1.pcf led-iso8859-2.pcf
+#	@gzip ${PREFIX}/lib/X11/fonts/misc/$F
+#.endfor
 
 .include <bsd.port.mk>
diff -ruN xawtv-old/distinfo xawtv/distinfo
--- xawtv-old/distinfo	Tue Mar 20 04:12:55 2001
+++ xawtv/distinfo	Sun Sep  2 12:00:48 2001
@@ -1 +1 @@
-MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8
+MD5 (xawtv_3.60.tar.gz) = c0852b4e1ca990e02812626f6075ad40
diff -ruN xawtv-old/files/patch-::Make.config.in xawtv/files/patch-::Make.config.in
--- xawtv-old/files/patch-::Make.config.in	Thu Jan  1 01:00:00 1970
+++ xawtv/files/patch-::Make.config.in	Sun Sep  2 12:56:00 2001
@@ -0,0 +1,11 @@
+--- Make.config.in.orig	Thu Aug  9 10:50:27 2001
++++ Make.config.in	Sun Sep  2 12:54:26 2001
+@@ -6,7 +6,7 @@
+ bindir=$(DESTDIR)@bindir@
+ mandir=$(DESTDIR)@mandir@
+ resdir=$(DESTDIR)@resdir@
+-fontdir=$(DESTDIR)/usr/X11R6/lib/X11/fonts/misc
++fontdir=$(DESTDIR)$(prefix)/lib/X11/fonts/misc
+ config=@x11conf@/xawtvrc
+ 
+ # programs
diff -ruN xawtv-old/files/patch-font::Makefile.in xawtv/files/patch-font::Makefile.in
--- xawtv-old/files/patch-font::Makefile.in	Tue Mar 20 04:12:55 2001
+++ xawtv/files/patch-font::Makefile.in	Sun Sep  2 12:02:54 2001
@@ -1,9 +1,10 @@
---- font/Makefile.in.orig	Sat Mar  3 22:50:32 2001
-+++ font/Makefile.in		Sat Mar  3 22:50:44 2001
-@@ -16,7 +16,6 @@
+--- font/Makefile.in.orig	Sun Sep  2 12:01:30 2001
++++ font/Makefile.in	Sun Sep  2 12:01:45 2001
+@@ -23,7 +23,6 @@
  	done
- 	if test "$(ROOT)" = ""; then		\
- 		(cd $(FONTDIR); mkfontdir);	\
--		xset fp rehash;			\
- 		true;				\
+ 	if test "$(DESTDIR)" = ""; then		\
+ 		(cd $(fontdir); mkfontdir);	\
+-		xset fp rehash || true;		\
  	fi
+ 
+ 
diff -ruN xawtv-old/files/patch-src::Makefile.in xawtv/files/patch-src::Makefile.in
--- xawtv-old/files/patch-src::Makefile.in	Thu Jan  1 01:00:00 1970
+++ xawtv/files/patch-src::Makefile.in	Sun Sep  2 14:51:51 2001
@@ -0,0 +1,26 @@
+--- src/Makefile.in.orig	Thu Aug  2 15:26:58 2001
++++ src/Makefile.in	Sun Sep  2 14:49:20 2001
+@@ -112,12 +112,11 @@
+ install-dirs:
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(resdir)/app-defaults
+-	$(INSTALL_DIR) $(resdir)/de/app-defaults
+ 
+ install-common:
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(resdir)/app-defaults
+-	$(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
++	$(INSTALL_DATA) $(srcdir)/subtitles $(bindir)
+ 	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
+ 	$(INSTALL_PROGRAM) -s streamer $(bindir)
+ 	$(INSTALL_PROGRAM) -s v4lctl $(bindir)
+@@ -127,9 +126,6 @@
+ 	$(INSTALL_DATA) $(srcdir)/Xawtv.ad $(resdir)/app-defaults/Xawtv
+ 
+ install-motv:
+-	$(INSTALL_PROGRAM) -s motv $(bindir)
+-	$(INSTALL_DATA) MoTV.ad $(resdir)/app-defaults/MoTV
+-	$(INSTALL_DATA) MoTV.de.ad $(resdir)/de/app-defaults/MoTV
+ 
+ install-ttv:
+ 	$(INSTALL_PROGRAM) -s ttv $(bindir)
diff -ruN xawtv-old/pkg-descr xawtv/pkg-descr
--- xawtv-old/pkg-descr	Tue Mar 20 04:12:55 2001
+++ xawtv/pkg-descr	Sun Sep  2 11:31:52 2001
@@ -1,7 +1,7 @@
 This is a _simple_ xaw-based TV Program which uses the bttv driver or
 video4linux (included in 2.1.x).  Copy Policy is GNU GPL.
 
-WWW: http://www.strusel007.de/linux/xawtv/
+WWW: http://bytesex.org/xawtv/
 
 - George Reid
 greid@ukug.uk.freebsd.org
diff -ruN xawtv-old/pkg-plist xawtv/pkg-plist
--- xawtv-old/pkg-plist	Tue Mar 20 04:12:55 2001
+++ xawtv/pkg-plist	Sun Sep  2 14:53:15 2001
@@ -1,16 +1,19 @@
 bin/alevtd
 bin/dump-mixers
+bin/ntsc-cc
 bin/propwatch
 bin/record
 bin/rootv
 bin/scantv
 bin/showriff
 bin/streamer
+bin/subtitles
+bin/ttv
 bin/v4lctl
 bin/webcam
 bin/xawtv
 bin/xawtv-remote
 lib/X11/app-defaults/Xawtv
-lib/X11/fonts/misc/led-koi8.pcf.gz
-lib/X11/fonts/misc/led-latin1.pcf.gz
-lib/X11/fonts/misc/led-latin2.pcf.gz
+lib/X11/fonts/misc/led-iso8859-1.pcf.gz
+lib/X11/fonts/misc/led-iso8859-2.pcf.gz
+lib/X11/fonts/misc/led-koi8-r.pcf.gz

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109021311.f82DBgx43532>