9 files changed, 58 insertions, 73 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index fcf9110e1d3..69a2be547d1 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.81 2005/06/30 15:28:45 adam Exp $
 
-DISTNAME=	lesstif-0.94.0
-PKGREVISION=	1
+DISTNAME=	lesstif-0.94.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lesstif/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo
index 65373147eaa..21fb33fd51e 100644
--- a/x11/lesstif/distinfo
+++ b/x11/lesstif/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.13 2005/03/10 16:07:27 wiz Exp $
+$NetBSD: distinfo,v 1.14 2005/06/30 15:28:45 adam Exp $
 
-SHA1 (lesstif-0.94.0.tar.bz2) = 50456f6f2fe48354a7b1d1cbe4b58b5244aa2fa5
-RMD160 (lesstif-0.94.0.tar.bz2) = 529a5f7dcc5997ca3282f415f50ebd0634c9ad16
-Size (lesstif-0.94.0.tar.bz2) = 2425210 bytes
-SHA1 (patch-aa) = c464f492e7c53bba85b0ad2dcc93caedf1f1be03
+SHA1 (lesstif-0.94.4.tar.bz2) = 5c608630998d2f5ce096d4bbf1dec52e77c98588
+RMD160 (lesstif-0.94.4.tar.bz2) = 1025f6b662437a4e47a909aed7098901abf02c3c
+Size (lesstif-0.94.4.tar.bz2) = 2447156 bytes
+SHA1 (patch-aa) = a9748026f9645f346e2e0486cf975337a3bcabe4
 SHA1 (patch-ab) = 8839488b15ae6a01bb4d6af46e386e894eb2cddf
 SHA1 (patch-ac) = 0e7bd9c469d98ea6a4257e734f69e321f8fee442
-SHA1 (patch-am) = aa596b7cfe30c5764bf7ce908e5f400649b91d23
-SHA1 (patch-an) = 01b8538e39797bf3ec54a8df61ab277ab6f961b9
-SHA1 (patch-ao) = f122671c96e510f4b235e943b1502cd0b77a01b7
-SHA1 (patch-ap) = e79e54362dab026efb0606b3a4dd9dcbc802a5ad
-SHA1 (patch-aq) = b5abefab2422e03e5bf9ace54ea89d23ddeb41c9
-SHA1 (patch-ar) = 200d4b0565599157969ebeff3f80abd0c0ce69e1
+SHA1 (patch-am) = 67d89893e806032c23301e6bcbd48bc99d0dd216
+SHA1 (patch-an) = db515a483519f321bbeaec384a1ccd7ed0eb503c
+SHA1 (patch-ao) = 43ce04cc679d5181b03ca974edcb6a273370cf46
+SHA1 (patch-ap) = 809d82f12de219eaa7ce174f6b14d4110228f888
+SHA1 (patch-aq) = ccd7a53fed86e07f205d9937f408bd266c70ef3d
+SHA1 (patch-ar) = 2b0a55cece6927fd4fcf4347db18ae4625383601
 SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e
 SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 9f64c2e5ede..56ebb60d0a7 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.24 2004/11/22 14:30:18 adam Exp $
+$NetBSD: patch-aa,v 1.25 2005/06/30 15:28:45 adam Exp $
 
---- Makefile.in.orig	2004-09-28 21:37:55.000000000 +0000
+--- Makefile.in.orig	2005-03-31 19:45:07.000000000 +0000
 +++ Makefile.in
-@@ -282,11 +282,11 @@ DIST_SUBDIRS = scripts include lib clien
- # Lets put the informational stuff in a sub directory to avoid 
- # poluting /usr/local for default installs.
+@@ -282,7 +282,7 @@ DIST_SUBDIRS = scripts include lib clien
+ # Lets put the informational stuff in a sub directory to avoid
+ # polluting /usr/local for default installs.
  #
 -rootdir = $(prefix)/LessTif
-+rootdir = $(prefix)/share/doc/lesstif
++rootdir = $(prefix)/share/lesstif
  dist_root_DATA = AUTHORS  BUG-REPORTING  COPYING  COPYING.LIB  CREDITS \
                  FAQ  INSTALL.txt  README  ReleaseNotes.html ReleaseNotes.txt
  
--htmldir = $(prefix)/LessTif/doc
-+htmldir = $(prefix)/share/doc/html/lesstif
- html_DATA = ReleaseNotes.html
- 
- #
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
index 28c6b431744..2fc4c0ad95a 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.14 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-am,v 1.15 2005/06/30 15:28:45 adam Exp $
 
---- doc/Makefile.in.orig	2004-09-26 14:15:01.000000000 +0000
+--- doc/Makefile.in.orig	2005-03-31 19:44:56.000000000 +0000
 +++ doc/Makefile.in
 @@ -259,7 +259,7 @@ EXTRA_DIST = $(DATA)
  # InsideLessTif/ shouldn't be touched:
  # it has a stand-alone Makefile w/o auto* stuff
  SUBDIRS = www.lesstif.org lessdox
--rootdir = $(prefix)/LessTif/doc
-+rootdir = $(prefix)/share/doc/html/lesstif
- root_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
+ doc_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \
  		GeoUtils.txt Geometry.html SyntheticResources.txt \
