summaryrefslogtreecommitdiff
path: root/x11/xdialog
diff options
context:
space:
mode:
authorsalo <salo>2003-05-13 23:33:01 +0000
committersalo <salo>2003-05-13 23:33:01 +0000
commit5e26f777ccd6537dbdcc516b4436d7a46208474c (patch)
tree4a3ced3320c0a06241be1dcf90b836cbad16cb9f /x11/xdialog
parent1da55428bf131bd394ae9367e013488aa3f224a8 (diff)
downloadpkgsrc-5e26f777ccd6537dbdcc516b4436d7a46208474c.tar.gz
Updated to version 2.0.6.
Based on a patch sent by Brian de Alwis via PR pkg/21567. Changes: - GNU make is not really needed - install documentation and examples - updated HOMEPAGE and MASTER_SITES - DESCR has 80 columns - style nits 2.0.6: ====== - Added the "Hide typing" check button into input boxes when --password option is in use. - Corrected a bug where "unchecked" was not returned with --check and --inputbox combination when the enter key was pressed to close the box (bug reported by Scott Ostrander). - Norvegian translations added (courtessy of Jostein Christoffer Andersen). 2.0.5: ====== - Corrected a bug (coredump on inexistant file passed to tailbox and logbox) introduced in v2.0.4. - Upgraded to gettext v0.10.40. - Removed all references to "RedHat" and "Linux" after "radiolist" and "checklist" samples scripts --backtitle options. 2.0.4: ====== - Debian packaging bug fix (missing "gettext" build dependency added). - Improved --tailbox and --logbox loading of files at startup (based on a patch submitted by Christian Werner, although I only kept his excellent idea and implemented it my own way). The --smooth transient option disables this feature for the --logbox (because if the file is big, it may take quite some time to load and process, time during which no logbox menu display update occurs...). - A cosmetic bug corrected into --logbox (the ending newline is removed from each line; it appeared as a space with a grey border with XFree86 v4.1.0/GTK+ v1.2.10). - Ensure that "unchecked" is not returned when using the --check transient option with infobox, gauge and progress widgets (fool proofing, as the --check option is not for use with these widgets...). - Better german translations, courtesy of Sven Backhausen. - Brazilian/Portuguese translations, courtesy of Lucas Brasilino. - Xdialog.wrapper changed so that the XDIALOG_FORCE_AUTOSIZE environment variable is set to "true" (if not already set to any value) before invoking Xdialog. - Removed the --statistics option from msgfmt command line in po/Makefile.in.in so to allow compilation on Solaris (this may as well solves the compile problems on some Debian plateforms). Problem reported by "Exile In Paradise". - Removed unnecessary po/*.c and po/*.h from the distribution. - Slightly improved Xdialog.spec. - Documentation updates and improvements (including a more complete man page). 2.0.3: ====== - New --ok-label and --cancel-label transient options added. - Hungarian translations added (courtesy of Lenart Janos). - Debianized source tree (courtesy of Lenart Janos). - Doc. updates. 2.0.2: ====== - Spanish translations added (courtesy of Horacio Castellon). - "make distclean" now removes "ltconfig" and "ltmain.sh" that are put in the directory when building with "rpm" (libtoolize is always ran by "rpm": it is plain useless here). - Replaced the "%make" macro with "make" so to allow the RPM to build on RedHat systems. - Changed doc/Xdialog.man, Makefile.am and Xdialog.spec so that the proper installation directory names are shown in the Xdialog man page. - Make use of the new gettext 0.10.38 (for a better portability on non-GNU/Linux systems; suggested by Albert Chin-A-Young). - Changed Xdialog.wrapper.c (samples directory) so that before calling Xdialog, it sets the XDIALOG_HIGH_DIALOG_COMPAT environment variable to "true" (if this variable is already set, its contents is not overwritten though, so it is always possible to set it to "false" if you don't like this feature). - Doc. updates. - A work around implemented for a getopt_long_only() bug that often made Xdialog v2.0.0/1 to segfault on unknown options. - Two bugs removed from the progress widget (as a result, the "allrpms" sample script now works properly). - New --smooth transient option added to get a smooth (flicker free but slow) scrolling in tailbox and logbox widgets. - "kernel" sample script changed to make use of --smooth. - Doc. updates. 2.0.1: ====== - Support for --with-included-gettext configure option added (patch courtesy of Albert Chin-A-Young). - Russian translations added (courtesy of Stanislav Ievlev). - Small compatibility fixes for compilation on non-linux platforms (courtesy of Peter Bray). - New --ignore-eof transient option implemented for use with infobox and gauge widgets. - Doc. updates. 2.0.0: ====== - Feature: XDIALOG_HIGH_DIALOG_COMPAT environment variable support added (makes Xdialog even more (c)dialog compatible, when set to TRUE). The new XDIALOG_FORCE_AUTOSIZE and XDIALOG_INFOBOX_TIMEOUT environment variables may also be used IOT customize Xdialog behaviour when the high (c)dialog compatibilty mode is on. - Feature: new --combobox widget and associated --editable transient option implemented. - Feature: new --spinbox, --2spinsbox and --3spinsbox widgets implemented. - Feature: new --logbox widget and associated --time-stamp, --date-stamp, --reverse and --keep-colors transient options implemented. - Feature: new --no-ok transient option for use with --tailbox and --logbox widgets. - Feature: --beep and --beep-after transient options implemented (cdialog compatible). - Feature: --passwordbox widget (cdialog compatible, synonym to --password --inputbox) implemented. - Feature: it is now possible to place Xdialog windows at absolute pixel coordinates on the screen (provided your window manager lets you do so), by giving the origin into a "-geometry"-like coordinates specification (e.g. 200x100+120+50), or by using the new --begin transient option (in characters coordinates). - Feature: it is now possible to maximize Xdialog widgets by passing a -1 -1 (or -1x-1) size specification. - Feature: the --backtitle, --button-style, --wizard, --no-cancel, --default-no and --check options are taken into account by (and may therefore be used with) the fselect and dselect widgets. - Feature: the textbox and editbox widgets do now auto-size properly (the length of the text lines and the number of lines are taken into account). - Feature: the status of --checklist, --radiolist, --buildlist and --treeview widgets items can now also be set to "unavailable" so to make items listed but unsensitive. It is also possible to make a --menubox item unavailable by associating it with a null (empty string) tag. - Feature: --default-item transient option implemented (cdialog compatible) for --menubox. - Feature: fake --clear option accepted alone in command line (it does nothing, it just doesn't complain about a missing box option), for (c)dialog compatibility - Feature: --cr-wrap (cdialog compatible) and --no-cr-wrap common options implemented. - Improvement: better (faster) callback function for tailbox. - Improvement: better calculations for box size in characters (the size of the font actually in use is taken into account instead of the size of the fixed font). - Improvement: better text wrapping function (the buggy GTK+ built-in one is no more used). - Improvement: Internationalization using gettext. French and german translations implemented. - Cosmetic: the help button now appears together with the OK/ Cancel/etc buttons into the fselect and dselect widgets. - Cosmetic: Item selection scheme changed for menubox and treeview (it is no more possible to remove the highligthing from the last selected item). - Cosmetic: the vertical slider in menubox/checklist/radiolist/ buildlist/treeview is no more mandatory (it is setup automa- tically by GTK+ when actually needed). - Bugfix: a bug fixed (introduced in v1.5.3), dealing with simultaneous use of --check and --help transient options (the check button was wrongly setup into the help box). - Coding: code factorisation IOT reduce size, improve ease of maintenance and readability. Improvements to "configure" and sources for a better portability. - The fixed font used by Xdialog may now be changed at compile time thanks to the "configure" script ("./configure --help" for details). - Some sample scripts changed to take advantage of the textbox/ editbox auto-size feature, logbox and logbox2 sample scripts added. - Doc updates and improvements. 1.5.3: ====== - Bug fixed (introduced in v1.5.1) that caused Xdialog to segfault when closed while a timeout function was updating the widget. - The tailbox may now be closed or resized while it updates the text in its window. - The --gauge now updates 100 times each second (should hopefully be enough !). - Removed the possibility to setup a "Help" button into an infobox (this makes no sense for a temporary widget). - The menu/lists/tree can now auto-size when the <list/menu height> parameter is set to 0. - The Add/Remove buttons are now greyed out when no item is available into the associated list (Hi Albert ! ;-). - New --item-help (cdialog-compatible) transient option implemented. - New --check transient option implemented. - Some code cleanup. - Doc updates and improvements. - xlock-wrapper sample script added and older sample scripts changed so to make use of the lists/menu/tree auto-size feature. 1.5.2: ====== - New --progress widget added. - New --fill common option implemented. - Changed slightly the behaviour of --center and --right options as a work around for the GTK+ line wrap mode bugs. - Some code improvement (simplification). - Doc updates and improvements (a basic man page has been added too). - Two samples scripts added (allrpms and format1440). 1.5.1: ====== - One bug corrected (introduced in v1.4.6) that made GTK to issue warnings when using the --help option together with the --fselect and --dselect widgets while the --button-style was "icon" or "default". - Much better callback timer functions for the --infobox and the --gauge widgets (refreshes occurs more often and no label/progress bar refresh can be missed anymore). - New --print-maxsize special option implemented (compatible with the cdialog option of the same name). - Better justification scheme for <labels> in --2inputsbox, --3inputsbox, --2rangesbox and --3rangesbox widgets. These labels now also accept "\n" for line splitting. - Updated and more complete documentation. - New --with-print-* compile time customization options for "configure". 1.5.0: ======= - 5 new widgets: --2inputsbox, --3inputsbox, --2rangesbox, --3rangesbox, --buildlist. - 2 new common options: --separator, --separate-output. - 3 new transient options: --interval, --default-no, --wizard. - 1 new special option: --print-version (for cdialog compatibility). - The <menu/list height> parameter is now taken into account. - Better auto-sizing for some widgets. - The <height> and <width> parameters are now actually related to the true (fixed font) character size. - The "Help" button may now be setup so to make Xdialog to return (with exit code=2). - Better parameter checking (item depth) in --treeview. - Some re-write for cleaner code and smaller binary. - Full HTML documentation written (as a result the README file is no more maintained and the FAQ has been HTMLized).
Diffstat (limited to 'x11/xdialog')
-rw-r--r--x11/xdialog/DESCR6
-rw-r--r--x11/xdialog/Makefile39
-rw-r--r--x11/xdialog/PLIST87
-rw-r--r--x11/xdialog/distinfo9
-rw-r--r--x11/xdialog/patches/patch-aa49
-rw-r--r--x11/xdialog/patches/patch-ab13
-rw-r--r--x11/xdialog/patches/patch-ac31
7 files changed, 217 insertions, 17 deletions
diff --git a/x11/xdialog/DESCR b/x11/xdialog/DESCR
index 60a4e3f44ed..769932c10fa 100644
--- a/x11/xdialog/DESCR
+++ b/x11/xdialog/DESCR
@@ -1,6 +1,6 @@
Xdialog is designed to be a drop in replacement for the "dialog" or "cdialog"
programs. It converts any terminal based program into a program with an
X-windows interface. The dialogs are easier to see and use while adding even
-more functionalities (e.g. with the treeview, the file selector, the edit
-box, the range box, the help button/box). Because Xdialog uses GTK+, it will
-also match your desktop themes.
+more functionalities (e.g. with the treeview, the file selector, the edit box,
+the range box, the help button/box). Because Xdialog uses GTK+, it will also
+match your desktop themes.
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 706022b1e04..7d349787d00 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,19 +1,38 @@
-# $NetBSD: Makefile,v 1.6 2003/05/05 12:10:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/13 23:33:02 salo Exp $
+#
-DISTNAME= Xdialog-1.4.6
-PKGREVISION= 2
-PKGNAME= xdialog-1.4.6
-CATEGORIES= misc x11
-MASTER_SITES= http://xdialog.free.fr/
+DISTNAME= Xdialog-2.0.6
+PKGNAME= ${DISTNAME:S/^X/x/}
+CATEGORIES= x11 misc
+MASTER_SITES= http://www.chez.com/godefroy/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://xdialog.free.fr/
+HOMEPAGE= http://www.chez.com/godefroy/
COMMENT= X11 drop-in replacement for the curses dialog program
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-GNU_CONFIGURE= # defined
+BUILD_USES_MSGFMT= YES
+
+USE_BUILDLINK2= YES
+USE_PKGLOCALEDIR= YES
+GNU_CONFIGURE= YES
+USE_X11= YES
+
+DOCDIR= ${PREFIX}/share/doc/html/xdialog
+EGDIR= ${PREFIX}/share/examples/xdialog
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ 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} ${EGDIR}; \
+ done
.include "../../x11/gtk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdialog/PLIST b/x11/xdialog/PLIST
index 6faee47d826..a322f1ef9cc 100644
--- a/x11/xdialog/PLIST
+++ b/x11/xdialog/PLIST
@@ -1,2 +1,87 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/13 23:33:02 salo 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/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/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/examples/xdialog/Xmessage
+share/examples/xdialog/Xmore
+share/examples/xdialog/buildlist
+share/examples/xdialog/calendar
+share/examples/xdialog/chain
+share/examples/xdialog/checklist
+share/examples/xdialog/dselect
+share/examples/xdialog/editbox
+share/examples/xdialog/fselect
+share/examples/xdialog/gauge
+share/examples/xdialog/infobox
+share/examples/xdialog/infobox2
+share/examples/xdialog/inputbox
+share/examples/xdialog/logbox
+share/examples/xdialog/logbox2
+share/examples/xdialog/login
+share/examples/xdialog/menubox
+share/examples/xdialog/msgbox
+share/examples/xdialog/radiolist
+share/examples/xdialog/rangebox
+share/examples/xdialog/tailbox
+share/examples/xdialog/textbox
+share/examples/xdialog/timebox
+share/examples/xdialog/treeview
+share/examples/xdialog/yesno
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/no_NO/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/Xdialog.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/Xdialog.mo
+@dirrm share/examples/xdialog
+@dirrm share/doc/html/xdialog
diff --git a/x11/xdialog/distinfo b/x11/xdialog/distinfo
index f4b9d3a9ffb..ada2a20ba3c 100644
--- a/x11/xdialog/distinfo
+++ b/x11/xdialog/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:52 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/05/13 23:33:02 salo Exp $
-SHA1 (Xdialog-1.4.6.tar.bz2) = b944bde9c828609183fa8ecd5913047d1a5ab169
-Size (Xdialog-1.4.6.tar.bz2) = 87324 bytes
+SHA1 (Xdialog-2.0.6.tar.bz2) = 72c0319353a991cae7fedb6f210ab64c6e06a798
+Size (Xdialog-2.0.6.tar.bz2) = 409506 bytes
+SHA1 (patch-aa) = 8869174d43ecf415caa68a2dc3ccdc122f0a162c
+SHA1 (patch-ab) = caee58c681f467e84f0f1f8237d58bbe1faf2d3a
+SHA1 (patch-ac) = 1c2109802baca4970b5d1f00a53ca0147ea39496
diff --git a/x11/xdialog/patches/patch-aa b/x11/xdialog/patches/patch-aa
new file mode 100644
index 00000000000..ad17eb489d3
--- /dev/null
+++ b/x11/xdialog/patches/patch-aa
@@ -0,0 +1,49 @@
+$NetBSD: patch-aa,v 1.1 2003/05/13 23:33:02 salo Exp $
+
+--- samples/Xmessage.orig 2001-04-10 17:33:50.000000000 +0200
++++ samples/Xmessage 2003-05-14 00:09:14.000000000 +0200
+@@ -19,7 +19,7 @@
+ FONT="--fixed-font"
+ TIMEOUT=""
+
+-if [ "$1" == "" ] ; then
++if [ "$1" = "" ] ; then
+ echo "usage: Xmessage [-options] [message]
+
+ where options include:
+@@ -93,7 +93,7 @@
+
+ # We cannot emulate the "-buttons" option, so give up and use the true "xmessage"
+ # if this option was specified in the command line...
+-if [ "$BUTTONS" == "true" ] ; then
++if [ "$BUTTONS" = "true" ] ; then
+ echo "Buttons related options (-buttons, -default, -print) not supported,"
+ echo "invoking \"xmessage\" intead..." 1>&2
+ xmessage "$OPTIONS"
+@@ -107,7 +107,7 @@
+ # the textbox or the tailbox.
+ #
+ # So first start Xdialog as an asynchronous process...
+- if [ "$FILE" == "" ] ; then
++ if [ "$FILE" = "" ] ; then
+ echo "$TEXT" | \
+ Xdialog --title "$TITLE" --wmclass "$WMCLASS" $PLACEMENT $FONT --no-cancel \
+ --tailbox "-" $YSIZE $XSIZE &
+@@ -125,7 +125,7 @@
+ while (( $TIMEOUT > 0 )) ; do
+ sleep 1
+ STILL_THERE=`ps | awk --source "$SOURCE"`
+- if [ "$STILL_THERE" == "" ] ; then
++ if [ "$STILL_THERE" = "" ] ; then
+ exit 0
+ fi
+ let TIMEOUT=$TIMEOUT-1
+@@ -135,7 +135,7 @@
+ exit 0
+ else
+ # No timeout, just start Xdialog synchronously then...
+- if [ "$FILE" == "" ] ; then
++ if [ "$FILE" = "" ] ; then
+ echo "$TEXT" | \
+ Xdialog --title "$TITLE" --wmclass "$WMCLASS" $PLACEMENT $FONT --no-cancel \
+ --tailbox "-" $YSIZE $XSIZE
diff --git a/x11/xdialog/patches/patch-ab b/x11/xdialog/patches/patch-ab
new file mode 100644
index 00000000000..c4dbb2122e8
--- /dev/null
+++ b/x11/xdialog/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/05/13 23:33:02 salo Exp $
+
+--- samples/textbox.orig 2001-04-10 17:31:24.000000000 +0200
++++ samples/textbox 2003-05-14 00:39:59.000000000 +0200
+@@ -16,7 +16,7 @@
+
+ EOF
+
+-cat /etc/bashrc | expand >> /tmp/textbox.tmp.$$
++cat /etc/services | expand >> /tmp/textbox.tmp.$$
+
+ $DIALOG --title "TEXT BOX" --textbox "/tmp/textbox.tmp.$$" 0 0
+
diff --git a/x11/xdialog/patches/patch-ac b/x11/xdialog/patches/patch-ac
new file mode 100644
index 00000000000..b36d5962358
--- /dev/null
+++ b/x11/xdialog/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2003/05/13 23:33:02 salo Exp $
+
+--- doc/Xdialog.man.orig 2001-12-02 09:51:47.000000000 +0100
++++ doc/Xdialog.man 2003-05-14 01:15:07.000000000 +0200
+@@ -260,11 +260,11 @@
+ .br
+ \fI%%datadir%%/locale/*/LC_MESSAGES/Xdialog.mo\fP
+ .br
+-\fI%%mandir%%/man1/Xdialog.1*\fP
++\fI%%mandir%%/man1/Xdialog.1\fP
+ .br
+-\fI%%datadir%%/doc/Xdialog\-%%version%%/*\fP
++\fI%%datadir%%/doc/html/xdialog/*\fP
+ .br
+-\fI%%datadir%%/doc/Xdialog\-%%version%%/samples/*\fP
++\fI%%datadir%%/examples/xdialog/*\fP
+ .SH "ENVIRONMENT VARIABLES"
+ .LP
+ \fIXDIALOG_HIGH_DIALOG_COMPAT\fR
+@@ -294,9 +294,9 @@
+ See the notes about \fBXDIALOG_HIGH_DIALOG_COMPAT\fR above.
+ .SH "EXAMPLES"
+ .LP
+-Sample scripts are available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/samples/\fR directory.
++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/dialog\fR directory.
+ .SH "AUTHORS"
+ .LP
+ Thierry Godefroy <xdialog@free.fr> (from v1.1.0 onwards)