remove multimedia/tvtime

code rot means this hasn't built for ages, newer releases are linux-only

18 files changed, 1 insertions, 521 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 971a72d0bf9..a958559a909 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2021/03/09 08:27:18 nia Exp $
+# $NetBSD: Makefile,v 1.311 2021/04/13 08:31:21 nia Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -203,7 +203,6 @@ SUBDIR+=	totem
 SUBDIR+=	totem-pl-parser
 SUBDIR+=	transcode
 SUBDIR+=	tstools
-SUBDIR+=	tvtime
 SUBDIR+=	vlc
 SUBDIR+=	win32-codecs
 SUBDIR+=	x264-devel
diff --git a/multimedia/tvtime/DESCR b/multimedia/tvtime/DESCR
deleted file mode 100644
index e59b65d65f9..00000000000
--- a/multimedia/tvtime/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-tvtime is a high quality television application for use with video capture
-cards. tvtime processes the input from a capture card and displays it on a
-computer monitor or projector.
diff --git a/multimedia/tvtime/Makefile b/multimedia/tvtime/Makefile
deleted file mode 100644
index 4dc22ae789d..00000000000
--- a/multimedia/tvtime/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2021/01/09 02:24:40 mef Exp $
-
-DISTNAME=	tvtime-1.0.2
-PKGREVISION=	11
-CATEGORIES=	multimedia x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tvtime/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tvtime.sourceforge.net/
-COMMENT=	High quality television application
-LICENSE=	gnu-gpl-v2 AND mit AND gnu-lgpl-v2
-
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++03 gnu++11
-USE_LIBTOOL=		yes
-USE_TOOLS+=		msgfmt aclocal automake autoconf
-
-INSTALLATION_DIRS=	share/examples/tvtime
-
-CONF_FILES=	share/examples/tvtime/tvtime.xml ${PKG_SYSCONFDIR}/tvtime.xml
-
-pre-configure:
-	(cd ${WRKSRC} && autoreconf -vif) || echo Ignore the warnings from autoreconf
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/tvtime/PLIST b/multimedia/tvtime/PLIST
deleted file mode 100644
index c31bf725ade..00000000000
--- a/multimedia/tvtime/PLIST
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2011/03/29 08:34:58 wiz Exp $
-bin/tvtime
-bin/tvtime-command
-bin/tvtime-configure
-bin/tvtime-scanner
-man/de/man1/tvtime-command.1
-man/de/man1/tvtime-configure.1
-man/de/man1/tvtime-scanner.1
-man/de/man1/tvtime.1
-man/de/man5/stationlist.xml.5
-man/de/man5/tvtime.xml.5
-man/es/man1/tvtime-command.1
-man/es/man1/tvtime-configure.1
-man/es/man1/tvtime-scanner.1
-man/es/man1/tvtime.1
-man/es/man5/stationlist.xml.5
-man/es/man5/tvtime.xml.5
-man/man1/tvtime-command.1
-man/man1/tvtime-configure.1
-man/man1/tvtime-scanner.1
-man/man1/tvtime.1
-man/man5/stationlist.xml.5
-man/man5/tvtime.xml.5
-share/applications/net-tvtime.desktop
-share/examples/tvtime/tvtime.xml
-share/icons/hicolor/16x16/apps/tvtime.png
-share/icons/hicolor/32x32/apps/tvtime.png
-share/icons/hicolor/48x48/apps/tvtime.png
-share/locale/cs/LC_MESSAGES/tvtime.mo
-share/locale/de/LC_MESSAGES/tvtime.mo
-share/locale/es/LC_MESSAGES/tvtime.mo
-share/locale/fi/LC_MESSAGES/tvtime.mo
-share/locale/fr/LC_MESSAGES/tvtime.mo
-share/locale/hu/LC_MESSAGES/tvtime.mo
-share/locale/ko/LC_MESSAGES/tvtime.mo
-share/locale/nl/LC_MESSAGES/tvtime.mo
-share/locale/nn/LC_MESSAGES/tvtime.mo
-share/locale/pl/LC_MESSAGES/tvtime.mo
-share/locale/pt/LC_MESSAGES/tvtime.mo
-share/locale/ru/LC_MESSAGES/tvtime.mo
-share/locale/sv/LC_MESSAGES/tvtime.mo
-share/pixmaps/tvtime.png
-share/pixmaps/tvtime.xpm
-share/tvtime/FreeMonoBold.ttf
-share/tvtime/filmstrip_0000.png
-share/tvtime/filmstrip_0001.png
-share/tvtime/filmstrip_0002.png
-share/tvtime/filmstrip_0003.png
-share/tvtime/filmstrip_0004.png
-share/tvtime/infoicon_0000.png
-share/tvtime/tvtimeSansBold.ttf
diff --git a/multimedia/tvtime/distinfo b/multimedia/tvtime/distinfo
deleted file mode 100644
index 3b47100e866..00000000000
--- a/multimedia/tvtime/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:54:33 agc Exp $
-
-SHA1 (tvtime-1.0.2.tar.gz) = ea609876084b2d627a84a1f77bf81cc2175ee58e
-RMD160 (tvtime-1.0.2.tar.gz) = e7d9621054edba5833f4ea002be8979983fbf3dc
-SHA512 (tvtime-1.0.2.tar.gz) = d62d6b351c08cab56a7589b8c0b40208acc34f8baf1d312ebf6eed0f079502e1fee5ec0cbdb15c4251d9d2ea1845380db07b253348263b6cb7daf5d1038c61ff
-Size (tvtime-1.0.2.tar.gz) = 1645742 bytes
-SHA1 (patch-aa) = dd2f2dbda25704ed249f8da8c2d6e5832d09826e
-SHA1 (patch-ab) = 94adf60aa7ebc1eb20934542fc6a0a6aadcb4caa
-SHA1 (patch-ac) = 817366537bab0364e7fa994b96f6591b8208f1ce
-SHA1 (patch-ad) = f1e8bc7deb6638676ff24ad9ab85ff9e2749adbc
-SHA1 (patch-ae) = 8abb4a7cc0cbaa41da060c89d3c230b1b0c2a005
-SHA1 (patch-af) = 4aef2ec42fe627b108e5565db5337c4f01e99bb1
-SHA1 (patch-ag) = 1872b404615f54736b5cc143fb4f783d3f2e6709
-SHA1 (patch-ah) = eba4315dc77956fcbe648c0d3b2ee1c6e9046334
-SHA1 (patch-ai) = 7349a2b69c4c7a444311d05b1e12b2d6f330353d
-SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254
-SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c
-SHA1 (patch-al) = b183822cff1f5b022e0509b33299f7b99ab57442
-SHA1 (patch-src_xmltv.c) = ba107c28eacb6967918cb074a23354eb6c2d2ea6
diff --git a/multimedia/tvtime/patches/patch-aa b/multimedia/tvtime/patches/patch-aa
deleted file mode 100644
index 08d919c4559..00000000000
--- a/multimedia/tvtime/patches/patch-aa
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/rtctimer.c.orig	2003-10-27 09:49:39.000000000 -0500
-+++ src/rtctimer.c
-@@ -27,7 +27,9 @@
- #include <fcntl.h>
- #include <math.h>
- #include <sys/ioctl.h>
-+#ifdef __linux__
- #include <linux/rtc.h>
-+#endif
- #include "rtctimer.h"
- 
- struct rtctimer_s
-@@ -41,6 +43,7 @@ struct rtctimer_s
- 
- rtctimer_t *rtctimer_new( int verbose )
- {
-+#ifdef __linux__
-     rtctimer_t *rtctimer = malloc( sizeof( rtctimer_t ) );
-     if( !rtctimer ) return 0;
- 
-@@ -74,17 +77,23 @@ rtctimer_t *rtctimer_new( int verbose )
-     rtctimer->current_hz = 0;
-     rtctimer->usecs = 0;
-     return rtctimer;
-+#else
-+    return NULL;
-+#endif
- }
- 
- void rtctimer_delete( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     rtctimer_stop_clock( rtctimer );
-     close( rtctimer->rtc_fd );
-     free( rtctimer );
-+#endif
- }
- 
- int rtctimer_next_tick( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     unsigned long rtc_data;
-     struct pollfd pfd;
-     pfd.fd = rtctimer->rtc_fd;
-@@ -108,11 +117,13 @@ again:
-     }
- 
-     read( rtctimer->rtc_fd, &rtc_data, sizeof( rtc_data ) );
-+#endif
-     return 1;
- }
- 
- int rtctimer_set_interval( rtctimer_t *rtctimer, int hz )
- {
-+#ifdef __linux__
-     int restart;
- 
-     if( hz == rtctimer->current_hz ) {
-@@ -136,11 +147,13 @@ int rtctimer_set_interval( rtctimer_t *r
-         rtctimer_start_clock( rtctimer );
-     }
- 
-+#endif
-     return 1;
- }
- 
- int rtctimer_start_clock( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     if( !rtctimer->rtc_running ) {
-         if( ioctl( rtctimer->rtc_fd, RTC_PIE_ON, 0 ) < 0 ) {
-             if( rtctimer->verbose ) {
-@@ -152,10 +165,12 @@ int rtctimer_start_clock( rtctimer_t *rt
-         rtctimer->rtc_running = 1;
-     }
-     return rtctimer->rtc_running;
-+#endif
- }
- 
- int rtctimer_stop_clock( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     int was_running = rtctimer->rtc_running;
- 
-     if( rtctimer->rtc_running ) {
-@@ -170,16 +185,23 @@ int rtctimer_stop_clock( rtctimer_t *rtc
-     }
- 
-     return was_running;
-+#else
-+    return 0;
-+#endif
- }
- 
- int rtctimer_get_resolution( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     return rtctimer->current_hz;
-+#endif
- }
- 
- int rtctimer_get_usecs( rtctimer_t *rtctimer )
- {
-+#ifdef __linux__
-     return rtctimer->usecs;
-+#endif
- }
- 
- int set_realtime_priority( int max )
diff --git a/multimedia/tvtime/patches/patch-ab b/multimedia/tvtime/patches/patch-ab
deleted file mode 100644
index 942aaf7f358..00000000000
--- a/multimedia/tvtime/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/videodev.h.orig	2003-07-15 18:46:18.000000000 -0400
-+++ src/videodev.h
-@@ -1,7 +1,9 @@
- #ifndef __LINUX_VIDEODEV_H
- #define __LINUX_VIDEODEV_H
- 
-+#ifdef __linux__
- #include <linux/types.h>
-+#endif
- 
- #define VID_TYPE_CAPTURE	1	/* Can capture */
- #define VID_TYPE_TUNER		2	/* Can tune */
diff --git a/multimedia/tvtime/patches/patch-ac b/multimedia/tvtime/patches/patch-ac
deleted file mode 100644
index df925a62eec..00000000000
--- a/multimedia/tvtime/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/videoinput.c.orig	2005-09-07 23:13:37.000000000 -0400
-+++ src/videoinput.c
-@@ -35,8 +35,13 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
-+#ifdef __NetBSD__
-+#include <sys/videoio.h>
-+#include "videodev.h"
-+#else
- #include "videodev.h"
- #include "videodev2.h"
-+#endif
- #include "videoinput.h"
- #include "mixer.h"
- 
-@@ -377,6 +382,7 @@ uint8_t *videoinput_next_frame( videoinp
-         wait_for_frame_v4l2( vidin );
-  
-         cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
-+	cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory;
-         if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
-             /* some drivers return EIO when there is no signal */
-             if( errno != EIO ) {
diff --git a/multimedia/tvtime/patches/patch-ad b/multimedia/tvtime/patches/patch-ad
deleted file mode 100644
index 0ff6c356692..00000000000
--- a/multimedia/tvtime/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/xvoutput.c.orig	2005-08-14 13:35:50.000000000 -0400
-+++ src/xvoutput.c
-@@ -181,6 +181,7 @@ static void *create_shm( int size )
-         return 0;
-     }
- 
-+#ifdef SHM_INFO
-     maxid = shmctl( 0, SHM_INFO, &shm_info );
-     if( maxid < 0 ) {
-         fprintf( stderr, "\n"
-@@ -189,6 +190,7 @@ static void *create_shm( int size )
-           "    tvtime.\n\n" );
-         return 0;
-     }
-+#endif
- 
-     shminfo.shmid = shmget( IPC_PRIVATE, size, IPC_CREAT | 0777 );
-     if( shminfo.shmid != -1 ) {
diff --git a/multimedia/tvtime/patches/patch-ae b/multimedia/tvtime/patches/patch-ae
deleted file mode 100644
index e3a17dfc598..00000000000
--- a/multimedia/tvtime/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- plugins/greedyh.asm.orig	2005-08-14 12:16:43.000000000 -0400
-+++ plugins/greedyh.asm
-@@ -18,7 +18,7 @@
- 
- #include "x86-64_macros.inc"
- 
--void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
-+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
- {
-     int64_t i;
-     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
diff --git a/multimedia/tvtime/patches/patch-af b/multimedia/tvtime/patches/patch-af
deleted file mode 100644
index 539c4d8c778..00000000000
--- a/multimedia/tvtime/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- plugins/tomsmocomp.cpp.orig	2004-10-20 13:38:04.000000000 -0400
-+++ plugins/tomsmocomp.cpp
-@@ -31,7 +31,7 @@ public:
- 
- #define IS_MMX
- #define SSE_TYPE MMX
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
-+#define FUNCT_NAME filterDScaler_MMX
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_MMX
- #undef  SSE_TYPE
-@@ -39,7 +39,7 @@ public:
- 
- #define IS_3DNOW
- #define SSE_TYPE 3DNOW
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
-+#define FUNCT_NAME filterDScaler_3DNOW
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_3DNOW
- #undef  SSE_TYPE
-@@ -47,7 +47,7 @@ public:
- 
- #define IS_SSE
- #define SSE_TYPE SSE
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
-+#define FUNCT_NAME filterDScaler_SSE
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_SSE
- #undef  SSE_TYPE
diff --git a/multimedia/tvtime/patches/patch-ag b/multimedia/tvtime/patches/patch-ag
deleted file mode 100644
index d1f9e09c9dd..00000000000
--- a/multimedia/tvtime/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- plugins/tomsmocomp/TomsMoCompAll2.inc.orig	2004-10-20 11:31:05.000000000 -0400
-+++ plugins/tomsmocomp/TomsMoCompAll2.inc
-@@ -5,9 +5,9 @@
- #endif
- 
- #ifdef USE_STRANGE_BOB
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
- #else
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
- #endif
- 
- int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
diff --git a/multimedia/tvtime/patches/patch-ah b/multimedia/tvtime/patches/patch-ah
deleted file mode 100644
index debfa1cfe42..00000000000
--- a/multimedia/tvtime/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/tvtime.c.orig	2005-09-07 22:55:54.000000000 -0400
-+++ src/tvtime.c
-@@ -28,7 +28,11 @@
- #include <string.h>
- #include <locale.h>
- #include <stdlib.h>
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#else
- #include <termio.h>
-+#endif
- #include <ctype.h>
- #if defined (__SVR4) && defined (__sun)
- # include <sys/int_types.h>
diff --git a/multimedia/tvtime/patches/patch-ai b/multimedia/tvtime/patches/patch-ai
deleted file mode 100644
index 77a5628dadb..00000000000
--- a/multimedia/tvtime/patches/patch-ai
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2014/09/25 15:08:29 jperkin Exp $
-
-First chunk: automake-1.13 compat.
-Rest: ?
-
---- configure.ac.orig	2005-09-14 21:40:44.000000000 +0000
-+++ configure.ac
-@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
- AC_INIT(tvtime, 1.0.2, http://tvtime.net/)
- AC_CONFIG_SRCDIR([src/tvtime.c])
- AM_INIT_AUTOMAKE(tvtime,1.0.2)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
- if test x"$host_alias" = x""; then host_alias="$host"; fi
-@@ -86,6 +86,44 @@ fi
- AC_SUBST(XML2_LIBS)
- AC_SUBST(XML2_FLAG)
- 
-+dnl ---------------------------------------------
-+dnl librt
-+dnl ---------------------------------------------
-+dnl Test for librt
-+AC_CHECK_LIB([rt],[sched_get_priority_max],
-+	    [AC_DEFINE([HAVE_LIBRT],,[librt])
-+	    RT_LIBS="$RT_LIBS -lrt"],,
-+	    [$RT_LIBS])
-+if test "$HAVE_LIBRT" = "yes" ; then
-+  :
-+  AC_SUBST(RT_LIBS)
-+fi
-+
-+dnl ---------------------------------------------
-+dnl libossaudio
-+dnl ---------------------------------------------
-+dnl Test for libossaudio
-+AC_CHECK_LIB([ossaudio],[_oss_ioctl],
-+	    [AC_DEFINE([HAVE_LIBOSSAUDIO],,[libossaudio])
-+	    OSS_LIBS="$OSS_LIBS -lossaudio"],,
-+	    [$OSS_LIBS])
-+if test "$HAVE_LIBOSSAUDIO" = "yes" ; then
-+  :
-+  AC_SUBST(OSS_LIBS)
-+fi
-+
-+dnl ---------------------------------------------
-+dnl libintl
-+dnl ---------------------------------------------
-+dnl Test for libintl
-+AC_CHECK_LIB([intl],[gettext],
-+	    [AC_DEFINE([HAVE_LIBINTL],,[libintl])
-+	    INTL_LIBS="$INTL_LIBS -lintl"],,
-+	    [$INTL_LIBS])
-+if test "$HAVE_LIBINTL" = "yes" ; then
-+  :
-+  AC_SUBST(INTL_LIBS)
-+fi
- 
- dnl ---------------------------------------------
- dnl check for gtk+-2.0
diff --git a/multimedia/tvtime/patches/patch-aj b/multimedia/tvtime/patches/patch-aj
deleted file mode 100644
index 2cc8392fdc1..00000000000
--- a/multimedia/tvtime/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
-
---- src/Makefile.am.orig	2005-02-08 00:00:16.000000000 -0500
-+++ src/Makefile.am
-@@ -77,19 +77,20 @@ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLA
- 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
- 	$(FONT_CFLAGS) $(AM_CFLAGS)
- tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
--	$(X11_LIBS) $(XML2_LIBS) -lm -lstdc++
-+	$(X11_LIBS) $(XML2_LIBS) $(OSS_LIBS) $(RT_LIBS) \
-+	$(INTL_LIBS) -lm -lstdc++
- 
- tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-command.c
- tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS) $(INTL_LIBS)
- tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-configure.c
- tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS) $(INTL_LIBS)
- tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
- 	tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
- 	mixer.h mixer.c
- tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS) $(INTL_LIBS) $(OSS_LIBS)
- 
diff --git a/multimedia/tvtime/patches/patch-ak b/multimedia/tvtime/patches/patch-ak
deleted file mode 100644
index 47c7fb83010..00000000000
--- a/multimedia/tvtime/patches/patch-ak
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2008/09/17 23:00:05 joerg Exp $
-
---- docs/Makefile.am.orig	2004-10-30 17:20:27.000000000 +0200
-+++ docs/Makefile.am
-@@ -50,23 +50,8 @@ install-data-local:
- 
- .PHONY: install-exec-hook
- install-exec-hook:
--	-mkdir -p -- '$(DESTDIR)$(pkgsysconfdir)' || touch noconfdir
--	@if [ -f noconfdir ]; then (                                         \
--	  echo 'Warning: I could not create the directory'                   \
--	       '`$(DESTDIR)$(pkgsysconfdir)'"'"                             ;\
--	  echo '         because you do not have the required permissions.' ;\
--	); fi
--	-if [ -f noconfdir ]; then                                           \
--	   rm -f noconfdir;                                                  \
--	 else                                                                \
- 	   $(INSTALL) -m 'u=rw,go=r' 'html/default.tvtime.xml'               \
--	     '$(DESTDIR)$(pkgsysconfdir)/tvtime.xml' || touch noconfdir;     \
--	 fi
--	@if [ -f noconfdir ]; then rm -f noconfdir; (                        \
--	  echo 'Warning: I could not create the default tvtime'              \
--	       'configuration file'                                         ;\
--	  echo '         because you do not have the required permissions.' ;\
--	); fi
-+	     '$(DESTDIR)$(datadir)/examples/tvtime/tvtime.xml'
- 
- uninstall-hook:
- 	-rmdir -p '$(DESTDIR)$(pkgsysconfdir)'
diff --git a/multimedia/tvtime/patches/patch-al b/multimedia/tvtime/patches/patch-al
deleted file mode 100644
index 085d13cca70..00000000000
--- a/multimedia/tvtime/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2011/01/17 17:57:01 jnemeth Exp $
-
---- src/pngoutput.c.orig	2003-09-26 18:07:41.000000000 +0000
-+++ src/pngoutput.c
-@@ -19,6 +19,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <png.h>
-+#include <zlib.h>
- #include "pngoutput.h"
- 
- struct pngoutput_s
diff --git a/multimedia/tvtime/patches/patch-src_xmltv.c b/multimedia/tvtime/patches/patch-src_xmltv.c
deleted file mode 100644
index b0e2e7409ea..00000000000
--- a/multimedia/tvtime/patches/patch-src_xmltv.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_xmltv.c,v 1.1 2013/05/11 21:38:22 joerg Exp $
-
---- src/xmltv.c.orig	2013-05-10 14:43:03.000000000 +0000
-+++ src/xmltv.c
-@@ -118,9 +118,9 @@ const int num_timezones = sizeof( date_m
- typedef struct {
-     const char *code;
-     const char *name;
--} locale_t;
-+} my_locale_t;
- 
--static locale_t locale_table[] = {
-+static my_locale_t locale_table[] = {
-     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
-     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
-     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
-@@ -168,7 +168,7 @@ static locale_t locale_table[] = {
-     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
-     {"ZU", "Zulu"} };
- 
--const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
-+const int num_locales = sizeof( locale_table ) / sizeof( *locale_table );
- 
- /**
-  * Timezone parsing code based loosely on the algorithm in