- lincese

- Add missing USES=jpeg
- Regenerate patches

14 files changed, 35 insertions, 34 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index c08566417646..8ad15992298f 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -3,19 +3,21 @@
 
 PORTNAME=	fxtv
 PORTVERSION=	1.03
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/sanpei
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11-based TV display and capture application (for use with bt848 driver)
 
-ONLY_FOR_ARCHS=	i386 ia64 amd64
+LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libXaw3d.so:x11-toolkits/Xaw3d
 
-USES=		gmake tar:tgz
+ONLY_FOR_ARCHS=	i386 ia64 amd64
+
+USES=		gmake jpeg tar:tgz
 MAKE_ENV=	X11BASE=${LOCALBASE}
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga
 MAKE_FLAGS=	-e
@@ -31,6 +33,6 @@ EXTRA_RUN_DEPENDS=	sox:audio/sox \
 			mplex:multimedia/mplex
 
 pre-install:
-	${CP} -p ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man
+	@${CP} -p ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man
 
 .include <bsd.port.mk>
diff --git a/multimedia/fxtv/files/patch-Makefile b/multimedia/fxtv/files/patch-Makefile
index 3d28cc2249a4..45825a18d110 100644
--- a/multimedia/fxtv/files/patch-Makefile
+++ b/multimedia/fxtv/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Feb 13 09:08:59 2001
-+++ Makefile	Sat Mar 10 17:36:25 2001
+--- Makefile.orig	2001-02-12 22:08:59 UTC
++++ Makefile
 @@ -62,7 +62,7 @@ endif
  ifneq ($(DEBUG),NO)
    override CFLAGS          = -DDEBUG -g
diff --git a/multimedia/fxtv/files/patch-app_rsrc.h b/multimedia/fxtv/files/patch-app_rsrc.h
index 275df30b01ea..5d7f5090820c 100644
--- a/multimedia/fxtv/files/patch-app_rsrc.h
+++ b/multimedia/fxtv/files/patch-app_rsrc.h
@@ -1,4 +1,4 @@
---- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
+--- app_rsrc.h.orig	2001-02-12 21:17:53 UTC
 +++ app_rsrc.h
 @@ -525,96 +525,95 @@ static XtResource Resources[] = {
  };
diff --git a/multimedia/fxtv/files/patch-haup__remote.c b/multimedia/fxtv/files/patch-haup__remote.c
index f9e31585ba01..b70eef2ce64e 100644
--- a/multimedia/fxtv/files/patch-haup__remote.c
+++ b/multimedia/fxtv/files/patch-haup__remote.c
@@ -1,4 +1,4 @@
---- haup_remote.c.orig
+--- haup_remote.c.orig	2000-05-21 15:10:04 UTC
 +++ haup_remote.c
 @@ -38,9 +38,16 @@
  #include <sys/fcntl.h>
diff --git a/multimedia/fxtv/files/patch-pixelview__remote.c b/multimedia/fxtv/files/patch-pixelview__remote.c
index 9bd6c5045a24..a442fe07eab9 100644
--- a/multimedia/fxtv/files/patch-pixelview__remote.c
+++ b/multimedia/fxtv/files/patch-pixelview__remote.c
@@ -1,4 +1,4 @@
---- pixelview_remote.c.orig
+--- pixelview_remote.c.orig	2000-05-21 15:10:09 UTC
 +++ pixelview_remote.c
 @@ -39,9 +39,16 @@
  #include <sys/fcntl.h>
diff --git a/multimedia/fxtv/files/patch-remote.c b/multimedia/fxtv/files/patch-remote.c
index 8bc5c1c8fb3c..ddf8838bb884 100644
--- a/multimedia/fxtv/files/patch-remote.c
+++ b/multimedia/fxtv/files/patch-remote.c
@@ -1,5 +1,5 @@
---- remote.c.orig	Sat Sep  7 16:54:12 2002
-+++ remote.c	Sat Sep  7 16:54:24 2002
+--- remote.c.orig	2001-02-12 21:05:08 UTC
++++ remote.c
 @@ -65,7 +65,7 @@
  /*      ******************** Local defines                ************** */
  
diff --git a/multimedia/fxtv/files/patch-tvcapture.c b/multimedia/fxtv/files/patch-tvcapture.c
index 24be3e89fa00..37a0902a1f69 100644
--- a/multimedia/fxtv/files/patch-tvcapture.c
+++ b/multimedia/fxtv/files/patch-tvcapture.c
@@ -1,4 +1,4 @@
---- tvcapture.c.orig
+--- tvcapture.c.orig	2001-02-12 18:59:22 UTC
 +++ tvcapture.c
 @@ -34,11 +34,18 @@
  #include <stdlib.h>
diff --git a/multimedia/fxtv/files/patch-tvcapture.h b/multimedia/fxtv/files/patch-tvcapture.h
index d38db09ce1b3..1908a31c3fdc 100644
--- a/multimedia/fxtv/files/patch-tvcapture.h
+++ b/multimedia/fxtv/files/patch-tvcapture.h
@@ -1,4 +1,4 @@
---- tvcapture.h.orig
+--- tvcapture.h.orig	2001-02-12 18:57:43 UTC
 +++ tvcapture.h
 @@ -34,8 +34,14 @@
  #include <X11/Intrinsic.h>
diff --git a/multimedia/fxtv/files/patch-tvmenu.c b/multimedia/fxtv/files/patch-tvmenu.c
index d21ff995ded8..3030f018c84e 100644
--- a/multimedia/fxtv/files/patch-tvmenu.c
+++ b/multimedia/fxtv/files/patch-tvmenu.c
@@ -1,6 +1,6 @@
---- tvmenu.c.orig	Mon Feb 12 22:19:33 2001
-+++ tvmenu.c	Sun Nov 27 01:55:24 2005
-@@ -552,7 +552,7 @@
+--- tvmenu.c.orig	2001-02-12 21:19:33 UTC
++++ tvmenu.c
+@@ -552,7 +552,7 @@ static void TVTOOLSUpdateStationPopup()
      Widget popup_win, new_popup_item = NULL;
      Cardinal num_children, i;
      WidgetList children;
