Install docs in share/doc/xdialog, not share/doc/html/xdialog.

PKGREVISION -> 9.

Also fix some pkglint and add LICENSE and patch comments.

6 files changed, 76 insertions, 70 deletions

diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 69bbc9376a2..2cfe4e840f8 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2012/03/03 12:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/07/30 02:21:31 dholland Exp $
 #
 
 DISTNAME=		Xdialog-2.3.1
 PKGNAME=		${DISTNAME:S/^X/x/}
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		x11 misc
 MASTER_SITES=		http://xdialog.free.fr/
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xdialog.dyns.net/
 COMMENT=		X11 drop-in replacement for the curses dialog program
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,7 +19,7 @@ USE_TOOLS+=		msgfmt
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-DOCDIR=			${PREFIX}/share/doc/html/xdialog
+DOCDIR=			${PREFIX}/share/doc/xdialog
 EGDIR=			${PREFIX}/share/examples/xdialog
 
 CHECK_PORTABILITY_SKIP+=	samples/*
@@ -27,13 +28,12 @@ INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
 
 post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DESTDIR}${DOCDIR}
-	for f in Xmessage Xmore buildlist calendar chain checklist	\
+.for f in Xmessage Xmore buildlist calendar chain checklist	\
 		dselect editbox fselect gauge infobox infobox2 inputbox	\
 		logbox logbox2 login menubox msgbox radiolist rangebox	\
-		tailbox textbox timebox treeview yesno;			\
-	do								\
-		${INSTALL_SCRIPT} ${WRKSRC}/samples/$${f} ${DESTDIR}${EGDIR};	\
-	done
+		tailbox textbox timebox treeview yesno
+	${INSTALL_SCRIPT} ${WRKSRC}/samples/${f} ${DESTDIR}${EGDIR}
+.endfor
 
 .include "options.mk"
 
diff --git a/x11/xdialog/PLIST b/x11/xdialog/PLIST
index 3b41aa5be42..5abc67f9624 100644
--- a/x11/xdialog/PLIST
+++ b/x11/xdialog/PLIST
@@ -1,58 +1,58 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:25:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/07/30 02:21:31 dholland Exp $
 bin/Xdialog
 man/man1/Xdialog.1
-share/doc/html/xdialog/2ranges.png
-share/doc/html/xdialog/authors.html
-share/doc/html/xdialog/box.html
-share/doc/html/xdialog/buildlist.png
-share/doc/html/xdialog/calendar.png
-share/doc/html/xdialog/center.png
-share/doc/html/xdialog/changelog.html
-share/doc/html/xdialog/check.png
-share/doc/html/xdialog/checklist.png
-share/doc/html/xdialog/colorsel.png
-share/doc/html/xdialog/combobox.png
-share/doc/html/xdialog/common.html
-share/doc/html/xdialog/compatibility.html
-share/doc/html/xdialog/dselect.png
-share/doc/html/xdialog/editbox.png
-share/doc/html/xdialog/faq.html
-share/doc/html/xdialog/fill.png
-share/doc/html/xdialog/fixedfont.png
-share/doc/html/xdialog/fontsel.png
-share/doc/html/xdialog/fselect.png
-share/doc/html/xdialog/gauge.png
-share/doc/html/xdialog/gtk.html
-share/doc/html/xdialog/icon.png
-share/doc/html/xdialog/index.html
-share/doc/html/xdialog/infobox.png
-share/doc/html/xdialog/input.png
-share/doc/html/xdialog/intro.html
-share/doc/html/xdialog/labelcenter.png
-share/doc/html/xdialog/labelleft.png
-share/doc/html/xdialog/labelright.png
-share/doc/html/xdialog/left.png
-share/doc/html/xdialog/license.html
-share/doc/html/xdialog/logbox.png
-share/doc/html/xdialog/msgbox.png
-share/doc/html/xdialog/nofixedfont.png
-share/doc/html/xdialog/notags.png
-share/doc/html/xdialog/password.png
-share/doc/html/xdialog/radiolist.png
-share/doc/html/xdialog/range.png
-share/doc/html/xdialog/rcfile.png
-share/doc/html/xdialog/right.png
-share/doc/html/xdialog/special.html
-share/doc/html/xdialog/spinbox.png
-share/doc/html/xdialog/syntax.html
-share/doc/html/xdialog/tailbox.png
-share/doc/html/xdialog/timebox.png
-share/doc/html/xdialog/title.png
-share/doc/html/xdialog/transient.html
-share/doc/html/xdialog/treeview.png
-share/doc/html/xdialog/withtags.png
-share/doc/html/xdialog/yesno-wizard.png
-share/doc/html/xdialog/yesno.png
+share/doc/xdialog/2ranges.png
+share/doc/xdialog/authors.html
+share/doc/xdialog/box.html
+share/doc/xdialog/buildlist.png
+share/doc/xdialog/calendar.png
+share/doc/xdialog/center.png
+share/doc/xdialog/changelog.html
+share/doc/xdialog/check.png
+share/doc/xdialog/checklist.png
+share/doc/xdialog/colorsel.png
+share/doc/xdialog/combobox.png
+share/doc/xdialog/common.html
+share/doc/xdialog/compatibility.html
+share/doc/xdialog/dselect.png
+share/doc/xdialog/editbox.png
+share/doc/xdialog/faq.html
+share/doc/xdialog/fill.png
+share/doc/xdialog/fixedfont.png
+share/doc/xdialog/fontsel.png
+share/doc/xdialog/fselect.png
+share/doc/xdialog/gauge.png
+share/doc/xdialog/gtk.html
+share/doc/xdialog/icon.png
+share/doc/xdialog/index.html
+share/doc/xdialog/infobox.png
+share/doc/xdialog/input.png
+share/doc/xdialog/intro.html
+share/doc/xdialog/labelcenter.png
+share/doc/xdialog/labelleft.png
+share/doc/xdialog/labelright.png
+share/doc/xdialog/left.png
+share/doc/xdialog/license.html
+share/doc/xdialog/logbox.png
+share/doc/xdialog/msgbox.png
+share/doc/xdialog/nofixedfont.png
+share/doc/xdialog/notags.png
+share/doc/xdialog/password.png
+share/doc/xdialog/radiolist.png
+share/doc/xdialog/range.png
+share/doc/xdialog/rcfile.png
+share/doc/xdialog/right.png
+share/doc/xdialog/special.html
+share/doc/xdialog/spinbox.png
+share/doc/xdialog/syntax.html
+share/doc/xdialog/tailbox.png
+share/doc/xdialog/timebox.png
+share/doc/xdialog/title.png
+share/doc/xdialog/transient.html
+share/doc/xdialog/treeview.png
+share/doc/xdialog/withtags.png
+share/doc/xdialog/yesno-wizard.png
+share/doc/xdialog/yesno.png
 share/examples/xdialog/Xmessage
 share/examples/xdialog/Xmore
 share/examples/xdialog/buildlist
diff --git a/x11/xdialog/distinfo b/x11/xdialog/distinfo
index ce809963edf..72b5cfe2f55 100644
--- a/x11/xdialog/distinfo
+++ b/x11/xdialog/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/08/29 16:43:58 sborrill Exp $
+$NetBSD: distinfo,v 1.7 2012/07/30 02:21:31 dholland Exp $
 
 SHA1 (Xdialog-2.3.1.tar.bz2) = 292c552506633c54a28d51aa290277b7b5c0c708
 RMD160 (Xdialog-2.3.1.tar.bz2) = 12085dfddc9217fe5f07510c76755eb75446e658
 Size (Xdialog-2.3.1.tar.bz2) = 457938 bytes
-SHA1 (patch-ac) = c7f922ac80d0938e73ae50824f9e18855390ffd2
-SHA1 (patch-ad) = 8f5ee338a95eb082f95705e9d2f528199841317c
-SHA1 (patch-ae) = f613366909f25ed952b3ae33e8542f4a561f2c4b
+SHA1 (patch-ac) = 785a6e5833617e0602699f8c7810a2db5c3354cf
+SHA1 (patch-ad) = f5d067838ce6418723fd0e7f658cea4442c88ce5
+SHA1 (patch-ae) = cc0759387ba3d23d4ef2eddcc46d51705b9a5714
diff --git a/x11/xdialog/patches/patch-ac b/x11/xdialog/patches/patch-ac
index 8efbadcc3dd..038c3a20c25 100644
--- a/x11/xdialog/patches/patch-ac
+++ b/x11/xdialog/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2008/08/29 16:43:58 sborrill Exp $
+$NetBSD: patch-ac,v 1.3 2012/07/30 02:21:31 dholland Exp $
+
+Configure paths for pkgsrc.
 
 --- doc/Xdialog.man.orig	2008-08-29 15:18:19.000000000 +0100
 +++ doc/Xdialog.man	2008-08-29 15:20:05.000000000 +0100
@@ -10,7 +12,7 @@ $NetBSD: patch-ac,v 1.2 2008/08/29 16:43:58 sborrill Exp $
 +\fI%%mandir%%/man1/Xdialog.1\fP
  .br 
 -\fI%%datadir%%/doc/Xdialog\-%%version%%/*\fP
-+\fI%%datadir%%/doc/html/xdialog/*\fP
++\fI%%datadir%%/doc/xdialog/*\fP
  .br 
 -\fI%%datadir%%/doc/Xdialog\-%%version%%/samples/*\fP
 +\fI%%datadir%%/examples/xdialog/*\fP
@@ -25,7 +27,7 @@ $NetBSD: patch-ac,v 1.2 2008/08/29 16:43:58 sborrill Exp $
 +Sample scripts are available in the \fI%%datadir%%/examples/xdialog\fR directory.
  .br 
 -Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/\fR directory.
-+Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/html/xdialog\fR directory.
++Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/xdialog\fR directory.
  .SH "AUTHORS"
  .LP 
  Thierry Godefroy <xdialog@free.fr> (from v1.1.0 onwards)
diff --git a/x11/xdialog/patches/patch-ad b/x11/xdialog/patches/patch-ad
index e3195f89bdf..7dd31f7b2ab 100644
--- a/x11/xdialog/patches/patch-ad
+++ b/x11/xdialog/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2008/08/29 16:43:58 sborrill Exp $
+$NetBSD: patch-ad,v 1.3 2012/07/30 02:21:31 dholland Exp $
+
+Don't install docs; that's handled by the package makefile instead.
 
 --- doc/Makefile.in.orig	2008-08-29 15:26:07.000000000 +0100
 +++ doc/Makefile.in	2008-08-29 15:26:31.000000000 +0100
diff --git a/x11/xdialog/patches/patch-ae b/x11/xdialog/patches/patch-ae
index 00fcc3c8cf9..c59281c39a6 100644
--- a/x11/xdialog/patches/patch-ae
+++ b/x11/xdialog/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2008/08/29 16:43:58 sborrill Exp $
+$NetBSD: patch-ae,v 1.3 2012/07/30 02:21:31 dholland Exp $
+
+Don't install docs; that's handled by the package makefile instead.
 
 --- Makefile.in.orig	2008-08-29 16:27:35.000000000 +0100
 +++ Makefile.in	2008-08-29 16:27:52.000000000 +0100