- Use gtk2 (nvtv-gtk2 will go away right after this)

- Drop maintainership
- Add USE_DESTDIR support

Bump PKGREVISION because of gtk1->gtk2 move.

4 files changed, 34 insertions, 38 deletions

diff --git a/graphics/nvtv/DESCR b/graphics/nvtv/DESCR
index 7aaa3b61aba..a16c2fac3f2 100644
--- a/graphics/nvtv/DESCR
+++ b/graphics/nvtv/DESCR
@@ -8,6 +8,3 @@ sizes the board supports.
 Most of the accesses done by Nvtv need root privileges, and a daemon is
 provided to allow non-privileged users control the TV output of the graphics
 card.
-
-This package uses version 1 of the GTK+ toolkit.  If you want to use GTK+ 2
-interface, install graphics/nvtv-gtk2 package instead.
diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile
index 68413b13343..15cc51164ea 100644
--- a/graphics/nvtv/Makefile
+++ b/graphics/nvtv/Makefile
@@ -1,10 +1,37 @@
-# $NetBSD: Makefile,v 1.8 2008/11/03 22:05:50 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2009/02/24 00:06:54 cube Exp $
 
-PKGREVISION=	4
-.include "Makefile.common"
+DISTNAME=	nvtv-0.4.7
+PKGREVISION=	5
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nv-tv-out/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://sourceforge.net/projects/nv-tv-out/
+COMMENT=	Tool to manipulate TV-Out settings on NVidia cards
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+ONLY_FOR_PLATFORM=	*-*-i386
 
 CONFLICTS=	nvtv-gtk2-[0-9]*
 
-.include "../../x11/gtk/buildlink3.mk"
+GNU_CONFIGURE=		YES
+RCD_SCRIPTS=		nvtvd
+
+INSTALLATION_DIRS+= share/doc/nvtv
+
+post-patch:
+	${CP} ${WRKSRC}/man/nvtv.1x ${WRKSRC}/man/nvtv.1
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ ${WRKSRC}/doc/USAGE \
+		${WRKSRC}/doc/chips.txt \
+		${WRKSRC}/doc/overview.txt ${WRKSRC}/doc/timing.txt \
+		${DESTDIR}${PREFIX}/share/doc/nvtv
+
+.include "../../sysutils/pciutils/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/nvtv/Makefile.common b/graphics/nvtv/Makefile.common
deleted file mode 100644
index 128ed6616f1..00000000000
--- a/graphics/nvtv/Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2008/02/29 06:57:55 cube Exp $
-
-DISTNAME=	nvtv-0.4.7
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nv-tv-out/}
-
-MAINTAINER=	cube@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/nv-tv-out/
-COMMENT=	Tool to manipulate TV-Out settings on NVidia cards
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-GNU_CONFIGURE=		YES
-RCD_SCRIPTS=		nvtvd
-
-post-patch:
-	${CP} ${WRKSRC}/man/nvtv.1x ${WRKSRC}/man/nvtv.1
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nvtv
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ ${WRKSRC}/doc/USAGE \
-		${WRKSRC}/doc/chips.txt \
-		${WRKSRC}/doc/overview.txt ${WRKSRC}/doc/timing.txt \
-		${PREFIX}/share/doc/nvtv
-
-.include "../../sysutils/pciutils/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
diff --git a/graphics/nvtv/PLIST b/graphics/nvtv/PLIST
index 0711c398a12..e9cb9a2490c 100644
--- a/graphics/nvtv/PLIST
+++ b/graphics/nvtv/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:33:59 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/02/24 00:06:54 cube Exp $
 bin/nvtv
 bin/nvtvd
+man/man1/nvtv.1
+man/man8/nvtvd.8
 share/doc/nvtv/FAQ
 share/doc/nvtv/README
 share/doc/nvtv/USAGE
 share/doc/nvtv/chips.txt
 share/doc/nvtv/overview.txt
 share/doc/nvtv/timing.txt
-man/man1/nvtv.1
-man/man8/nvtvd.8
 share/examples/rc.d/nvtvd
 @dirrm share/doc/nvtv