@@ -9,7 +9,7 @@
  #ifdef FIXME
      Pixmap pix;
  #endif
-@@ -589,7 +589,7 @@
+@@ -589,7 +589,7 @@ static void TVTOOLSUpdateStationPopup()
  
          XtVaSetValues(children[i], XtNleftBitmap, pix, NULL);
  #else
diff --git a/multimedia/fxtv/files/patch-tvscreen.c b/multimedia/fxtv/files/patch-tvscreen.c
index d9637b830f7f..1e3d12368400 100644
--- a/multimedia/fxtv/files/patch-tvscreen.c
+++ b/multimedia/fxtv/files/patch-tvscreen.c
@@ -1,6 +1,6 @@
---- tvscreen.c.ORI	Sun May 21 15:49:47 2000
-+++ tvscreen.c	Wed Jun  7 10:19:30 2006
-@@ -480,6 +480,9 @@
+--- tvscreen.c.orig	2000-05-21 13:49:47 UTC
++++ tvscreen.c
+@@ -480,6 +480,9 @@ void TVSCREENInit( TV_XSCREEN *s,
      dga_avail = FALSE;
  
  #ifdef HAVE_XFREE86
@@ -10,4 +10,3 @@
      if ( !XUTILXServerIsLocal( TVDISPLAY ) )
          SUPRINTF(( "XF86DGA not available...X Server isn't local.\n" ));
      else {
-
diff --git a/multimedia/fxtv/files/patch-videolib_Makefile b/multimedia/fxtv/files/patch-videolib_Makefile
index 393b25bf1dc1..dfd466bfa46b 100644
--- a/multimedia/fxtv/files/patch-videolib_Makefile
+++ b/multimedia/fxtv/files/patch-videolib_Makefile
@@ -1,6 +1,6 @@
---- videolib/Makefile.orig	Tue Feb 13 06:04:45 2001
-+++ videolib/Makefile	Sat Mar 10 17:39:59 2001
-@@ -15,7 +15,7 @@
+--- videolib/Makefile.orig	2001-02-12 19:04:45 UTC
++++ videolib/Makefile
+@@ -15,7 +15,7 @@ override INC               = 
  ifneq ($(DEBUG),NO)
    override CFLAGS          = -DDEBUG -g
  else
diff --git a/multimedia/fxtv/files/patch-videolib_videolib.c b/multimedia/fxtv/files/patch-videolib_videolib.c
index 4da6856d39c8..69358e466845 100644
--- a/multimedia/fxtv/files/patch-videolib_videolib.c
+++ b/multimedia/fxtv/files/patch-videolib_videolib.c
@@ -1,6 +1,6 @@
---- videolib/videolib.c.orig	1999-11-03 03:22:04.000000000 +0100
-+++ videolib/videolib.c	2007-09-05 18:31:05.000000000 +0200
-@@ -479,9 +479,8 @@
+--- videolib/videolib.c.orig	1999-11-03 02:22:04 UTC
++++ videolib/videolib.c
+@@ -479,9 +479,8 @@ static void VIDEOLIBConvertRGBToRGB( VL_
              *(p++) = (*src16 >> 8) | (*src16 << 8);
              src16++;
            }
@@ -12,7 +12,7 @@
          }
  
          src16 = dst_line = (VL_UINT16 *) dst->buf;
-@@ -513,9 +512,9 @@
+@@ -513,9 +512,9 @@ static void VIDEOLIBConvertRGBToRGB( VL_
          if ( src_padded ) 
            src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
          else
@@ -25,7 +25,7 @@
        }
  
        if ( !dst_swap_b ) {                       /*  More ugliness  */
-@@ -527,8 +526,8 @@
+@@ -527,8 +526,8 @@ static void VIDEOLIBConvertRGBToRGB( VL_
              *(p++) = (*src16 >> 8) | (*src16 << 8);
              src16++;
            }
diff --git a/multimedia/fxtv/files/patch-voxware.h b/multimedia/fxtv/files/patch-voxware.h
index cecee252f3a3..4f377f921dd4 100644
--- a/multimedia/fxtv/files/patch-voxware.h
+++ b/multimedia/fxtv/files/patch-voxware.h
@@ -1,5 +1,5 @@
---- voxware.h.orig	Sat Sep  7 16:51:45 2002
-+++ voxware.h	Sat Sep  7 16:51:58 2002
+--- voxware.h.orig	2000-10-23 02:44:03 UTC
++++ voxware.h
 @@ -30,9 +30,7 @@
  #ifndef __VOXWARE_H
  #define __VOXWARE_H
diff --git a/multimedia/fxtv/files/patch-xutil.c b/multimedia/fxtv/files/patch-xutil.c
index ae4b0a06c6fc..8b685d11b0ac 100644
--- a/multimedia/fxtv/files/patch-xutil.c
+++ b/multimedia/fxtv/files/patch-xutil.c
@@ -1,6 +1,6 @@
---- ./xutil.c.orig	Fri Nov  5 09:38:54 1999
-+++ ./xutil.c	Tue Oct  9 03:41:54 2007
-@@ -1500,8 +1500,10 @@
+--- xutil.c.orig	1999-11-05 00:38:54 UTC
++++ xutil.c
+@@ -1500,8 +1500,10 @@ void XUTILDetermineFrameBufferVisual( Di
      /**********************************************************************/
  
      vinfo_pref.screen = screen;