From f6824d9c4c2d8563e3df2288e37f2fd50325aa3b Mon Sep 17 00:00:00 2001
From: Patrick Li <pat@FreeBSD.org>
Date: Wed, 1 Jan 2003 20:16:18 +0000
Subject: Update to 3.82

PR:		ports/46610
Submitted by:	maintainer
---
 multimedia/xawtv/Makefile                | 14 ++++++--------
 multimedia/xawtv/distinfo                |  2 +-
 multimedia/xawtv/files/patch-Makefile.in |  9 ---------
 multimedia/xawtv/pkg-plist               |  2 ++
 4 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'multimedia/xawtv')

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 1704a23a458c..ae8ee83bd733 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	xawtv
-PORTVERSION=	3.79
+PORTVERSION=	3.82
 CATEGORIES=	graphics
 MASTER_SITES=	http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	lehmann@ans-netz.de
 
+BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -26,6 +27,8 @@ USE_XPM=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
+MAKE_ENV=	verbose=yes
+
 FILES_LIBJPEG=	console/Subdir.mk debug/Subdir.mk x11/Subdir.mk
 
 MAN1=		alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \
@@ -37,19 +40,14 @@ MAN8=		v4l-conf.8
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 PLIST_SUB+=	X11PREFIX=${X11BASE}
 
 post-patch:
-	${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \
+	@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \
 		-e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
 
 .for i in ${FILES_LIBJPEG}
-	${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
+	@${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo
index 9fc6d01b2c0b..a9c55745a896 100644
--- a/multimedia/xawtv/distinfo
+++ b/multimedia/xawtv/distinfo
@@ -1 +1 @@
-MD5 (xawtv_3.79.tar.gz) = 351caf310fd7b9328c2c422304f56d6d
+MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a
diff --git a/multimedia/xawtv/files/patch-Makefile.in b/multimedia/xawtv/files/patch-Makefile.in
index 53ca4faf5118..805ffff12195 100644
--- a/multimedia/xawtv/files/patch-Makefile.in
+++ b/multimedia/xawtv/files/patch-Makefile.in
@@ -22,12 +22,3 @@
  # libraries
  LDLIBS  := @LDLIBS@
  
-@@ -131,7 +120,7 @@
- ar_lib		= rm -f $@ && ar -r $@ $^ && ranlib $@
- 
- # non-verbose output
--VERBOSE		= no
-+VERBOSE		= yes
- ifeq ($(VERBOSE),yes)
- echo_compile_c	= echo $(compile_c)
- echo_compile_cc	= echo $(compile_cc)
diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist
index 57af63038b35..9027503a413f 100644
--- a/multimedia/xawtv/pkg-plist
+++ b/multimedia/xawtv/pkg-plist
@@ -59,6 +59,7 @@ share/xawtv/ntsc-cable-ca.list
 share/xawtv/ntsc-cable-jp.list
 share/xawtv/ntsc-cable.list
 share/xawtv/ntsc-hrc.list
+share/xawtv/oirt-h.list
 share/xawtv/oirt-i-iii.list
 share/xawtv/oirt-sl-sh.list
 share/xawtv/pal-australia-optus.list
@@ -69,6 +70,7 @@ share/xawtv/pal-ireland.list
 share/xawtv/pal-italy.list
 share/xawtv/pal-newzealand.list
 share/xawtv/secam-france.list
+share/xawtv/secam-russia.list
 share/xawtv/uhf.list
 @dirrm share/xawtv
 @cwd %%X11BASE%%
-- 
cgit v1.2.3