Update to 2.0. Now uses gtk2 and has a German translation. Other minor

changes can be found in the bundled ChangeLog.

7 files changed, 19 insertions, 70 deletions

diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile
index 60be4b74334..9631c2d780a 100644
--- a/sysutils/screentest/Makefile
+++ b/sysutils/screentest/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:43 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.13 2009/11/29 04:37:58 snj Exp $
 
-DISTNAME=	screentest-1.0
-PKGREVISION=	4
+DISTNAME=	screentest-2.0
 CATEGORIES=	sysutils x11
-MASTER_SITES=	ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/screentest/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=screentest/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fi.muni.cz/~kas/screentest/
-COMMENT=	CRT screen testing utility using GTK+
+HOMEPAGE=	http://screentest.sourceforge.net/
+COMMENT=	CRT/LCD screen testing utility using GTK+
 
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS+=	share/doc/screentest
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/screentest
 .for f in AUTHORS ChangeLog NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/screentest
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/screentest
 .endfor
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/screentest/PLIST b/sysutils/screentest/PLIST
index 3b8bb170d2a..a7c7eb2f74c 100644
--- a/sysutils/screentest/PLIST
+++ b/sysutils/screentest/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/29 04:37:58 snj Exp $
 bin/screentest
 share/doc/screentest/AUTHORS
 share/doc/screentest/ChangeLog
 share/doc/screentest/NEWS
 share/doc/screentest/README
+share/locale/de/LC_MESSAGES/screentest.mo
+share/screentest/screentest.glade
diff --git a/sysutils/screentest/distinfo b/sysutils/screentest/distinfo
index 8be29327f0e..e9a0dee8023 100644
--- a/sysutils/screentest/distinfo
+++ b/sysutils/screentest/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/01/08 17:44:20 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/11/29 04:37:58 snj Exp $
 
-SHA1 (screentest-1.0.tar.gz) = ea541d61b6c5003dbaf1e2847def66c31f808230
-RMD160 (screentest-1.0.tar.gz) = da49ff0375e60705ae7cf16656223d420d53b1aa
-Size (screentest-1.0.tar.gz) = 49428 bytes
-SHA1 (patch-aa) = 27923b68894069e077c7a213f2e8c8305c536e3b
-SHA1 (patch-ab) = 259e9bbd05374c8b5be9ec2b08ccf4e5504866b9
-SHA1 (patch-ac) = c167b30c62de4bae315a40c1c14a0de1d28bbbc0
-SHA1 (patch-ad) = dc103d3f9cdfa99f806132c7437c0110f1faa105
+SHA1 (screentest-2.0.tar.gz) = 14d3af527dbba1637b8021c45598952df6cd1221
+RMD160 (screentest-2.0.tar.gz) = 8dce80aed939d6d7a9d42557c2cd88d496f46f17
+Size (screentest-2.0.tar.gz) = 341748 bytes
diff --git a/sysutils/screentest/patches/patch-aa b/sysutils/screentest/patches/patch-aa
deleted file mode 100644
index 598b22184fa..00000000000
--- a/sysutils/screentest/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- ChangeLog.orig	Mon Aug 20 20:10:54 2001
-+++ ChangeLog
-@@ -1,2 +1,7 @@
-+Tue Aug 21 10:23:25 CEST 2001
-+"Background color -> Red" yields now really to the red background instead
-+	of white (missing userdata in the signal handler). Thanks to 
-+	Leo Hadacz for reporting this.
-+
- Mon Aug 20 19:02:08 CEST 2001
- Initial revision.
diff --git a/sysutils/screentest/patches/patch-ab b/sysutils/screentest/patches/patch-ab
deleted file mode 100644
index 4d893f726ee..00000000000
--- a/sysutils/screentest/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- interface.c.orig	Mon Aug 20 20:10:54 2001
-+++ interface.c
-@@ -487,7 +487,8 @@ GtkWidget *create_popup(void)
- 			   GTK_SIGNAL_FUNC(on_bgcolor_change),
- 			   (gpointer) COLOR_WHITE);
- 	gtk_signal_connect(GTK_OBJECT(red1), "activate",
--			   GTK_SIGNAL_FUNC(on_bgcolor_change), NULL);
-+			   GTK_SIGNAL_FUNC(on_bgcolor_change),
-+			   (gpointer) COLOR_RED);
- 	gtk_signal_connect(GTK_OBJECT(green1), "activate",
- 			   GTK_SIGNAL_FUNC(on_bgcolor_change),
- 			   (gpointer) COLOR_GREEN);
diff --git a/sysutils/screentest/patches/patch-ac b/sysutils/screentest/patches/patch-ac
deleted file mode 100644
index 9e7bbc9bd2e..00000000000
--- a/sysutils/screentest/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- screentest.glade.orig	Mon Aug 20 20:10:55 2001
-+++ screentest.glade
-@@ -333,6 +333,7 @@
- 	<signal>
- 	  <name>activate</name>
- 	  <handler>on_bgcolor_change</handler>
-+	  <data>(gpointer)COLOR_RED</data>
- 	  <last_modification_time>Mon, 20 Aug 2001 13:34:56 GMT</last_modification_time>
- 	</signal>
- 	<label>Red</label>
diff --git a/sysutils/screentest/patches/patch-ad b/sysutils/screentest/patches/patch-ad
deleted file mode 100644
index 1f4e8e69f82..00000000000
--- a/sysutils/screentest/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/08 17:44:20 joerg Exp $
-
---- Makefile.in.orig	2007-01-08 17:25:57.000000000 +0000
-+++ Makefile.in
-@@ -72,7 +72,7 @@ EXTRA_DIST = screentest.glade NEW_TESTS 
- 
- 
- bin_PROGRAMS = screentest
--noinst_PROGRAMS = screentest.static
-+noinst_PROGRAMS =
- 
- screentest_SOURCES =  	main.c 	support.c support.h 	interface.c interface.h 	callbacks.c callbacks.h 	basic_test.c blink_test.c grid_test.c horizontal_test.c text_test.c 	vertical_test.c 
-