Mon Jul 30 02:21:31 2012 UTC ()
Install docs in share/doc/xdialog, not share/doc/html/xdialog.
PKGREVISION -> 9.

Also fix some pkglint and add LICENSE and patch comments.


(dholland)
diff -r1.29 -r1.30 pkgsrc/x11/xdialog/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/xdialog/PLIST
diff -r1.6 -r1.7 pkgsrc/x11/xdialog/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ae
cvs diff -r1.29 -r1.30 pkgsrc/x11/xdialog/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/Makefile 2012/03/03 12:54:23 1.29
+++ pkgsrc/x11/xdialog/Makefile 2012/07/30 02:21:31 1.30
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.29 2012/03/03 12:54:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2012/07/30 02:21:31 dholland Exp $
2# 2#
3 3
4DISTNAME= Xdialog-2.3.1 4DISTNAME= Xdialog-2.3.1
5PKGNAME= ${DISTNAME:S/^X/x/} 5PKGNAME= ${DISTNAME:S/^X/x/}
6PKGREVISION= 8 6PKGREVISION= 9
7CATEGORIES= x11 misc 7CATEGORIES= x11 misc
8MASTER_SITES= http://xdialog.free.fr/ 8MASTER_SITES= http://xdialog.free.fr/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xdialog.dyns.net/ 12HOMEPAGE= http://xdialog.dyns.net/
13COMMENT= X11 drop-in replacement for the curses dialog program 13COMMENT= X11 drop-in replacement for the curses dialog program
 14LICENSE= gnu-gpl-v2
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17USE_TOOLS+= msgfmt 18USE_TOOLS+= msgfmt
18USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
19GNU_CONFIGURE= YES 20GNU_CONFIGURE= YES
20 21
21DOCDIR= ${PREFIX}/share/doc/html/xdialog 22DOCDIR= ${PREFIX}/share/doc/xdialog
22EGDIR= ${PREFIX}/share/examples/xdialog 23EGDIR= ${PREFIX}/share/examples/xdialog
23 24
24CHECK_PORTABILITY_SKIP+= samples/* 25CHECK_PORTABILITY_SKIP+= samples/*
25 26
26INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} 27INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
27 28
28post-install: 29post-install:
29 cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DESTDIR}${DOCDIR} 30 cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DESTDIR}${DOCDIR}
30 for f in Xmessage Xmore buildlist calendar chain checklist \ 31.for f in Xmessage Xmore buildlist calendar chain checklist \
31 dselect editbox fselect gauge infobox infobox2 inputbox \ 32 dselect editbox fselect gauge infobox infobox2 inputbox \
32 logbox logbox2 login menubox msgbox radiolist rangebox \ 33 logbox logbox2 login menubox msgbox radiolist rangebox \
33 tailbox textbox timebox treeview yesno; \ 34 tailbox textbox timebox treeview yesno
34 do \ 35 ${INSTALL_SCRIPT} ${WRKSRC}/samples/${f} ${DESTDIR}${EGDIR}
35 ${INSTALL_SCRIPT} ${WRKSRC}/samples/$${f} ${DESTDIR}${EGDIR}; \ 36.endfor
36 done 
37 37
38.include "options.mk" 38.include "options.mk"
39 39
40.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/xdialog/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/PLIST 2009/06/14 18:25:10 1.6
+++ pkgsrc/x11/xdialog/PLIST 2012/07/30 02:21:31 1.7
@@ -1,68 +1,68 @@ @@ -1,68 +1,68 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:25:10 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2012/07/30 02:21:31 dholland Exp $
2bin/Xdialog 2bin/Xdialog
3man/man1/Xdialog.1 3man/man1/Xdialog.1
4share/doc/html/xdialog/2ranges.png 4share/doc/xdialog/2ranges.png
5share/doc/html/xdialog/authors.html 5share/doc/xdialog/authors.html
6share/doc/html/xdialog/box.html 6share/doc/xdialog/box.html
7share/doc/html/xdialog/buildlist.png 7share/doc/xdialog/buildlist.png
8share/doc/html/xdialog/calendar.png 8share/doc/xdialog/calendar.png
9share/doc/html/xdialog/center.png 9share/doc/xdialog/center.png
10share/doc/html/xdialog/changelog.html 10share/doc/xdialog/changelog.html
11share/doc/html/xdialog/check.png 11share/doc/xdialog/check.png
12share/doc/html/xdialog/checklist.png 12share/doc/xdialog/checklist.png
13share/doc/html/xdialog/colorsel.png 13share/doc/xdialog/colorsel.png
14share/doc/html/xdialog/combobox.png 14share/doc/xdialog/combobox.png
15share/doc/html/xdialog/common.html 15share/doc/xdialog/common.html
16share/doc/html/xdialog/compatibility.html 16share/doc/xdialog/compatibility.html
17share/doc/html/xdialog/dselect.png 17share/doc/xdialog/dselect.png
18share/doc/html/xdialog/editbox.png 18share/doc/xdialog/editbox.png
19share/doc/html/xdialog/faq.html 19share/doc/xdialog/faq.html
20share/doc/html/xdialog/fill.png 20share/doc/xdialog/fill.png
21share/doc/html/xdialog/fixedfont.png 21share/doc/xdialog/fixedfont.png
22share/doc/html/xdialog/fontsel.png 22share/doc/xdialog/fontsel.png
23share/doc/html/xdialog/fselect.png 23share/doc/xdialog/fselect.png
24share/doc/html/xdialog/gauge.png 24share/doc/xdialog/gauge.png
25share/doc/html/xdialog/gtk.html 25share/doc/xdialog/gtk.html
26share/doc/html/xdialog/icon.png 26share/doc/xdialog/icon.png
27share/doc/html/xdialog/index.html 27share/doc/xdialog/index.html
28share/doc/html/xdialog/infobox.png 28share/doc/xdialog/infobox.png
29share/doc/html/xdialog/input.png 29share/doc/xdialog/input.png
30share/doc/html/xdialog/intro.html 30share/doc/xdialog/intro.html
31share/doc/html/xdialog/labelcenter.png 31share/doc/xdialog/labelcenter.png
32share/doc/html/xdialog/labelleft.png 32share/doc/xdialog/labelleft.png
33share/doc/html/xdialog/labelright.png 33share/doc/xdialog/labelright.png
34share/doc/html/xdialog/left.png 34share/doc/xdialog/left.png
35share/doc/html/xdialog/license.html 35share/doc/xdialog/license.html
36share/doc/html/xdialog/logbox.png 36share/doc/xdialog/logbox.png
37share/doc/html/xdialog/msgbox.png 37share/doc/xdialog/msgbox.png
38share/doc/html/xdialog/nofixedfont.png 38share/doc/xdialog/nofixedfont.png
39share/doc/html/xdialog/notags.png 39share/doc/xdialog/notags.png
40share/doc/html/xdialog/password.png 40share/doc/xdialog/password.png
41share/doc/html/xdialog/radiolist.png 41share/doc/xdialog/radiolist.png
42share/doc/html/xdialog/range.png 42share/doc/xdialog/range.png
43share/doc/html/xdialog/rcfile.png 43share/doc/xdialog/rcfile.png
44share/doc/html/xdialog/right.png 44share/doc/xdialog/right.png
45share/doc/html/xdialog/special.html 45share/doc/xdialog/special.html
46share/doc/html/xdialog/spinbox.png 46share/doc/xdialog/spinbox.png
47share/doc/html/xdialog/syntax.html 47share/doc/xdialog/syntax.html
48share/doc/html/xdialog/tailbox.png 48share/doc/xdialog/tailbox.png
49share/doc/html/xdialog/timebox.png 49share/doc/xdialog/timebox.png
50share/doc/html/xdialog/title.png 50share/doc/xdialog/title.png
51share/doc/html/xdialog/transient.html 51share/doc/xdialog/transient.html
52share/doc/html/xdialog/treeview.png 52share/doc/xdialog/treeview.png
53share/doc/html/xdialog/withtags.png 53share/doc/xdialog/withtags.png
54share/doc/html/xdialog/yesno-wizard.png 54share/doc/xdialog/yesno-wizard.png
55share/doc/html/xdialog/yesno.png 55share/doc/xdialog/yesno.png
56share/examples/xdialog/Xmessage 56share/examples/xdialog/Xmessage
57share/examples/xdialog/Xmore 57share/examples/xdialog/Xmore
58share/examples/xdialog/buildlist 58share/examples/xdialog/buildlist
59share/examples/xdialog/calendar 59share/examples/xdialog/calendar
60share/examples/xdialog/chain 60share/examples/xdialog/chain
61share/examples/xdialog/checklist 61share/examples/xdialog/checklist
62share/examples/xdialog/dselect 62share/examples/xdialog/dselect
63share/examples/xdialog/editbox 63share/examples/xdialog/editbox
64share/examples/xdialog/fselect 64share/examples/xdialog/fselect
65share/examples/xdialog/gauge 65share/examples/xdialog/gauge
66share/examples/xdialog/infobox 66share/examples/xdialog/infobox
67share/examples/xdialog/infobox2 67share/examples/xdialog/infobox2
68share/examples/xdialog/inputbox 68share/examples/xdialog/inputbox
cvs diff -r1.6 -r1.7 pkgsrc/x11/xdialog/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/distinfo 2008/08/29 16:43:58 1.6
+++ pkgsrc/x11/xdialog/distinfo 2012/07/30 02:21:31 1.7
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.6 2008/08/29 16:43:58 sborrill Exp $ 1$NetBSD: distinfo,v 1.7 2012/07/30 02:21:31 dholland Exp $
2 2
3SHA1 (Xdialog-2.3.1.tar.bz2) = 292c552506633c54a28d51aa290277b7b5c0c708 3SHA1 (Xdialog-2.3.1.tar.bz2) = 292c552506633c54a28d51aa290277b7b5c0c708
4RMD160 (Xdialog-2.3.1.tar.bz2) = 12085dfddc9217fe5f07510c76755eb75446e658 4RMD160 (Xdialog-2.3.1.tar.bz2) = 12085dfddc9217fe5f07510c76755eb75446e658
5Size (Xdialog-2.3.1.tar.bz2) = 457938 bytes 5Size (Xdialog-2.3.1.tar.bz2) = 457938 bytes
6SHA1 (patch-ac) = c7f922ac80d0938e73ae50824f9e18855390ffd2 6SHA1 (patch-ac) = 785a6e5833617e0602699f8c7810a2db5c3354cf
7SHA1 (patch-ad) = 8f5ee338a95eb082f95705e9d2f528199841317c 7SHA1 (patch-ad) = f5d067838ce6418723fd0e7f658cea4442c88ce5
8SHA1 (patch-ae) = f613366909f25ed952b3ae33e8542f4a561f2c4b 8SHA1 (patch-ae) = cc0759387ba3d23d4ef2eddcc46d51705b9a5714
cvs diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/patches/patch-ac 2008/08/29 16:43:58 1.2
+++ pkgsrc/x11/xdialog/patches/patch-ac 2012/07/30 02:21:31 1.3
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1$NetBSD: patch-ac,v 1.2 2008/08/29 16:43:58 sborrill Exp $ 1$NetBSD: patch-ac,v 1.3 2012/07/30 02:21:31 dholland Exp $
 2
 3Configure paths for pkgsrc.
2 4
3--- doc/Xdialog.man.orig 2008-08-29 15:18:19.000000000 +0100 5--- doc/Xdialog.man.orig 2008-08-29 15:18:19.000000000 +0100
4+++ doc/Xdialog.man 2008-08-29 15:20:05.000000000 +0100 6+++ doc/Xdialog.man 2008-08-29 15:20:05.000000000 +0100
5@@ -268,11 +268,11 @@ 7@@ -268,11 +268,11 @@
6 .br  8 .br
7 \fI%%datadir%%/locale/*/LC_MESSAGES/Xdialog.mo\fP  9 \fI%%datadir%%/locale/*/LC_MESSAGES/Xdialog.mo\fP
8 .br  10 .br
9-\fI%%mandir%%/man1/Xdialog.1*\fP 11-\fI%%mandir%%/man1/Xdialog.1*\fP
10+\fI%%mandir%%/man1/Xdialog.1\fP 12+\fI%%mandir%%/man1/Xdialog.1\fP
11 .br  13 .br
12-\fI%%datadir%%/doc/Xdialog\-%%version%%/*\fP 14-\fI%%datadir%%/doc/Xdialog\-%%version%%/*\fP
13+\fI%%datadir%%/doc/html/xdialog/*\fP 15+\fI%%datadir%%/doc/xdialog/*\fP
14 .br  16 .br
15-\fI%%datadir%%/doc/Xdialog\-%%version%%/samples/*\fP 17-\fI%%datadir%%/doc/Xdialog\-%%version%%/samples/*\fP
16+\fI%%datadir%%/examples/xdialog/*\fP 18+\fI%%datadir%%/examples/xdialog/*\fP
17 .SH "ENVIRONMENT VARIABLES" 19 .SH "ENVIRONMENT VARIABLES"
18 .LP  20 .LP
19 \fIXDIALOG_HIGH_DIALOG_COMPAT\fR 21 \fIXDIALOG_HIGH_DIALOG_COMPAT\fR
20@@ -306,9 +306,9 @@ 22@@ -306,9 +306,9 @@
21 Setting this variable to 1 will prevent the Gdk, GLib and Gtk library from emitting messages via g_log(). 23 Setting this variable to 1 will prevent the Gdk, GLib and Gtk library from emitting messages via g_log().
22 .SH "EXAMPLES" 24 .SH "EXAMPLES"
23 .LP  25 .LP
24-Sample scripts are available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/samples/\fR directory. 26-Sample scripts are available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/samples/\fR directory.
25+Sample scripts are available in the \fI%%datadir%%/examples/xdialog\fR directory. 27+Sample scripts are available in the \fI%%datadir%%/examples/xdialog\fR directory.
26 .br  28 .br
27-Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/\fR directory. 29-Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/\fR directory.
28+Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/html/xdialog\fR directory. 30+Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/xdialog\fR directory.
29 .SH "AUTHORS" 31 .SH "AUTHORS"
30 .LP  32 .LP
31 Thierry Godefroy <xdialog@free.fr> (from v1.1.0 onwards) 33 Thierry Godefroy <xdialog@free.fr> (from v1.1.0 onwards)
cvs diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/patches/patch-ad 2008/08/29 16:43:58 1.2
+++ pkgsrc/x11/xdialog/patches/patch-ad 2012/07/30 02:21:31 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.2 2008/08/29 16:43:58 sborrill Exp $ 1$NetBSD: patch-ad,v 1.3 2012/07/30 02:21:31 dholland Exp $
 2
 3Don't install docs; that's handled by the package makefile instead.
2 4
3--- doc/Makefile.in.orig 2008-08-29 15:26:07.000000000 +0100 5--- doc/Makefile.in.orig 2008-08-29 15:26:07.000000000 +0100
4+++ doc/Makefile.in 2008-08-29 15:26:31.000000000 +0100 6+++ doc/Makefile.in 2008-08-29 15:26:31.000000000 +0100
5@@ -164,9 +164,9 @@ 7@@ -164,9 +164,9 @@
6 sysconfdir = @sysconfdir@ 8 sysconfdir = @sysconfdir@
7 target_alias = @target_alias@ 9 target_alias = @target_alias@
8 AUTOMAKE_OPTIONS = foreign no-dependencies 10 AUTOMAKE_OPTIONS = foreign no-dependencies
9-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) 11-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
10+docdir = 12+docdir =
11 CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1 13 CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
12-doc_DATA = index.html compatibility.html changelog.html license.html $(srcdir)/*.html $(srcdir)/*.png 14-doc_DATA = index.html compatibility.html changelog.html license.html $(srcdir)/*.html $(srcdir)/*.png
13+doc_DATA = index.html compatibility.html changelog.html license.html 15+doc_DATA = index.html compatibility.html changelog.html license.html
14 man_MANS = Xdialog.1 16 man_MANS = Xdialog.1
cvs diff -r1.2 -r1.3 pkgsrc/x11/xdialog/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/xdialog/patches/patch-ae 2008/08/29 16:43:58 1.2
+++ pkgsrc/x11/xdialog/patches/patch-ae 2012/07/30 02:21:31 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ae,v 1.2 2008/08/29 16:43:58 sborrill Exp $ 1$NetBSD: patch-ae,v 1.3 2012/07/30 02:21:31 dholland Exp $
 2
 3Don't install docs; that's handled by the package makefile instead.
2 4
3--- Makefile.in.orig 2008-08-29 16:27:35.000000000 +0100 5--- Makefile.in.orig 2008-08-29 16:27:35.000000000 +0100
4+++ Makefile.in 2008-08-29 16:27:52.000000000 +0100 6+++ Makefile.in 2008-08-29 16:27:52.000000000 +0100
5@@ -186,9 +186,9 @@ 7@@ -186,9 +186,9 @@
6 target_alias = @target_alias@ 8 target_alias = @target_alias@
7 AUTOMAKE_OPTIONS = foreign no-dependencies 9 AUTOMAKE_OPTIONS = foreign no-dependencies
8 SUBDIRS = m4 lib src po doc 10 SUBDIRS = m4 lib src po doc
9-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) 11-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
10+docdir = 12+docdir =
11 CONFIG_CLEAN_FILES = ltmain.sh ltconfig autom4te.cache/* 13 CONFIG_CLEAN_FILES = ltmain.sh ltconfig autom4te.cache/*
12-doc_DATA = $(srcdir)/samples/* 14-doc_DATA = $(srcdir)/samples/*
13+doc_DATA = 15+doc_DATA =
14 ACLOCAL_AMFLAGS = -I m4 16 ACLOCAL_AMFLAGS = -I m4