- Update to 1.2.1

- Pass maintainership to submitter

PR:		108227
Submitted by:	Danny Pansters <danny@ricin.com>

4 files changed, 26 insertions, 29 deletions

diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile
index 10e5bd8624ee..5d157401ae19 100644
--- a/multimedia/kbtv/Makefile
+++ b/multimedia/kbtv/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	kbtv
-DISTVERSION=	1.1.3
+DISTVERSION=	1.2.1
 CATEGORIES=	multimedia python kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://freebsd.ricin.com/ports/distfiles/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tbz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danny@ricin.com
 COMMENT=	KDE TV viewer for FreeBSD
 
 RUN_DEPENDS=	kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
@@ -25,20 +26,20 @@ USE_PYTHON=	yes
 USE_SDL=	sdl
 INSTALLS_ICONS=	yes
 
-OPTIONS=	PWC "Philips and compatible cameras" off \
-		SAA "Philips SAA713x TV cards" off \
-		SAA_TUNER_PHILIPS "SAA with Philips tuner API" on \
+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
+		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 D/K standard" off \
+		SAA_STD_PAL_L         "SAA with PAL L standard" off \
+		SAA_STD_PAL_LACCENT   "SAA with PAL 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>
 
@@ -47,9 +48,7 @@ OPTIONS=	PWC "Philips and compatible cameras" off \
 IGNORE=		kernel sources required for pwc
 .endif
 PLIST_SUB+=	PWC=""
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
-		/boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
+RUN_DEPENDS+=	/boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
 .else
 PLIST_SUB+=	PWC="@comment "
 .endif
@@ -133,7 +132,9 @@ do-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC} && ${MKDIR} ${DOCSDIR} && \
-	    ${INSTALL_DATA} README NEWS ${DOCSDIR}
+	    ${INSTALL_DATA} README NEWS ${DOCSDIR} && \
+	    ${ECHO} "README -> ${DOCSDIR}/README" && \
+	    ${ECHO} "NEWS -> ${DOCSDIR}/NEWS"
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/multimedia/kbtv/distinfo b/multimedia/kbtv/distinfo
index 964adcc33d89..b4dca44f12e4 100644
--- a/multimedia/kbtv/distinfo
+++ b/multimedia/kbtv/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbtv-1.1.3.tbz) = 5dc7a08cb1c71a4f9e9ebb38df4856c6
-SHA256 (kbtv-1.1.3.tbz) = 9f3ec2dee35058873cb96f40466d9f238c702614e6903cea70d68646eac890aa
-SIZE (kbtv-1.1.3.tbz) = 764412
+MD5 (kbtv-1.2.1.tbz) = bc31bba192ee05ab169213750bf03394
+SHA256 (kbtv-1.2.1.tbz) = 1968d96927452a0cd37220860695cf84525508b2f673fa9f54fb8153f1fd6d65
+SIZE (kbtv-1.2.1.tbz) = 756317
diff --git a/multimedia/kbtv/pkg-message b/multimedia/kbtv/pkg-message
index 46eb9fbfcbd8..4562b6f065cf 100644
--- a/multimedia/kbtv/pkg-message
+++ b/multimedia/kbtv/pkg-message
@@ -8,12 +8,12 @@ operator group, not wheel), group membership, and if needed sysctls.
 Consult the README on how to use btsetup. For the impatient: on the 
 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.
+adduser command. Use 'show' to see current status, 'help' when lost.
 
 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.
+README first. Your feedback is welcome. I hope you enjoy using kbtv!
 ====================================================================
diff --git a/multimedia/kbtv/pkg-plist b/multimedia/kbtv/pkg-plist
index 0eeaec71eea5..f3789ac7a54e 100644
--- a/multimedia/kbtv/pkg-plist
+++ b/multimedia/kbtv/pkg-plist
@@ -1,6 +1,4 @@
-bin/btviewer
 bin/kbtv
-%%SAA%%bin/saaviewer
 sbin/btsetup
 share/applications/kde/kbtv.desktop
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -10,8 +8,6 @@ share/apps/kbtv/_bt848.so
 %%SAA%%share/apps/kbtv/_saa.so
 share/apps/kbtv/bt848.py
 share/apps/kbtv/bt848.pyc
-share/apps/kbtv/btbackend.py
-share/apps/kbtv/btbackend.pyc
 share/apps/kbtv/btchannels.py
 share/apps/kbtv/btchannels.pyc
 share/apps/kbtv/btcopyright.py