Thu Sep 25 15:08:29 2014 UTC ()
Fix empty shell 'if's.  Uses libiconv.


(jperkin)
diff -r1.14 -r1.15 pkgsrc/multimedia/tvtime/Makefile
diff -r1.6 -r1.7 pkgsrc/multimedia/tvtime/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/tvtime/patches/patch-ai
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/tvtime/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/tvtime/Attic/Makefile 2013/06/04 22:16:50 1.14
+++ pkgsrc/multimedia/tvtime/Attic/Makefile 2014/09/25 15:08:29 1.15
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.14 2013/06/04 22:16:50 tron Exp $ 1# $NetBSD: Makefile,v 1.15 2014/09/25 15:08:29 jperkin Exp $
2 2
3DISTNAME= tvtime-1.0.2 3DISTNAME= tvtime-1.0.2
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= multimedia x11 5CATEGORIES= multimedia x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tvtime/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tvtime/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://tvtime.sourceforge.net/ 9HOMEPAGE= http://tvtime.sourceforge.net/
10COMMENT= High quality television application 10COMMENT= High quality television application
11LICENSE= gnu-gpl-v2 AND mit AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v2 AND mit AND gnu-lgpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= msgfmt aclocal automake autoconf 16USE_TOOLS+= msgfmt aclocal automake autoconf
17 17
18INSTALLATION_DIRS= share/examples/tvtime 18INSTALLATION_DIRS= share/examples/tvtime
19 19
20CONF_FILES= share/examples/tvtime/tvtime.xml ${PKG_SYSCONFDIR}/tvtime.xml 20CONF_FILES= share/examples/tvtime/tvtime.xml ${PKG_SYSCONFDIR}/tvtime.xml
21 21
22pre-configure: 22pre-configure:
23 (cd ${WRKSRC} && autoreconf -vif) 23 (cd ${WRKSRC} && autoreconf -vif)
24 24
 25.include "../../converters/libiconv/buildlink3.mk"
