- Update to 1.1.3

PR:		ports/101034
Submitted by:	Danny Pansters <danny at ricin.com> (maintainer)

3 files changed, 45 insertions, 23 deletions

diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile
index 7e5c2752fab3..c23357645655 100644
--- a/multimedia/kbtv/Makefile
+++ b/multimedia/kbtv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kbtv
-DISTVERSION=	1.1.1
+DISTVERSION=	1.1.3
 CATEGORIES=	multimedia python kde
 MASTER_SITES=	http://freebsd.ricin.com/ports/distfiles/
 EXTRACT_SUFX=	.tbz
@@ -15,7 +15,8 @@ MAINTAINER=	danny@ricin.com
 COMMENT=	KDE TV viewer for FreeBSD
 
 RUN_DEPENDS=	kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
-BUILD_DEPENDS=	${RUN_DEPENDS} swig1.3:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13 \
+		kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
@@ -23,15 +24,20 @@ USE_PYTHON=	yes
 USE_SDL=	sdl
 INSTALLS_ICONS=	yes
 
-OPTIONS=	PWC "Philips & compatible cameras (pwc)" off \
-		SAA "Philips SAA713x based TV cards (saa)" off \
-		SAA_TUNER_PHILIPS "Philips tuner API" on \
-		SAA_TUNER_PHILIPS_MK3 "Philips MK3 tuner API" off \
-		SAA_TUNER_ALPS "Alps tuner API" off \
-		SAA_TUNER_LG "LG tuner API" off \
-		SAA_TUNER_TEMIC "Temic tuner API" off \
-		SAA_TUNER_NTSC "NTSC tuner standard (default PAL)" off \
-		SAA_TUNER_0xC2 "IIC read address 0xc2 (default 0xc0)" off
+OPTIONS=	PWC "Philips and compatible cameras" off \
+		SAA "Philips SAA713x TV cards" off \
+		SAA_TUNER_PHILIPS "SAA with Philips tuner API" on \
+		SAA_TUNER_PHILIPS_MK3 "SAA with Philips MK3 tuner API" off \
+		SAA_TUNER_ALPS "SAA with Alps tuner API" off \
+		SAA_TUNER_LG "SAA with LG tuner API" off \
+		SAA_TUNER_TEMIC "SAA with Temic tuner API" off \
+		SAA_STD_PAL_B_G "SAA with PAL B/G standard" on \
+		SAA_STD_PAL_I "SAA with PAL I standard" off \
+		SAA_STD_PAL_D_K "SAA with PAL/SECAM D/K standard" off \
+		SAA_STD_PAL_L "SAA with PAL/SECAM L standard" off \
+		SAA_STD_PAL_LACCENT "SAA with PAL/SECAM L' standard" off \
+		SAA_STD_NTSC "SAA with NTSC N/M standard" off \
+		SAA_STD_NTSC_JAPAN "SAA with NTSC Japan standard" off
 
 .include <bsd.port.pre.mk>
 
@@ -90,14 +96,31 @@ post-patch:
 		's|SAA_TUNER = SAA_TUNER_PHILIPS|SAA_TUNER = SAA_TUNER_TEMIC|' \
 		${WRKSRC}/buildprefs.py
 .endif
-.if defined(WITH_SAA_TUNER_NTSC)
+.endif
+.if defined(WITHOUT_SAA_STD_PAL_B_G)
+.if defined(WITH_SAA_STD_PAL_I)
 	@${REINPLACE_CMD} -e \
-		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL|SAA_TUNER_STD = SAA_TUNER_STD_NTSC|' \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_PAL_I|' \
 		${WRKSRC}/buildprefs.py
-.endif
-.if defined(WITH_SAA_TUNER_0xC2)
+.elif defined(WITH_SAA_STD_PAL_D_K)
+	@${REINPLACE_CMD} -e \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_PAL_D_K|' \
+		${WRKSRC}/buildprefs.py
+.elif defined(WITH_SAA_STD_PAL_L)
+	@${REINPLACE_CMD} -e \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_PAL_L|' \
+		${WRKSRC}/buildprefs.py
+.elif defined(WITH_SAA_STD_PAL_LACCENT)
+	@${REINPLACE_CMD} -e \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_PAL_LACCENT|' \
+		${WRKSRC}/buildprefs.py
+.elif defined(WITH_SAA_STD_NTSC)
+	@${REINPLACE_CMD} -e \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_NTSC|' \
+		${WRKSRC}/buildprefs.py
+.elif defined(WITH_SAA_STD_NTSC_JAPAN)
 	@${REINPLACE_CMD} -e \
-		's|SAA_TUNER_IIC = SAA_IIC_0xC0|SAA_TUNER_IIC = SAA_IIC_0xC2|' \
+		's|SAA_TUNER_STD = SAA_TUNER_STD_PAL_B_G|SAA_TUNER_STD = SAA_TUNER_STD_NTSC_JAPAN|' \
 		${WRKSRC}/buildprefs.py
 .endif
 .endif
diff --git a/multimedia/kbtv/distinfo b/multimedia/kbtv/distinfo
index eac8c0962b81..964adcc33d89 100644
--- a/multimedia/kbtv/distinfo
+++ b/multimedia/kbtv/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbtv-1.1.1.tbz) = 4d1216e79e7a60f7c43faeb4c8e310d1
-SHA256 (kbtv-1.1.1.tbz) = 71f48605219076cc85e0e4479fc02477b9774a16a794fe4083427e44b11b5a62
-SIZE (kbtv-1.1.1.tbz) = 761073
+MD5 (kbtv-1.1.3.tbz) = 5dc7a08cb1c71a4f9e9ebb38df4856c6
+SHA256 (kbtv-1.1.3.tbz) = 9f3ec2dee35058873cb96f40466d9f238c702614e6903cea70d68646eac890aa
+SIZE (kbtv-1.1.3.tbz) = 764412
diff --git a/multimedia/kbtv/pkg-message b/multimedia/kbtv/pkg-message
index 7d3ae15362d3..46eb9fbfcbd8 100644
--- a/multimedia/kbtv/pkg-message
+++ b/multimedia/kbtv/pkg-message
@@ -10,11 +10,10 @@ btsetup prompt you first issue kldload commands if needed, then
 sysctl commands if needed, then the commit command, and finally the 
 adduser command. Use show to see current status, help when lost.
 
-For BrookTree/Conexant BT8x8 you need to load the bktr module, for 
-Philips SAA713x you need to load the saa module, for Philips and 
-compatible USB cameras you need to load the pwc module.
+For BrookTree/Conexant BT8x8 the bktr module should be loaded, for 
+Philips SAA713x the saa module should be loaded, for Philips and 
+compatible USB cameras the pwc module should be loaded.
 
 If you're having trouble, please look at the (KDE) documentation and
 the README first, before asking me. Thanks.
 ====================================================================
-