Correct handling of tvtime.xml. Bump revision.

4 files changed, 41 insertions, 3 deletions

diff --git a/multimedia/tvtime/Makefile b/multimedia/tvtime/Makefile
index a232b985983..6378d04ab5c 100644
--- a/multimedia/tvtime/Makefile
+++ b/multimedia/tvtime/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/17 23:00:05 joerg Exp $
 
 DISTNAME=	tvtime-1.0.1
+PKGREVISION=	1
 CATEGORIES=	multimedia x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tvtime/}
 
@@ -15,12 +16,17 @@ USE_LANGUAGES=		c c++
 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)
 
 .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 "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
diff --git a/multimedia/tvtime/PLIST b/multimedia/tvtime/PLIST
index e80abe8e246..5cabccdc5dc 100644
--- a/multimedia/tvtime/PLIST
+++ b/multimedia/tvtime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/17 23:00:05 joerg Exp $
 bin/tvtime
 bin/tvtime-command
 bin/tvtime-configure
@@ -23,6 +23,7 @@ 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
@@ -45,3 +46,4 @@ share/tvtime/filmstrip_0004.png
 share/tvtime/infoicon_0000.png
 share/tvtime/tvtimeSansBold.ttf
 @dirrm share/tvtime
+@dirrm share/examples/tvtime
diff --git a/multimedia/tvtime/distinfo b/multimedia/tvtime/distinfo
index 9491072884d..36efabe7800 100644
--- a/multimedia/tvtime/distinfo
+++ b/multimedia/tvtime/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/09/17 23:00:05 joerg Exp $
 
 SHA1 (tvtime-1.0.1.tar.gz) = 0f5785803049877d35d4648abb3bb182799fa34c
 RMD160 (tvtime-1.0.1.tar.gz) = 854daa7dabc8b17c09acac362e8d7eb2ea11a977
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 1872b404615f54736b5cc143fb4f783d3f2e6709
 SHA1 (patch-ah) = eba4315dc77956fcbe648c0d3b2ee1c6e9046334
 SHA1 (patch-ai) = 3b8519579d1afe2f73ca70a30a640c43a27f3c2a
 SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254
+SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c
diff --git a/multimedia/tvtime/patches/patch-ak b/multimedia/tvtime/patches/patch-ak
new file mode 100644
index 00000000000..47c7fb83010
--- /dev/null
+++ b/multimedia/tvtime/patches/patch-ak
@@ -0,0 +1,29 @@
+$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)'