25.include "../../devel/gettext-lib/buildlink3.mk" 26.include "../../devel/gettext-lib/buildlink3.mk"
26.include "../../devel/zlib/buildlink3.mk" 27.include "../../devel/zlib/buildlink3.mk"
27.include "../../graphics/freetype2/buildlink3.mk" 28.include "../../graphics/freetype2/buildlink3.mk"
28.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 29.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
29.include "../../graphics/png/buildlink3.mk" 30.include "../../graphics/png/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../textproc/libxml2/buildlink3.mk" 32.include "../../textproc/libxml2/buildlink3.mk"
32.include "../../x11/libICE/buildlink3.mk" 33.include "../../x11/libICE/buildlink3.mk"
33.include "../../x11/libX11/buildlink3.mk" 34.include "../../x11/libX11/buildlink3.mk"
34.include "../../x11/libXext/buildlink3.mk" 35.include "../../x11/libXext/buildlink3.mk"
35.include "../../x11/libXinerama/buildlink3.mk" 36.include "../../x11/libXinerama/buildlink3.mk"
36.include "../../x11/libXt/buildlink3.mk" 37.include "../../x11/libXt/buildlink3.mk"
37.include "../../x11/libXtst/buildlink3.mk" 38.include "../../x11/libXtst/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/tvtime/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/tvtime/Attic/distinfo 2013/05/11 21:38:22 1.6
+++ pkgsrc/multimedia/tvtime/Attic/distinfo 2014/09/25 15:08:29 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.6 2013/05/11 21:38:22 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2014/09/25 15:08:29 jperkin Exp $
2 2
3SHA1 (tvtime-1.0.2.tar.gz) = ea609876084b2d627a84a1f77bf81cc2175ee58e 3SHA1 (tvtime-1.0.2.tar.gz) = ea609876084b2d627a84a1f77bf81cc2175ee58e
4RMD160 (tvtime-1.0.2.tar.gz) = e7d9621054edba5833f4ea002be8979983fbf3dc 4RMD160 (tvtime-1.0.2.tar.gz) = e7d9621054edba5833f4ea002be8979983fbf3dc
5Size (tvtime-1.0.2.tar.gz) = 1645742 bytes 5Size (tvtime-1.0.2.tar.gz) = 1645742 bytes
6SHA1 (patch-aa) = dd2f2dbda25704ed249f8da8c2d6e5832d09826e 6SHA1 (patch-aa) = dd2f2dbda25704ed249f8da8c2d6e5832d09826e
7SHA1 (patch-ab) = 94adf60aa7ebc1eb20934542fc6a0a6aadcb4caa 7SHA1 (patch-ab) = 94adf60aa7ebc1eb20934542fc6a0a6aadcb4caa
8SHA1 (patch-ac) = 817366537bab0364e7fa994b96f6591b8208f1ce 8SHA1 (patch-ac) = 817366537bab0364e7fa994b96f6591b8208f1ce
9SHA1 (patch-ad) = f1e8bc7deb6638676ff24ad9ab85ff9e2749adbc 9SHA1 (patch-ad) = f1e8bc7deb6638676ff24ad9ab85ff9e2749adbc
10SHA1 (patch-ae) = 8abb4a7cc0cbaa41da060c89d3c230b1b0c2a005 10SHA1 (patch-ae) = 8abb4a7cc0cbaa41da060c89d3c230b1b0c2a005
11SHA1 (patch-af) = 4aef2ec42fe627b108e5565db5337c4f01e99bb1 11SHA1 (patch-af) = 4aef2ec42fe627b108e5565db5337c4f01e99bb1
12SHA1 (patch-ag) = 1872b404615f54736b5cc143fb4f783d3f2e6709 12SHA1 (patch-ag) = 1872b404615f54736b5cc143fb4f783d3f2e6709
13SHA1 (patch-ah) = eba4315dc77956fcbe648c0d3b2ee1c6e9046334 13SHA1 (patch-ah) = eba4315dc77956fcbe648c0d3b2ee1c6e9046334
14SHA1 (patch-ai) = 4a97047148528d37245899cc396cbf0b7926350a 14SHA1 (patch-ai) = 7349a2b69c4c7a444311d05b1e12b2d6f330353d
15SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254 15SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254
16SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c 16SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c
17SHA1 (patch-al) = b183822cff1f5b022e0509b33299f7b99ab57442 17SHA1 (patch-al) = b183822cff1f5b022e0509b33299f7b99ab57442
18SHA1 (patch-src_xmltv.c) = ba107c28eacb6967918cb074a23354eb6c2d2ea6 18SHA1 (patch-src_xmltv.c) = ba107c28eacb6967918cb074a23354eb6c2d2ea6
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/tvtime/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/multimedia/tvtime/patches/Attic/patch-ai 2013/01/26 23:13:48 1.2
+++ pkgsrc/multimedia/tvtime/patches/Attic/patch-ai 2014/09/25 15:08:29 1.3
@@ -1,58 +1,61 @@ @@ -1,58 +1,61 @@
1$NetBSD: patch-ai,v 1.2 2013/01/26 23:13:48 wiz Exp $ 1$NetBSD: patch-ai,v 1.3 2014/09/25 15:08:29 jperkin Exp $
2 2
3First chunk: automake-1.13 compat. 3First chunk: automake-1.13 compat.
4Rest: ? 4Rest: ?
5 5
6--- configure.ac.orig 2005-09-14 21:40:44.000000000 +0000 6--- configure.ac.orig 2005-09-14 21:40:44.000000000 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -3,7 +3,7 @@ AC_PREREQ(2.52) 8@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
9 AC_INIT(tvtime, 1.0.2, http://tvtime.net/) 9 AC_INIT(tvtime, 1.0.2, http://tvtime.net/)
10 AC_CONFIG_SRCDIR([src/tvtime.c]) 10 AC_CONFIG_SRCDIR([src/tvtime.c])
11 AM_INIT_AUTOMAKE(tvtime,1.0.2) 11 AM_INIT_AUTOMAKE(tvtime,1.0.2)
12-AM_CONFIG_HEADER(config.h) 12-AM_CONFIG_HEADER(config.h)
13+AC_CONFIG_HEADERS(config.h) 13+AC_CONFIG_HEADERS(config.h)
14 AM_MAINTAINER_MODE 14 AM_MAINTAINER_MODE
15 AC_CANONICAL_HOST 15 AC_CANONICAL_HOST
16 if test x"$host_alias" = x""; then host_alias="$host"; fi 16 if test x"$host_alias" = x""; then host_alias="$host"; fi
17@@ -86,6 +86,41 @@ fi 17@@ -86,6 +86,44 @@ fi
18 AC_SUBST(XML2_LIBS) 18 AC_SUBST(XML2_LIBS)
19 AC_SUBST(XML2_FLAG) 19 AC_SUBST(XML2_FLAG)
20  20
21+dnl --------------------------------------------- 21+dnl ---------------------------------------------
22+dnl librt 22+dnl librt
23+dnl --------------------------------------------- 23+dnl ---------------------------------------------
24+dnl Test for librt 24+dnl Test for librt
25+AC_CHECK_LIB([rt],[sched_get_priority_max], 25+AC_CHECK_LIB([rt],[sched_get_priority_max],
26+ [AC_DEFINE([HAVE_LIBRT],,[librt]) 26+ [AC_DEFINE([HAVE_LIBRT],,[librt])
27+ RT_LIBS="$RT_LIBS -lrt"],, 27+ RT_LIBS="$RT_LIBS -lrt"],,
28+ [$RT_LIBS]) 28+ [$RT_LIBS])
29+if test "$HAVE_LIBRT" = "yes" ; then 29+if test "$HAVE_LIBRT" = "yes" ; then
 30+ :
30+ AC_SUBST(RT_LIBS) 31+ AC_SUBST(RT_LIBS)
31+fi 32+fi
32+ 33+
33+dnl --------------------------------------------- 34+dnl ---------------------------------------------
34+dnl libossaudio 35+dnl libossaudio
35+dnl --------------------------------------------- 36+dnl ---------------------------------------------
36+dnl Test for libossaudio 37+dnl Test for libossaudio
37+AC_CHECK_LIB([ossaudio],[_oss_ioctl], 38+AC_CHECK_LIB([ossaudio],[_oss_ioctl],
38+ [AC_DEFINE([HAVE_LIBOSSAUDIO],,[libossaudio]) 39+ [AC_DEFINE([HAVE_LIBOSSAUDIO],,[libossaudio])
39+ OSS_LIBS="$OSS_LIBS -lossaudio"],, 40+ OSS_LIBS="$OSS_LIBS -lossaudio"],,
40+ [$OSS_LIBS]) 41+ [$OSS_LIBS])
41+if test "$HAVE_LIBOSSAUDIO" = "yes" ; then 42+if test "$HAVE_LIBOSSAUDIO" = "yes" ; then
 43+ :
42+ AC_SUBST(OSS_LIBS) 44+ AC_SUBST(OSS_LIBS)
43+fi 45+fi
44+ 46+
45+dnl --------------------------------------------- 47+dnl ---------------------------------------------
46+dnl libintl 48+dnl libintl
47+dnl --------------------------------------------- 49+dnl ---------------------------------------------
48+dnl Test for libintl 50+dnl Test for libintl
49+AC_CHECK_LIB([intl],[gettext], 51+AC_CHECK_LIB([intl],[gettext],
50+ [AC_DEFINE([HAVE_LIBINTL],,[libintl]) 52+ [AC_DEFINE([HAVE_LIBINTL],,[libintl])
51+ INTL_LIBS="$INTL_LIBS -lintl"],, 53+ INTL_LIBS="$INTL_LIBS -lintl"],,
52+ [$INTL_LIBS]) 54+ [$INTL_LIBS])
53+if test "$HAVE_LIBINTL" = "yes" ; then 55+if test "$HAVE_LIBINTL" = "yes" ; then
 56+ :
54+ AC_SUBST(INTL_LIBS) 57+ AC_SUBST(INTL_LIBS)
55+fi 58+fi
56  59
57 dnl --------------------------------------------- 60 dnl ---------------------------------------------
58 dnl check for gtk+-2.0 61 dnl check for gtk+-2.0