- 		UIL.txt XmStrings.txt thread.html
diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an
index 6c9c035b232..79db9a1378d 100644
--- a/x11/lesstif/patches/patch-an
+++ b/x11/lesstif/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.17 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-an,v 1.18 2005/06/30 15:28:45 adam Exp $
 
---- doc/lessdox/clients/Makefile.in.orig	2004-09-26 14:15:02.000000000 +0000
+--- doc/lessdox/clients/Makefile.in.orig	2005-03-31 19:44:57.000000000 +0000
 +++ doc/lessdox/clients/Makefile.in
 @@ -257,7 +257,7 @@ manfivedir = @mandir@/man5
  manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1
  manthree_DATA = 
  manfive_DATA = mwmrc.5 VirtualBindings.5
--htmldir = $(prefix)/LessTif/doc/html
-+htmldir = $(prefix)/share/doc/html/lesstif
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
+ htmldir = $(docdir)/html
  html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html \
-             VirtualBindings.html
- 
diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao
index 2bab25cad61..28d80f3f5a9 100644
--- a/x11/lesstif/patches/patch-ao
+++ b/x11/lesstif/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.14 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-ao,v 1.15 2005/06/30 15:28:45 adam Exp $
 
---- doc/lessdox/functions/Makefile.in.orig	2004-09-26 14:15:02.000000000 +0000
+--- doc/lessdox/functions/Makefile.in.orig	2005-03-31 19:44:58.000000000 +0000
 +++ doc/lessdox/functions/Makefile.in
 @@ -257,7 +257,7 @@ manfivedir = @mandir@/man5
  manone_DATA = 
  manthree_DATA = 
  manfive_DATA = 
--htmldir = $(prefix)/LessTif/doc/html
-+htmldir = $(prefix)/share/doc/html/lesstif
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
+ htmldir = $(docdir)/html
  html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
-                 ${manfive_DATA:.5=.html}
- 
diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap
index da6c6640191..9220c5b7371 100644
--- a/x11/lesstif/patches/patch-ap
+++ b/x11/lesstif/patches/patch-ap
@@ -1,22 +1,13 @@
-$NetBSD: patch-ap,v 1.13 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-ap,v 1.14 2005/06/30 15:28:45 adam Exp $
 
---- doc/lessdox/widgets/Makefile.in.orig	2004-09-26 14:15:03.000000000 +0000
+--- doc/lessdox/widgets/Makefile.in.orig	2005-03-31 19:44:59.000000000 +0000
 +++ doc/lessdox/widgets/Makefile.in
 @@ -282,7 +282,7 @@ manthree_DATA = \
  	Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3
  
  manfive_DATA = 
--htmldir = $(prefix)/LessTif/doc/html
-+htmldir = $(prefix)/share/doc/html/lesstif
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
+ htmldir = $(docdir)/html
  html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
-                 ${manfive_DATA:.5=.html}
- 
-@@ -549,7 +549,7 @@ $(html_DATA): $(MAN2HTML)
- # in both the http://www.lesstif.org and the locally installed case.
- #
- install-data-hook:
--	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
-+#	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq
index a9808be936e..e5bf868b57f 100644
--- a/x11/lesstif/patches/patch-aq
+++ b/x11/lesstif/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.16 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-aq,v 1.17 2005/06/30 15:28:45 adam Exp $
 
---- doc/www.lesstif.org/Makefile.in.orig	2004-09-26 14:15:03.000000000 +0000
+--- doc/www.lesstif.org/Makefile.in.orig	2005-03-31 19:44:59.000000000 +0000
 +++ doc/www.lesstif.org/Makefile.in
 @@ -263,7 +263,7 @@ SUBDIRS = images
- # Lets put the informational stuff in a sub directory to avoid 
+ # Lets put the informational stuff in a sub directory to avoid
  # polluting /usr/local for default installs.
  #
--docdir = $(prefix)/LessTif/doc
-+docdir = $(prefix)/share/doc/html/lesstif
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
  doc_DATA = \
     Advocacy.html          contents.html          misc_frame.html \
-    BUG-HUNTING.html       core.html              news.html \
diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar
index 5dea65d593e..c97891ed4cd 100644
--- a/x11/lesstif/patches/patch-ar
+++ b/x11/lesstif/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.12 2004/09/28 12:52:14 adam Exp $
+$NetBSD: patch-ar,v 1.13 2005/06/30 15:28:45 adam Exp $
 
---- doc/www.lesstif.org/images/Makefile.in.orig	2004-09-26 14:15:03.000000000 +0000
+--- doc/www.lesstif.org/images/Makefile.in.orig	2005-03-31 19:44:59.000000000 +0000
 +++ doc/www.lesstif.org/images/Makefile.in
 @@ -253,7 +253,7 @@ EXTRA_DIST = $(DATA)
- # Lets put the informational stuff in a sub directory to avoid 
- # poluting /usr/local for default installs.
+ # Lets put the informational stuff in a sub directory to avoid
+ # polluting /usr/local for default installs.
  #
--rootdir = $(prefix)/LessTif/doc/images
-+rootdir = $(prefix)/share/doc/html/lesstif/images
- root_DATA = hungry.png \
- 		lesstif-realsmall.png lesstif-small.png lesstif.png \
- 		ltsunlogo.png lesstif.jpg ltsunlogo.jpg \
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/lesstif
+ docdir = $(rootdir)/doc
+ imagesdir = $(docdir)/images
+ images_DATA = hungry.png \