summaryrefslogtreecommitdiff
path: root/x11/lesstif
diff options
context:
space:
mode:
Diffstat (limited to 'x11/lesstif')
-rw-r--r--x11/lesstif/Makefile59
-rw-r--r--x11/lesstif/Makefile.common71
-rw-r--r--x11/lesstif/PLIST38
-rw-r--r--x11/lesstif/buildlink2.mk6
-rw-r--r--x11/lesstif/distinfo56
-rw-r--r--x11/lesstif/patches/patch-aa55
-rw-r--r--x11/lesstif/patches/patch-ab43
-rw-r--r--x11/lesstif/patches/patch-ac4
-rw-r--r--x11/lesstif/patches/patch-ad24
-rw-r--r--x11/lesstif/patches/patch-ae24
-rw-r--r--x11/lesstif/patches/patch-af47
-rw-r--r--x11/lesstif/patches/patch-ag29
-rw-r--r--x11/lesstif/patches/patch-ah28
-rw-r--r--x11/lesstif/patches/patch-ai47
-rw-r--r--x11/lesstif/patches/patch-aj29
-rw-r--r--x11/lesstif/patches/patch-ak29
-rw-r--r--x11/lesstif/patches/patch-al16
-rw-r--r--x11/lesstif/patches/patch-am18
-rw-r--r--x11/lesstif/patches/patch-an28
-rw-r--r--x11/lesstif/patches/patch-ao28
-rw-r--r--x11/lesstif/patches/patch-ap46
-rw-r--r--x11/lesstif/patches/patch-aq15
-rw-r--r--x11/lesstif/patches/patch-ar14
-rw-r--r--x11/lesstif/patches/patch-as29
-rw-r--r--x11/lesstif/patches/patch-at40
-rw-r--r--x11/lesstif/patches/patch-au29
-rw-r--r--x11/lesstif/patches/patch-av28
-rw-r--r--x11/lesstif/patches/patch-aw26
-rw-r--r--x11/lesstif/patches/patch-ax28
-rw-r--r--x11/lesstif/patches/patch-ay29
-rw-r--r--x11/lesstif/patches/patch-az26
-rw-r--r--x11/lesstif/patches/patch-ba28
-rw-r--r--x11/lesstif/patches/patch-bb58
-rw-r--r--x11/lesstif/patches/patch-bc26
-rw-r--r--x11/lesstif/patches/patch-bd43
-rw-r--r--x11/lesstif/patches/patch-be43
-rw-r--r--x11/lesstif/patches/patch-bf38
-rw-r--r--x11/lesstif/patches/patch-bg43
-rw-r--r--x11/lesstif/patches/patch-bh43
-rw-r--r--x11/lesstif/patches/patch-bi38
-rw-r--r--x11/lesstif/patches/patch-bj43
-rw-r--r--x11/lesstif/patches/patch-bk43
-rw-r--r--x11/lesstif/patches/patch-bl38
-rw-r--r--x11/lesstif/patches/patch-bm24
-rw-r--r--x11/lesstif/patches/patch-bn20
45 files changed, 183 insertions, 1334 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index c39b56611af..95cba1f45f3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,21 +1,41 @@
-# $NetBSD: Makefile,v 1.62 2002/08/25 18:40:37 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2002/12/05 19:10:42 drochner Exp $
+DISTNAME= lesstif-0.93.36
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
+ ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \
+ ftp://ftp.kddlabs.co.jp/X11/lesstif/srcdist/ \
+ ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ \
+ http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
+ http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/
+
+MAINTAINER= jlam@netbsd.org
+HOMEPAGE= http://www.lesstif.org/
COMMENT= API compatible clone of the OSF/Motif toolkit
CONFLICTS+= openmotif-[0-9]*
USE_BUILDLINK2= # defined
-
-.include "Makefile.common"
-
+USE_X11BASE= # defined
+USE_GMAKE= # defined
+USE_LIBTOOL= # defined
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool
+GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --disable-build-12
-CONFIGURE_ARGS+= --enable-build-20
-CONFIGURE_ARGS+= --disable-build-21
-CONFIGURE_ARGS+= --enable-default-20
+CONFIGURE_ARGS+= --disable-build-20
+CONFIGURE_ARGS+= --enable-build-21
+CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose
+CONFIGURE_ARGS+= --enable-editres --enable-xdnd
+
+# The following forces the build process to use sed as the HTML-to-text
+# converter.
+#
+CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable
+CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-
FILES_SUBST= LOCALBASE=${LOCALBASE}
FILES_SUBST+= X11BASE=${X11BASE}
FILES_SUBST+= CP=${CP:Q}
@@ -29,6 +49,29 @@ FILES_SUBST+= RMDIR=${RMDIR:Q}
FILES_SUBST+= TRUE=${TRUE:Q}
FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+post-extract:
+ cd ${WRKSRC}/lib/config; ${MV} -f host.def LessTif.def
+
+# Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
+# avoid manpage conflicts with other packages.
+#
+post-patch:
+ cd ${WRKSRC}/doc/lessdox/widgets; \
+ for name in Core Object Shell; do \
+ ${MV} -f $${name}.3 X$${name}.3; \
+ files=`${GREP} -l "[[:blank:]]$${name} (3)" *.3`; \
+ for file in $${files}; do \
+ ${MV} -f $${file} $${file}.presubst; \
+ ${SED} -e "s|\([[:blank:]]\)$${name} (3)|\1X$${name} (3)|g" \
+ $${file}.presubst > $${file}; \
+ ${RM} -f $${file}.presubst; \
+ done; \
+ ${MV} -f Makefile.in Makefile.in.presubst; \
+ ${SED} -e "s|\([[:space:]]\)$${name}.3|\1X$${name}.3|g" \
+ Makefile.in.presubst > Makefile.in; \
+ ${RM} -f Makefile.in.presubst; \
+ done
+
pre-install:
${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
deleted file mode 100644
index 69959224efc..00000000000
--- a/x11/lesstif/Makefile.common
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: Makefile.common,v 1.16 2002/10/02 18:12:59 wiz Exp $
-
-DISTNAME= lesstif-${LESSTIF_VERSION}
-LESSTIF_VERSION= 0.93.0
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
- ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \
- ftp://ftp.kddlabs.co.jp/X11/lesstif/srcdist/ \
- ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ \
- http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
- http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/
-
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://www.lesstif.org/
-
-USE_X11BASE= # defined
-USE_GMAKE= # defined
-USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool
-AUTOMAKE_REQD= 1.4
-
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose
-CONFIGURE_ARGS+= --enable-editres --enable-xdnd
-
-# The following forces the build process to use sed as the HTML-to-text
-# converter.
-#
-CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable
-CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable
-
-DISTINFO_FILE= ${.CURDIR}/../../x11/lesstif/distinfo
-PATCHDIR= ${.CURDIR}/../../x11/lesstif/patches
-
-post-extract:
- cd ${WRKSRC}/lib/config; ${MV} -f host.def LessTif.def
-
-# Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
-# avoid manpage conflicts with other packages.
-#
-post-patch:
- cd ${WRKSRC}/doc/lessdox/widgets; \
- for name in Core Object Shell; do \
- ${MV} -f $${name}.3 X$${name}.3; \
- files=`${GREP} -l "[[:blank:]]$${name} (3)" *.3`; \
- for file in $${files}; do \
- ${MV} -f $${file} $${file}.presubst; \
- ${SED} -e "s|\([[:blank:]]\)$${name} (3)|\1X$${name} (3)|g" \
- $${file}.presubst > $${file}; \
- ${RM} -f $${file}.presubst; \
- done; \
- ${MV} -f Makefile.am Makefile.am.presubst; \
- ${SED} -e "s|\([[:space:]]\)$${name}.3|\1X$${name}.3|g" \
- Makefile.am.presubst > Makefile.am; \
- ${RM} -f Makefile.am.presubst; \
- done
-
-pre-configure:
- ${TOUCH} ${WRKDIR}/nonexecutable
- ${CHMOD} a-x ${WRKDIR}/nonexecutable
- for dir in . test ; do \
- cd ${WRKSRC}/$${dir}; \
- ${LOCALBASE}/bin/libtoolize --force; \
- ${ACLOCAL}; \
- ${AUTOHEADER}; \
- ${AUTOMAKE} -a --foreign -i; \
- ${AUTOCONF}; \
- done
-
-.include "../../mk/automake.mk"
diff --git a/x11/lesstif/PLIST b/x11/lesstif/PLIST
index 9118d59c7ed..7c17c0a0d40 100644
--- a/x11/lesstif/PLIST
+++ b/x11/lesstif/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:40:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/05 19:10:42 drochner Exp $
bin/mwm
bin/mxmkmf
bin/uil
bin/xmbind
+include/Dt/Print.h
include/Mrm/MrmAppl.h
include/Mrm/MrmDecls.h
include/Mrm/MrmPrivate.h
@@ -17,8 +18,6 @@ include/Xm/AtomMgr.h
include/Xm/BaseClassP.h
include/Xm/BulletinB.h
include/Xm/BulletinBP.h
-include/Xm/CSText.h
-include/Xm/CSTextP.h
include/Xm/CacheP.h
include/Xm/CareVisualT.h
include/Xm/CascadeB.h
@@ -72,6 +71,7 @@ include/Xm/GrabShell.h
include/Xm/GrabShellP.h
include/Xm/IconG.h
include/Xm/IconGP.h
+include/Xm/IconH.h
include/Xm/JoinSideT.h
include/Xm/Label.h
include/Xm/LabelG.h
@@ -98,6 +98,8 @@ include/Xm/PanedW.h
include/Xm/PanedWP.h
include/Xm/Primitive.h
include/Xm/PrimitiveP.h
+include/Xm/Print.h
+include/Xm/PrintSP.h
include/Xm/Protocols.h
include/Xm/ProtocolsP.h
include/Xm/PushB.h
@@ -108,6 +110,8 @@ include/Xm/RCUtilsP.h
include/Xm/RepType.h
include/Xm/RowColumn.h
include/Xm/RowColumnP.h
+include/Xm/SSpinB.h
+include/Xm/SSpinBP.h
include/Xm/SashP.h
include/Xm/Scale.h
include/Xm/ScaleP.h
@@ -169,6 +173,7 @@ include/uil/UilDBDef.h
include/uil/UilDef.h
include/uil/UilSymDef.h
include/uil/UilSymGl.h
+include/uil/XmAppl.uil
lib/X11/app-defaults/Mwm
lib/X11/config/LessTif.def
lib/X11/config/LessTif.rules
@@ -176,27 +181,30 @@ lib/X11/config/LessTif.tmpl
lib/X11/mwm/README
lib/X11/mwm/alt.map
lib/X11/mwm/system.mwmrc
+lib/libDtPrint.a
+lib/libDtPrint.la
+lib/libDtPrint.so
+lib/libDtPrint.so.1
+lib/libDtPrint.so.1.0
lib/libMrm.a
lib/libMrm.la
lib/libMrm.so
lib/libMrm.so.2
-lib/libMrm.so.2.0
+lib/libMrm.so.2.1
lib/libUil.a
lib/libUil.la
lib/libUil.so
lib/libUil.so.2
-lib/libUil.so.2.0
+lib/libUil.so.2.1
lib/libXm.a
lib/libXm.la
lib/libXm.so
lib/libXm.so.2
-lib/libXm.so.2.0
+lib/libXm.so.2.1
man/man1/lesstif.1
man/man1/ltversion.1
man/man1/mwm.1
man/man1/uil.1
-man/man1/xbae.1
-man/man1/xlt.1
man/man1/xmbind.1
man/man3/ApplicationShell.3
man/man3/Composite.3
@@ -289,6 +297,7 @@ share/doc/html/lesstif/LessTifInternals.html
share/doc/html/lesstif/OverrideShell.html
share/doc/html/lesstif/PROGRAMMING_TIPS.html
share/doc/html/lesstif/Rect.html
+share/doc/html/lesstif/ReleaseNotes.html
share/doc/html/lesstif/SyntheticResources.txt
share/doc/html/lesstif/TopLevelShell.html
share/doc/html/lesstif/TransientShell.html
@@ -300,8 +309,6 @@ share/doc/html/lesstif/WmShell.html
share/doc/html/lesstif/XCore.html
share/doc/html/lesstif/XObject.html
share/doc/html/lesstif/XShell.html
-share/doc/html/lesstif/Xbae.html
-share/doc/html/lesstif/Xlt.html
share/doc/html/lesstif/XmArrowButton.html
share/doc/html/lesstif/XmArrowButtonGadget.html
share/doc/html/lesstif/XmBulletinBoard.html
@@ -401,7 +408,6 @@ share/doc/html/lesstif/news_frame.html
share/doc/html/lesstif/platforms.html
share/doc/html/lesstif/printing.html
share/doc/html/lesstif/related_frame.html
-share/doc/html/lesstif/release-notes.html
share/doc/html/lesstif/release-policy.html
share/doc/html/lesstif/test_policy.html
share/doc/html/lesstif/test_summary.html
@@ -411,8 +417,6 @@ share/doc/html/lesstif/titlebar.html
share/doc/html/lesstif/uil.html
share/doc/html/lesstif/versions.html
share/doc/html/lesstif/web_button.html
-share/doc/html/lesstif/xbae.html
-share/doc/html/lesstif/xlt.html
share/doc/html/lesstif/xmbind.html
share/doc/lesstif/AUTHORS
share/doc/lesstif/BUG-REPORTING
@@ -420,11 +424,10 @@ share/doc/lesstif/COPYING
share/doc/lesstif/COPYING.LIB
share/doc/lesstif/CREDITS
share/doc/lesstif/FAQ
-share/doc/lesstif/Install
-share/doc/lesstif/KNOWN_BUGS
+share/doc/lesstif/INSTALL.txt
share/doc/lesstif/README
-share/doc/lesstif/RELEASE-POLICY
-share/doc/lesstif/release-notes.txt
+share/doc/lesstif/ReleaseNotes.html
+share/doc/lesstif/ReleaseNotes.txt
@dirrm share/doc/lesstif
@dirrm share/doc/html/lesstif/images
@dirrm share/doc/html/lesstif
@@ -432,3 +435,4 @@ share/doc/lesstif/release-notes.txt
@dirrm include/uil
@dirrm include/Xm
@dirrm include/Mrm
+@dirrm include/Dt
diff --git a/x11/lesstif/buildlink2.mk b/x11/lesstif/buildlink2.mk
index ba8dc49c174..a13d3ae205f 100644
--- a/x11/lesstif/buildlink2.mk
+++ b/x11/lesstif/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/12/05 19:10:42 drochner Exp $
.if !defined(LESSTIF_BUILDLINK2_MK)
LESSTIF_BUILDLINK2_MK= # defined
@@ -9,9 +9,11 @@ BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif
EVAL_PREFIX+= BUILDLINK_PREFIX.lesstif=lesstif
BUILDLINK_PREFIX.lesstif_DEFAULT= ${X11PREFIX}
-BUILDLINK_FILES.lesstif= include/Mrm/*
+BUILDLINK_FILES.lesstif= include/Dt/*
+BUILDLINK_FILES.lesstif+= include/Mrm/*
BUILDLINK_FILES.lesstif+= include/Xm/*
BUILDLINK_FILES.lesstif+= include/uil/*
+BUILDLINK_FILES.lesstif+= lib/libDtPrint.*
BUILDLINK_FILES.lesstif+= lib/libMrm.*
BUILDLINK_FILES.lesstif+= lib/libUil.*
BUILDLINK_FILES.lesstif+= lib/libXm.*
diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo
index 9ba1c99f8a9..b4d1e191bb6 100644
--- a/x11/lesstif/distinfo
+++ b/x11/lesstif/distinfo
@@ -1,44 +1,14 @@
-$NetBSD: distinfo,v 1.4 2001/09/19 16:50:40 drochner Exp $
+$NetBSD: distinfo,v 1.5 2002/12/05 19:10:42 drochner Exp $
-SHA1 (lesstif-0.93.0.tar.gz) = 540420ba640deb1311053fc4ff3244aa340e5815
-Size (lesstif-0.93.0.tar.gz) = 3266130 bytes
-SHA1 (patch-aa) = 780482e79c99026663541187829d81f9f67a00c9
-SHA1 (patch-ab) = 2bab59572723690be140b65e20ae4a291bf65e4b
-SHA1 (patch-ac) = d3988daba05ab5e05b1af8715c8f7ee509d2862c
-SHA1 (patch-ad) = c211de805bc9bc8ce10de4bdb13a6097dde36b0f
-SHA1 (patch-ae) = af06af93a639943a41bc7da2c275c137a914ac6c
-SHA1 (patch-af) = 1c27702fa2667b9d7558ac1c70d460768b782b86
-SHA1 (patch-ag) = 94fb429d1527eea9756f6b6792a8a000b790cf6f
-SHA1 (patch-ah) = bd8f90626944c59cb989d979046eeeabfab8c850
-SHA1 (patch-ai) = 34aa22bb3473e3c3843017a7e5c37cdb785dd1d2
-SHA1 (patch-aj) = f662745caeadd71ec407890626b6099aedababce
-SHA1 (patch-ak) = ab4f16fa5282b80072be0f584d007e5718b67980
-SHA1 (patch-al) = 45cf3837df1926b44c856bfacd32f436aae3cf8f
-SHA1 (patch-am) = 09b7e8cf6c8f62b69c3a1a958e8b42236a38836e
-SHA1 (patch-an) = 2018bda9825cebf8f49c7ffc49e39ba2a356ed6f
-SHA1 (patch-ao) = ba2e65ef9de1c7c20ce97354da80dfbb1b46035d
-SHA1 (patch-ap) = 19e0ee8e0adb680a7cf21a594e905b3f31383d77
-SHA1 (patch-aq) = 51522310ebb96e5fcb4850082477d87dc756bf3d
-SHA1 (patch-ar) = b7a7b175ce537adce6edcde425c1930c34d0fe95
-SHA1 (patch-as) = af297dc810d427de5aef647a22efc5d9ce17cfeb
-SHA1 (patch-at) = 19cb649b965400a8ad64513558092038421c3240
-SHA1 (patch-au) = 2704d1ce8fe3852901600a7ab86161d54e72c1a6
-SHA1 (patch-av) = 1c2a902df6b9adb011e58a2e063d45c5e2ef1afb
-SHA1 (patch-aw) = 1f24fbead7dc07c39d703c0c4991870aa35c251e
-SHA1 (patch-ax) = 02424577854d20a2ef823ba7ecb6ddd1aea20d78
-SHA1 (patch-ay) = 0f646bf398bf22abab94abd7f80c3a2f41ce775c
-SHA1 (patch-az) = 39fd7b9e4564e33b2a6f76c99a2bf6634fb4f3dd
-SHA1 (patch-ba) = 76804f01a9a3beb3fbd96594f6a9ff703e732bac
-SHA1 (patch-bb) = 591cac605be367542bebe993fb12684d3c10b7bb
-SHA1 (patch-bc) = e350ba49b87873f1e338418d23b23d3662cbff76
-SHA1 (patch-bd) = 34d4a6842c1f0b862268ccbcea7b22313e497c32
-SHA1 (patch-be) = db1f3ae2cf28263225ad44b0b7bbeaf4e2abdc20
-SHA1 (patch-bf) = 68f34fa8b332425125265bf8b7308ff8d86dadad
-SHA1 (patch-bg) = 667f2501a03fae0a973c67c9633fec672d31bc50
-SHA1 (patch-bh) = a450768a40294ad72a28a1e0450a47bd36493fe3
-SHA1 (patch-bi) = ab92bd20fbd15caa8ea5dd22436e55b79e3e8534
-SHA1 (patch-bj) = 992b72c4831c3f1a73725182330176328294964f
-SHA1 (patch-bk) = 253e6fa818a80228228e35eb3156068284991e41
-SHA1 (patch-bl) = 8338187e4a3caccd0475a1e2249eb104c05b8a92
-SHA1 (patch-bm) = 66bcdf4338dd08d3ab3d0c7c9b57df6b30e25494
-SHA1 (patch-bn) = 265a2768af3f8177317d71b3cc7ec7f5a2fdce13
+SHA1 (lesstif-0.93.36.tar.gz) = 22dd34ac1f23e1fdd7ef2b3f96e4ba505cd08d92
+Size (lesstif-0.93.36.tar.gz) = 3531755 bytes
+SHA1 (patch-aa) = 8baa680840eb9ca148444b504f47c85320e5f41b
+SHA1 (patch-ac) = c0fa9429cfc40d7c4071b71e7d71e6175c0c6048
+SHA1 (patch-am) = 89645dcff9ebe66fee56a769e25dc26e98b28867
+SHA1 (patch-an) = 6c745d628b1b90c27af079e2d6cd343ff2fd92f1
+SHA1 (patch-ao) = b37b5f6bfe22b06297ee9d17594562458bb90b78
+SHA1 (patch-ap) = 350a7d7e50e4f5c1b3b70d90713b6a5700e3f692
+SHA1 (patch-aq) = 2189ca5321f7f15503614e792ab798fcb45f8af0
+SHA1 (patch-ar) = e8001cb6cca049d70776631407ce1bef25447fd1
+SHA1 (patch-bm) = 19d3ce10341c7fb330ac41570b29225aad4b0bd5
+SHA1 (patch-bn) = 9d9a5c1ac41a574a6703af83dd9d31b1bc106fd6
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 902130877cf..2eafa80e93b 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,52 +1,19 @@
-$NetBSD: patch-aa,v 1.19 2001/09/19 16:50:40 drochner Exp $
+$NetBSD: patch-aa,v 1.20 2002/12/05 19:10:43 drochner Exp $
---- Makefile.am.orig Mon Jul 2 11:40:03 2001
-+++ Makefile.am Wed Sep 19 17:58:44 2001
-@@ -7,7 +7,11 @@
- missing mkinstalldirs \
- FAQ Install release-notes.html release-notes.txt
-
-+if Version_1_2
-+SUBDIRS = . include lib
-+else
- SUBDIRS = . include scripts lib clients doc @BuildTestDir@
-+endif
-
- DIST_SUBDIRS = include scripts lib clients doc test
-
-@@ -19,15 +23,18 @@
+--- Makefile.in.orig Thu Dec 5 17:31:15 2002
++++ Makefile.in Thu Dec 5 17:41:49 2002
+@@ -153,12 +153,12 @@
# Lets put the informational stuff in a sub directory to avoid
# poluting /usr/local for default installs.
#
--rootdir= $(prefix)/LessTif
-+if Version_2_0
-+rootdir= $(docdir)
- root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
- FAQ Install KNOWN_BUGS \
- README RELEASE-POLICY release-notes.txt
-+endif
-
- EXTRA_DIST= acconfig.h configure \
- BUG-REPORTING CREDITS FAQ Install KNOWN_BUGS RELEASE-POLICY \
- NOTES
-
-+if Version_2_0
- @MAINT@changelog:
- @MAINT@ @ (cd $(srcdir); cvs -Q -z9 log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: \
- @MAINT@ acconfig.h acinclude.m4 configure.in Makefile.am \
-@@ -40,7 +47,6 @@
- @MAINT@ doc/lessdox ) \
- @MAINT@ | $(srcdir)/scripts/parselog release_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@ >$(srcdir)/ChangeLog
-
--htmldir= $(prefix)/LessTif/doc
- html_DATA= release-notes.html
-
- all-local: BUG-REPORTING FAQ Install
-@@ -64,6 +70,7 @@
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/doc/lesstif
+ dist_root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
+ FAQ INSTALL.txt README ReleaseNotes.html ReleaseNotes.txt
- #install-data-hook:
- # ${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html
-+endif
+-htmldir = $(prefix)/LessTif/doc
++htmldir = $(prefix)/share/doc/html/lesstif
+ html_DATA = ReleaseNotes.html
#
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
deleted file mode 100644
index 97c97db941b..00000000000
--- a/x11/lesstif/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2001/06/30 19:08:22 jlam Exp $
-
---- clients/Motif-1.2/mwm/Makefile.am.orig Tue May 1 08:37:19 2001
-+++ clients/Motif-1.2/mwm/Makefile.am
-@@ -4,8 +4,8 @@
-
- if Version_1_2
- bin_PROGRAMS= mwm
--endif
- bindir = $(exec_prefix)/LessTif/Motif1.2/bin
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
-
-@@ -17,6 +17,7 @@
- Additional_Src = gethostname.c
- endif
-
-+if Version_1_2
- mwm_SOURCES= colormaps.c cursors.c decorate.c defaults.c desktop.c \
- events.c functions.c icons.c menus.c misc.c move.c \
- mwm.c mwm.h mwmparse.y mwmlex.l mwmstrings.h \
-@@ -39,6 +40,7 @@
-
- mwmddir= $(libdir)/X11/mwm
- mwmd_DATA= system.mwmrc alt.map README
-+endif
-
- EXTRA_DIST= Mwm.ad Mwm.mlm system.mwmrc alt.map README gethostname.c
-
-@@ -50,12 +52,6 @@
- mwmlex.o: mwmparse.h
-
- YFLAGS= -d
--
--install-data-hook:
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .)
--endif
-
- install-data-local:
- if DefaultVersion12
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index 8fb7e47bec5..e32d6528550 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.14 2001/09/19 16:50:40 drochner Exp $
+$NetBSD: patch-ac,v 1.15 2002/12/05 19:10:43 drochner Exp $
--- clients/Motif-1.2/mwm/system.mwmrc.orig Wed Jun 13 22:39:25 2001
-+++ clients/Motif-1.2/mwm/system.mwmrc Wed Sep 19 17:45:08 2001
++++ clients/Motif-1.2/mwm/system.mwmrc Thu Dec 5 19:03:32 2002
@@ -5,7 +5,7 @@
Menu DefaultRootMenu
{
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
deleted file mode 100644
index 6395ba060e9..00000000000
--- a/x11/lesstif/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.16 2001/06/30 19:08:23 jlam Exp $
-
---- clients/Motif-1.2/uil/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-1.2/uil/Makefile.am
-@@ -5,8 +5,8 @@
- if Version_1_2
- bin_PROGRAMS= uil
- noinst_PROGRAMS = newuil
--endif
- bindir = $(exec_prefix)/LessTif/Motif1.2/bin
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h
-
-@@ -35,9 +35,3 @@
- lex.o: yacc.h
-
- YFLAGS= -d
--
--install-data-hook:
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .)
--endif
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
deleted file mode 100644
index dc055079eee..00000000000
--- a/x11/lesstif/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.17 2001/09/19 16:50:40 drochner Exp $
-
---- clients/Motif-1.2/xmbind/Makefile.am.orig Tue Jul 10 11:16:03 2001
-+++ clients/Motif-1.2/xmbind/Makefile.am Wed Sep 19 17:46:42 2001
-@@ -4,8 +4,8 @@
-
- if Version_1_2
- bin_PROGRAMS= xmbind
--endif
- bindir = $(exec_prefix)/LessTif/Motif1.2/bin
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in
-
-@@ -17,9 +17,3 @@
- $(XPLIB) $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-
- xmbind_SOURCES= xmbind.c
--
--install-data-hook:
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .)
--endif
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
deleted file mode 100644
index 2414daedafa..00000000000
--- a/x11/lesstif/patches/patch-af
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-af,v 1.14 2001/06/30 19:08:23 jlam Exp $
-
---- clients/Motif-2.0/mwm/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.0/mwm/Makefile.am
-@@ -4,8 +4,12 @@
-
- if Version_2_0
- bin_PROGRAMS= mwm
--endif
-+if DefaultVersion20
-+bindir = $(exec_prefix)/bin
-+else
- bindir = $(exec_prefix)/LessTif/Motif2.0/bin
-+endif
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
-
-@@ -34,6 +38,7 @@
- # non-local stuff
- BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(mwmd_DATA) Mwm.ad
-
-+if Version_2_0
- mwm_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0)
-
- $(SRCS_1_2) $(HDRS_1_2):
-@@ -63,6 +68,7 @@
-
- mwmddir= $(libdir)/X11/mwm
- mwmd_DATA= system.mwmrc alt.map README
-+endif
-
-
- $(mwmd_DATA) Mwm.ad:
-@@ -78,12 +84,6 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .)
--endif
-
- install-data-local:
- if DefaultVersion20
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
deleted file mode 100644
index 1edd053b8c0..00000000000
--- a/x11/lesstif/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.13 2001/06/30 19:08:23 jlam Exp $
-
---- clients/Motif-2.0/uil/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.0/uil/Makefile.am
-@@ -5,9 +5,13 @@
- if Version_2_0
- bin_PROGRAMS= uil
- noinst_PROGRAMS = newuil
-+if DefaultVersion20
-+bindir = $(exec_prefix)/bin
-+else
-+bindir = $(exec_prefix)/LessTif/Motif2.0/bin
-+endif
- endif
-
--bindir = $(exec_prefix)/LessTif/Motif2.0/bin
-
- MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h
-
-@@ -65,9 +69,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .)
--endif
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
deleted file mode 100644
index e55519dd5fd..00000000000
--- a/x11/lesstif/patches/patch-ah
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ah,v 1.14 2001/06/30 19:08:23 jlam Exp $
-
---- clients/Motif-2.0/xmbind/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.0/xmbind/Makefile.am
-@@ -4,8 +4,12 @@
-
- if Version_2_0
- bin_PROGRAMS= xmbind
--endif
-+if DefaultVersion20
-+bindir = $(exec_prefix)/bin
-+else
- bindir = $(exec_prefix)/LessTif/Motif2.0/bin
-+endif
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in
-
-@@ -45,9 +49,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .)
--endif
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
deleted file mode 100644
index 5f380b8901d..00000000000
--- a/x11/lesstif/patches/patch-ai
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ai,v 1.16 2001/06/30 19:08:23 jlam Exp $
-
---- clients/Motif-2.1/mwm/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.1/mwm/Makefile.am
-@@ -4,8 +4,12 @@
-
- if Version_2_1
- bin_PROGRAMS= mwm
--endif
-+if DefaultVersion21
-+bindir = $(exec_prefix)/bin
-+else
- bindir = $(exec_prefix)/LessTif/Motif2.1/bin
-+endif
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
-
-@@ -40,6 +44,7 @@
- # non-local stuff
- BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(mwmd_DATA) Mwm.ad
-
-+if Version_2_1
- mwm_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(HDRS_2_1) $(SRCS_2_1)
-
- $(SRCS_1_2) $(HDRS_1_2):
-@@ -76,6 +81,7 @@
-
- mwmddir= $(libdir)/X11/mwm
- mwmd_DATA= system.mwmrc alt.map README
-+endif
-
-
- $(mwmd_DATA) Mwm.ad:
-@@ -91,12 +97,6 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .)
--endif
-
- install-data-local:
- if DefaultVersion21
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
deleted file mode 100644
index 8c6b7a32aaf..00000000000
--- a/x11/lesstif/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.12 2001/06/30 19:08:24 jlam Exp $
-
---- clients/Motif-2.1/uil/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.1/uil/Makefile.am
-@@ -5,8 +5,12 @@
- if Version_2_1
- bin_PROGRAMS= uil
- noinst_PROGRAMS = newuil
--endif
-+if DefaultVersion21
-+bindir = $(exec_prefix)/bin
-+else
- bindir = $(exec_prefix)/LessTif/Motif2.1/bin
-+endif
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h
-
-@@ -75,10 +79,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .)
--endif
--
diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak
deleted file mode 100644
index 5b01bf63fa4..00000000000
--- a/x11/lesstif/patches/patch-ak
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ak,v 1.12 2001/06/30 19:08:24 jlam Exp $
-
---- clients/Motif-2.1/xmbind/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ clients/Motif-2.1/xmbind/Makefile.am
-@@ -4,8 +4,12 @@
-
- if Version_2_1
- bin_PROGRAMS= xmbind
--endif
-+if DefaultVersion21
-+bindir = $(exec_prefix)/bin
-+else
- bindir = $(exec_prefix)/LessTif/Motif2.1/bin
-+endif
-+endif
-
- MAINTAINERCLEANFILES=Makefile.in
-
-@@ -57,10 +61,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .)
--endif
--
diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al
deleted file mode 100644
index efaabcbfb94..00000000000
--- a/x11/lesstif/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.11 2001/06/30 19:08:24 jlam Exp $
-
---- configure.in.orig Sat Jun 2 08:39:46 2001
-+++ configure.in
-@@ -710,6 +710,11 @@
- dnl AC_SUBST(libdir)
- AC_SUBST(bindir)
-
-+docdir='${prefix}/share/doc/lesstif'
-+htmldir='${prefix}/share/doc/html/lesstif'
-+AC_SUBST(docdir)
-+AC_SUBST(htmldir)
-+
- dnl We might have a bit too much redundant data here, but who cares ...
- dnl AC_SUBST(version)
- AC_SUBST(version_suffix)
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
index 550db644a9e..816933fe952 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.10 2001/06/30 19:08:24 jlam Exp $
+$NetBSD: patch-am,v 1.11 2002/12/05 19:10:44 drochner Exp $
---- doc/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ doc/Makefile.am
-@@ -6,7 +6,7 @@
+--- doc/Makefile.in.orig Thu Dec 5 17:42:18 2002
++++ doc/Makefile.in Thu Dec 5 17:59:06 2002
+@@ -143,7 +143,7 @@
+ # it has a stand-alone Makefile w/o auto* stuff
+ SUBDIRS = www.lesstif.org lessdox
- SUBDIRS = www.lesstif.org lessdox
-
--rootdir= $(prefix)/LessTif/doc
-+rootdir= $(htmldir)
- root_DATA= All.html Clipboard.txt DragAndDrop.txt Form.txt \
+-rootdir = $(prefix)/LessTif/doc
++rootdir = $(prefix)/share/doc/html/lesstif
+ root_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 3975d7cccbe..334b75c2357 100644
--- a/x11/lesstif/patches/patch-an
+++ b/x11/lesstif/patches/patch-an
@@ -1,21 +1,13 @@
-$NetBSD: patch-an,v 1.13 2001/06/30 19:08:24 jlam Exp $
+$NetBSD: patch-an,v 1.14 2002/12/05 19:10:44 drochner Exp $
---- doc/lessdox/clients/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ doc/lessdox/clients/Makefile.am
-@@ -6,7 +6,6 @@
- EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES= .1 .3 .5 .html
+--- doc/lessdox/clients/Makefile.in.orig Thu Dec 5 17:47:06 2002
++++ doc/lessdox/clients/Makefile.in Thu Dec 5 17:47:54 2002
+@@ -149,7 +149,7 @@
+ manthree_DATA =
+ manfive_DATA = mwmrc.5 VirtualBindings.5
--mandir= $(prefix)/LessTif/doc/man
- man1dir= $(prefix)/man/man1
- man3dir= $(prefix)/man/man3
- man5dir= $(prefix)/man/man5
-@@ -15,8 +14,6 @@
- man3_DATA=
- man5_DATA= mwmrc.5 VirtualBindings.5
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/doc/html/lesstif
--
--htmldir= $(prefix)/LessTif/doc/html
-
- html_DATA= mwm.html mwmrc.html xmbind.html lesstif.html uil.html \
- xlt.html xbae.html VirtualBindings.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 1d5b07e17db..a630f69a9e5 100644
--- a/x11/lesstif/patches/patch-ao
+++ b/x11/lesstif/patches/patch-ao
@@ -1,21 +1,13 @@
-$NetBSD: patch-ao,v 1.10 2001/06/30 19:08:24 jlam Exp $
+$NetBSD: patch-ao,v 1.11 2002/12/05 19:10:44 drochner Exp $
---- doc/lessdox/functions/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ doc/lessdox/functions/Makefile.am
-@@ -6,7 +6,6 @@
- EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES= .1 .3 .5 .html
+--- doc/lessdox/functions/Makefile.in.orig Thu Dec 5 17:49:42 2002
++++ doc/lessdox/functions/Makefile.in Thu Dec 5 17:50:33 2002
+@@ -149,7 +149,7 @@
+ manthree_DATA =
+ manfive_DATA =
--mandir= $(prefix)/LessTif/doc/man
- man1dir= $(prefix)/man/man1
- man3dir= $(prefix)/man/man3
- man5dir= $(prefix)/man/man5
-@@ -15,8 +14,6 @@
- man3_DATA=
- man5_DATA=
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/doc/html/lesstif
--
--htmldir= $(prefix)/LessTif/doc/html
-
- html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
- ${man5_DATA:.5=.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 e8d1160da94..64514deac50 100644
--- a/x11/lesstif/patches/patch-ap
+++ b/x11/lesstif/patches/patch-ap
@@ -1,32 +1,22 @@
-$NetBSD: patch-ap,v 1.9 2001/06/30 19:08:24 jlam Exp $
+$NetBSD: patch-ap,v 1.10 2002/12/05 19:10:44 drochner Exp $
---- doc/lessdox/widgets/Makefile.am.orig Fri Mar 30 02:49:10 2001
-+++ doc/lessdox/widgets/Makefile.am
-@@ -6,7 +6,6 @@
- EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES= .1 .3 .5 .html
+--- doc/lessdox/widgets/Makefile.in.orig Thu Dec 5 17:52:00 2002
++++ doc/lessdox/widgets/Makefile.in Thu Dec 5 17:54:50 2002
+@@ -175,7 +175,7 @@
--mandir= $(prefix)/LessTif/doc/man
- man1dir= $(prefix)/man/man1
- man3dir= $(prefix)/man/man3
- man5dir= $(prefix)/man/man5
-@@ -40,8 +39,6 @@
+ manfive_DATA =
- man5_DATA=
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/doc/html/lesstif
--htmldir= $(prefix)/LessTif/doc/html
--
- html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
- ${man5_DATA:.5=.html}
-
-@@ -61,10 +58,3 @@
-
- .5.html:
- $(MAN2HTML) -f <$(srcdir)/$*.5 >$*.html
--
--#
--# This installs an extra symbolic link to make the HTML links work right
--# 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
+ html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
+ ${manfive_DATA:.5=.html}
+@@ -425,7 +425,7 @@
+ # in both the http://www.lesstif.org and the locally installed case.
+ #
+ install-data-hook:
+- if [ ! -h $(DESTDIR)$(exec_prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(exec_prefix)/LessTif/doc && cd $(DESTDIR)$(exec_prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
++# if [ ! -h $(DESTDIR)$(exec_prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(exec_prefix)/LessTif/doc && cd $(DESTDIR)$(exec_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 c21159f10ec..96dddfca680 100644
--- a/x11/lesstif/patches/patch-aq
+++ b/x11/lesstif/patches/patch-aq
@@ -1,14 +1,13 @@
-$NetBSD: patch-aq,v 1.12 2001/09/19 16:50:40 drochner Exp $
+$NetBSD: patch-aq,v 1.13 2002/12/05 19:10:44 drochner Exp $
---- doc/www.lesstif.org/Makefile.am.orig Mon Jul 2 11:40:03 2001
-+++ doc/www.lesstif.org/Makefile.am Wed Sep 19 17:47:46 2001
-@@ -13,8 +13,7 @@
+--- doc/www.lesstif.org/Makefile.in.orig Thu Dec 5 17:55:30 2002
++++ doc/www.lesstif.org/Makefile.in Thu Dec 5 17:57:03 2002
+@@ -148,7 +148,7 @@
# Lets put the informational stuff in a sub directory to avoid
# polluting /usr/local for default installs.
#
--docdir= $(prefix)/LessTif/doc
--doc_DATA= \
-+html_DATA= \
+-docdir = $(prefix)/LessTif/doc
++docdir = $(prefix)/share/doc/html/lesstif
+ doc_DATA = \
Advocacy.html contents.html misc_frame.html \
BUG-HUNTING.html core.html news.html \
- COPYING.LIB.html cvs.html news_frame.html \
diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar
index e57c50f9866..99a0f4f8490 100644
--- a/x11/lesstif/patches/patch-ar
+++ b/x11/lesstif/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.8 2001/06/30 19:08:25 jlam Exp $
+$NetBSD: patch-ar,v 1.9 2002/12/05 19:10:44 drochner Exp $
---- doc/www.lesstif.org/images/Makefile.am.orig Tue May 1 08:37:20 2001
-+++ doc/www.lesstif.org/images/Makefile.am
-@@ -10,7 +10,7 @@
+--- doc/www.lesstif.org/images/Makefile.in.orig Thu Dec 5 17:59:43 2002
++++ doc/www.lesstif.org/images/Makefile.in Thu Dec 5 18:00:16 2002
+@@ -145,7 +145,7 @@
# Lets put the informational stuff in a sub directory to avoid
# poluting /usr/local for default installs.
#
--rootdir= $(prefix)/LessTif/doc/images
-+rootdir= $(htmldir)/images
- root_DATA= hungry.png \
+-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 \
diff --git a/x11/lesstif/patches/patch-as b/x11/lesstif/patches/patch-as
deleted file mode 100644
index c8be3043789..00000000000
--- a/x11/lesstif/patches/patch-as
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-as,v 1.8 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-1.2/Mrm/Makefile.am.orig Wed Oct 11 15:36:14 2000
-+++ include/Motif-1.2/Mrm/Makefile.am
-@@ -6,6 +6,7 @@
- h= MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
- EXTRA_DIST= $(h)
-
-+if Version_1_2
- #
- # Install headers
- #
-@@ -14,16 +15,6 @@
- #
- mrmdir = $(prefix)/LessTif/Motif1.2/include/Mrm
-
--if Version_1_2
--
- mrm_HEADERS= $(h)
-
- endif
--install-data-hook:
--if Version_1_2
--if DefaultVersion12
-- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Mrm Mrm)
--endif
--endif
--
diff --git a/x11/lesstif/patches/patch-at b/x11/lesstif/patches/patch-at
deleted file mode 100644
index 1b87bf45335..00000000000
--- a/x11/lesstif/patches/patch-at
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-at,v 1.9 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-1.2/Xm/Makefile.am.orig Wed Oct 11 15:36:18 2000
-+++ include/Motif-1.2/Xm/Makefile.am
-@@ -73,6 +73,7 @@
-
- EXTRA_DIST= $(xm_both_h)
-
-+if Version_1_2
- #
- # Install headers
- #
-@@ -81,8 +82,6 @@
- #
- xmdir= $(prefix)/LessTif/Motif1.2/include/Xm
-
--if Version_1_2
--
- xm_HEADERS = $(xm_both_h)
- #
- # Note Xm.h is built by configure, therefore it's not necessarily in
-@@ -90,18 +89,4 @@
- # tree which may be elsewhere.
- #
- xm_DATA = Xm.h
--
--else
--#
--# Not Version_1_2
--#
--xm_HEADERS = $(xm_12_h)
--
--endif
--install-data-hook:
--if Version_1_2
--if DefaultVersion12
-- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Xm Xm)
--endif
- endif
diff --git a/x11/lesstif/patches/patch-au b/x11/lesstif/patches/patch-au
deleted file mode 100644
index 48622390212..00000000000
--- a/x11/lesstif/patches/patch-au
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-au,v 1.7 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-1.2/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000
-+++ include/Motif-1.2/uil/Makefile.am
-@@ -6,6 +6,7 @@
- h= Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h
- EXTRA_DIST= $(h)
-
-+if Version_1_2
- #
- # Install headers
- #
-@@ -14,16 +15,6 @@
- #
- uildir = $(prefix)/LessTif/Motif1.2/include/uil
-
--if Version_1_2
--
- uil_HEADERS= $(h)
-
- endif
--install-data-hook:
--if Version_1_2
--if DefaultVersion12
-- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/uil uil)
--endif
--endif
--
diff --git a/x11/lesstif/patches/patch-av b/x11/lesstif/patches/patch-av
deleted file mode 100644
index 53d272b6ed3..00000000000
--- a/x11/lesstif/patches/patch-av
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-av,v 1.4 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-2.0/Mrm/Makefile.am.orig Sun Jan 2 08:22:55 2000
-+++ include/Motif-2.0/Mrm/Makefile.am
-@@ -11,7 +11,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion20
-+mrmdir = $(prefix)/include/Mrm
-+else
- mrmdir = $(prefix)/LessTif/Motif2.0/include/Mrm
-+endif
-
- HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
-
-@@ -30,11 +34,3 @@
- done
-
- endif
--install-data-hook:
--if Version_2_0
--if DefaultVersion20
-- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Mrm Mrm)
--endif
--endif
--
diff --git a/x11/lesstif/patches/patch-aw b/x11/lesstif/patches/patch-aw
deleted file mode 100644
index e6012918fad..00000000000
--- a/x11/lesstif/patches/patch-aw
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-2.0/Xm/Makefile.am.orig Tue Dec 5 11:19:25 2000
-+++ include/Motif-2.0/Xm/Makefile.am
-@@ -9,7 +9,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion20
-+xmdir= $(prefix)/include/Xm
-+else
- xmdir= $(prefix)/LessTif/Motif2.0/include/Xm
-+endif
-
- HEADERS1_2 = \
- ArrowB.h ArrowBG.h AtomMgr.h \
-@@ -68,9 +72,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion20
-- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Xm Xm)
--endif
diff --git a/x11/lesstif/patches/patch-ax b/x11/lesstif/patches/patch-ax
deleted file mode 100644
index 2881498f6ff..00000000000
--- a/x11/lesstif/patches/patch-ax
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-2.0/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000
-+++ include/Motif-2.0/uil/Makefile.am
-@@ -11,7 +11,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion20
-+uildir = $(prefix)/include/uil
-+else
- uildir = $(prefix)/LessTif/Motif2.0/include/uil
-+endif
-
- HEADERS1_2 = Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h
-
-@@ -29,11 +33,4 @@
- fi ; \
- done
-
--endif
--install-data-hook:
--if Version_2_0
--if DefaultVersion20
-- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/uil uil)
--endif
- endif
diff --git a/x11/lesstif/patches/patch-ay b/x11/lesstif/patches/patch-ay
deleted file mode 100644
index b3dc5aca462..00000000000
--- a/x11/lesstif/patches/patch-ay
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2001/06/30 19:08:25 jlam Exp $
-
---- include/Motif-2.1/Mrm/Makefile.am.orig Mon Nov 27 05:36:00 2000
-+++ include/Motif-2.1/Mrm/Makefile.am
-@@ -10,7 +10,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion21
-+mrmdir = $(prefix)/include/Mrm
-+else
- mrmdir = $(prefix)/LessTif/Motif2.1/include/Mrm
-+endif
-
- HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
- HEADERS2_0 =
-@@ -33,12 +37,3 @@
- done
-
- endif
--#
--#
--install-data-hook:
--if Version_2_1
--if DefaultVersion21
-- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Mrm Mrm)
--endif
--endif
diff --git a/x11/lesstif/patches/patch-az b/x11/lesstif/patches/patch-az
deleted file mode 100644
index 96d74bbbc59..00000000000
--- a/x11/lesstif/patches/patch-az
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-az,v 1.2 2001/06/30 19:08:26 jlam Exp $
-
---- include/Motif-2.1/Xm/Makefile.am.orig Sat Dec 23 05:46:22 2000
-+++ include/Motif-2.1/Xm/Makefile.am
-@@ -9,7 +9,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion21
-+xmdir= $(prefix)/include/Xm
-+else
- xmdir= $(prefix)/LessTif/Motif2.1/include/Xm
-+endif
-
- HEADERS1_2 = \
- ArrowB.h ArrowBG.h AtomMgr.h \
-@@ -73,9 +77,3 @@
- rm $$i; \
- fi ; \
- done
--
--install-data-hook:
--if DefaultVersion21
-- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Xm Xm)
--endif
diff --git a/x11/lesstif/patches/patch-ba b/x11/lesstif/patches/patch-ba
deleted file mode 100644
index 1a1ccada552..00000000000
--- a/x11/lesstif/patches/patch-ba
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2001/06/30 19:08:26 jlam Exp $
-
---- include/Motif-2.1/uil/Makefile.am.orig Wed Dec 6 08:26:37 2000
-+++ include/Motif-2.1/uil/Makefile.am
-@@ -11,7 +11,11 @@
- # Lets put the headers in a sub directory to avoid
- # poluting /usr/local with more directories for default installs.
- #
-+if DefaultVersion21
-+uildir = $(prefix)/include/uil
-+else
- uildir = $(prefix)/LessTif/Motif2.1/include/uil
-+endif
-
- HEADERS1_2 = Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h
- HEADERS2_0 =
-@@ -34,11 +38,4 @@
- fi ; \
- done
-
--endif
--install-data-hook:
--if Version_2_1
--if DefaultVersion21
-- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/uil uil)
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bb b/x11/lesstif/patches/patch-bb
deleted file mode 100644
index 526430a8ab9..00000000000
--- a/x11/lesstif/patches/patch-bb
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2001/06/30 19:08:26 jlam Exp $
-
---- lib/Dt/Makefile.am.orig Wed May 9 16:41:21 2001
-+++ lib/Dt/Makefile.am
-@@ -5,7 +5,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libDtPrint_la_LDFLAGS= -version-info 1:0
-+if Version_2_1
-+if DefaultVersion21
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.1/lib
-+endif
-+endif
-
- if BuildLibDtPrint
-
-@@ -15,7 +21,13 @@
- # libDtPrint_la_LIBADD = @X_LIBS@ -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-
-
-+if Version_2_1
-+if DefaultVersion21
-+includedir= $(prefix)/include/Dt
-+else
- includedir= $(prefix)/LessTif/Motif2.1/include/Dt
-+endif
-+endif
- include_DATA= Print.h
-
- INCLUDES= -I$(top_srcdir)/lib \
-@@ -37,25 +49,3 @@
-
- EXTRA_DIST = Print.h DtPrintSetupBoxP.h \
- DtPrintSetupBox.c DtPrintSetupData.c
--
--install-data-hook: libDtPrint.la
--if BuildLibDtPrint
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.so.1*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.so.1* .)
--endif
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.la .)
-- if [ -d $(DESTDIR)$(prefix)/include/Dt ]; then rm -rf $(DESTDIR)$(prefix)/include/Dt; else rm -f $(DESTDIR)$(prefix)/include/Dt; fi
-- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Dt Dt)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.a .)
--endif
--endif
--endif
diff --git a/x11/lesstif/patches/patch-bc b/x11/lesstif/patches/patch-bc
deleted file mode 100644
index 26d5be0cb05..00000000000
--- a/x11/lesstif/patches/patch-bc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-bc,v 1.4 2001/09/19 16:50:41 drochner Exp $
-
---- lib/Makefile.am.orig Wed Jul 18 17:31:21 2001
-+++ lib/Makefile.am Wed Sep 19 17:51:34 2001
-@@ -4,13 +4,19 @@
-
- MAINTAINERCLEANFILES=Makefile.in
-
--SUBDIRS= config \
-+if Version_1_2
-+CONFIGDIR=
-+else
-+CONFIGDIR= config
-+endif
-+
-+SUBDIRS= $(CONFIGDIR) \
- Xm Mrm Uil \
- Xm-2.0 Mrm-2.0 Uil-2.0 \
- Xm-2.1 Mrm-2.1 Uil-2.1 \
- Dt
-
--DIST_SUBDIRS= config \
-+DIST_SUBDIRS= $(CONFIGDIR) \
- Xm Mrm Uil \
- Xm-2.0 Mrm-2.0 Uil-2.0 \
- Xm-2.1 Mrm-2.1 Uil-2.1 \
diff --git a/x11/lesstif/patches/patch-bd b/x11/lesstif/patches/patch-bd
deleted file mode 100644
index 24939c93290..00000000000
--- a/x11/lesstif/patches/patch-bd
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2001/06/30 19:08:26 jlam Exp $
-
---- lib/Mrm-2.0/Makefile.am.orig Wed May 9 16:41:21 2001
-+++ lib/Mrm-2.0/Makefile.am
-@@ -4,7 +4,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libMrm_la_LDFLAGS= -version-info 2:0
-+if Version_2_0
-+if DefaultVersion20
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.0/lib
-+endif
-+endif
-
- #
- # Sources in this directory
-@@ -68,24 +74,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libMrm.la
--if Version_2_0
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so.2* .)
--endif
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-be b/x11/lesstif/patches/patch-be
deleted file mode 100644
index 7bf771161c0..00000000000
--- a/x11/lesstif/patches/patch-be
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-be,v 1.2 2001/06/30 19:08:26 jlam Exp $
-
---- lib/Mrm-2.1/Makefile.am.orig Wed May 9 16:41:21 2001
-+++ lib/Mrm-2.1/Makefile.am
-@@ -4,7 +4,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libMrm_la_LDFLAGS= -version-info 2:1
-+if Version_2_1
-+if DefaultVersion21
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.1/lib
-+endif
-+endif
-
- #
- # Sources in this directory
-@@ -80,24 +86,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libMrm.la
--if Version_2_1
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so.2* .)
--endif
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bf b/x11/lesstif/patches/patch-bf
deleted file mode 100644
index da078e0e3e7..00000000000
--- a/x11/lesstif/patches/patch-bf
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2001/06/30 19:08:26 jlam Exp $
-
---- lib/Mrm/Makefile.am.orig Wed May 9 16:38:00 2001
-+++ lib/Mrm/Makefile.am
-@@ -4,7 +4,9 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libMrm_la_LDFLAGS= -version-info 1:2
-+if Version_1_2
- libdir = $(exec_prefix)/LessTif/Motif1.2/lib
-+endif
-
- EXTRA_DIST= Mrm.c lookup.c misc.c \
- lookup.h misc.h uil.h
-@@ -27,23 +29,4 @@
- libMrm_la_SOURCES= Mrm.c lookup.c misc.c \
- lookup.h misc.h uil.h
-
--endif
--install-data-hook: libMrm.la
--if Version_1_2
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.1*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .)
--endif
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bg b/x11/lesstif/patches/patch-bg
deleted file mode 100644
index cfac42e97f1..00000000000
--- a/x11/lesstif/patches/patch-bg
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bg,v 1.3 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Uil-2.0/Makefile.am.orig Wed May 9 16:41:21 2001
-+++ lib/Uil-2.0/Makefile.am
-@@ -4,7 +4,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libUil_la_LDFLAGS= -version-info 2:0
-+if Version_2_0
-+if DefaultVersion20
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.0/lib
-+endif
-+endif
-
- #
- # Sources in this directory
-@@ -58,24 +64,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libUil.la
--if Version_2_0
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so.2* .)
--endif
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bh b/x11/lesstif/patches/patch-bh
deleted file mode 100644
index aba6c6efd43..00000000000
--- a/x11/lesstif/patches/patch-bh
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Uil-2.1/Makefile.am.orig Wed May 9 16:41:21 2001
-+++ lib/Uil-2.1/Makefile.am
-@@ -5,7 +5,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libUil_la_LDFLAGS= -version-info 2:1
-+if Version_2_1
-+if DefaultVersion21
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.1/lib
-+endif
-+endif
-
- #
- # Sources in this directory
-@@ -70,24 +76,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libUil.la
--if Version_2_1
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so.2* .)
--endif
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bi b/x11/lesstif/patches/patch-bi
deleted file mode 100644
index 5a0ff166ada..00000000000
--- a/x11/lesstif/patches/patch-bi
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Uil/Makefile.am.orig Wed May 9 16:39:14 2001
-+++ lib/Uil/Makefile.am
-@@ -4,7 +4,9 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libUil_la_LDFLAGS= -version-info 1:2
-+if Version_1_2
- libdir = $(exec_prefix)/LessTif/Motif1.2/lib
-+endif
-
- EXTRA_DIST= Uil.c UilData.c uillex.c uilparse.c uilsym.c
-
-@@ -24,23 +26,4 @@
- libUil_la_SOURCES= Uil.c UilData.c uillex.c uilparse.c uilsym.c
-
-
--endif
--install-data-hook: libUil.la
--if Version_1_2
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.1*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.1* .)
--endif
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bj b/x11/lesstif/patches/patch-bj
deleted file mode 100644
index 2b46e05d598..00000000000
--- a/x11/lesstif/patches/patch-bj
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Xm-2.0/Makefile.am.orig Sat May 12 06:35:15 2001
-+++ lib/Xm-2.0/Makefile.am
-@@ -4,7 +4,13 @@
- MAINTAINERCLEANFILES=Makefile.in
-
- libXm_la_LDFLAGS= -version-info 2:0
-+if Version_2_0
-+if DefaultVersion20
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.0/lib
-+endif
-+endif
-
- #
- # Sources in this directory
-@@ -91,24 +97,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libXm.la
--if Version_2_0
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .)
--endif
--if DefaultVersion20
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bk b/x11/lesstif/patches/patch-bk
deleted file mode 100644
index 35a77f158ae..00000000000
--- a/x11/lesstif/patches/patch-bk
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bk,v 1.2 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Xm-2.1/Makefile.am.orig Sat May 12 06:35:15 2001
-+++ lib/Xm-2.1/Makefile.am
-@@ -3,7 +3,13 @@
- #
- MAINTAINERCLEANFILES=Makefile.in
-
-+if Version_2_1
-+if DefaultVersion21
-+libdir = $(exec_prefix)/lib
-+else
- libdir = $(exec_prefix)/LessTif/Motif2.1/lib
-+endif
-+endif
- libXm_la_LDFLAGS= -version-info 2:1 $(X_LIBS)
-
- #
-@@ -105,24 +111,4 @@
- rm $$i; \
- fi ; \
- done
--endif
--
--install-data-hook: libXm.la
--if Version_2_1
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.2*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so.2* .)
--endif
--if DefaultVersion21
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bl b/x11/lesstif/patches/patch-bl
deleted file mode 100644
index b85a25cb5cf..00000000000
--- a/x11/lesstif/patches/patch-bl
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bl,v 1.2 2001/06/30 19:08:27 jlam Exp $
-
---- lib/Xm/Makefile.am.orig Sat May 12 06:35:15 2001
-+++ lib/Xm/Makefile.am
-@@ -30,7 +30,9 @@
- endif
-
- libXm_la_LDFLAGS= -version-info 1:2
-+if Version_1_2
- libdir = $(exec_prefix)/LessTif/Motif1.2/lib
-+endif
-
- if Version_1_2
-
-@@ -52,23 +54,4 @@
-
- libXm_la_SOURCES= $(src) $(XDND_SRCS)
-
--endif
--install-data-hook: libXm.la
--if Version_1_2
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.1*
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .)
--endif
--if DefaultVersion12
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .)
--if LibtoolShared
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .)
--endif
--if LibtoolStatic
-- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a
-- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.a .)
--endif
--endif
- endif
diff --git a/x11/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm
index 64d8a8c0474..5d5814db0e9 100644
--- a/x11/lesstif/patches/patch-bm
+++ b/x11/lesstif/patches/patch-bm
@@ -1,17 +1,13 @@
-$NetBSD: patch-bm,v 1.2 2001/06/30 19:08:27 jlam Exp $
+$NetBSD: patch-bm,v 1.3 2002/12/05 19:10:48 drochner Exp $
---- lib/config/Makefile.am.orig Wed Aug 30 09:45:04 2000
-+++ lib/config/Makefile.am
-@@ -6,10 +6,10 @@
+--- lib/config/Makefile.in.orig Thu Dec 5 16:41:13 2002
++++ lib/config/Makefile.in Thu Dec 5 16:47:23 2002
+@@ -144,7 +144,7 @@
+ EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl
- configdir= $(libdir)/X11/config
-
--EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl
-+EXTRA_DIST = LessTif.rules LessTif.tmpl LessTif.def Imake.tmpl
-
- if XIsR6
--config_DATA= LessTif.rules LessTif.tmpl host.def
-+config_DATA= LessTif.rules LessTif.tmpl LessTif.def
- else
# so being R5
- config_DATA= Imake.tmpl LessTif.rules LessTif.tmpl
+-@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl host.def
++@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl LessTif.def
+ @XIsR6_FALSE@config_DATA = Imake.tmpl LessTif.rules LessTif.tmpl
+ subdir = lib/config
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn
index 53aff488aa8..2eb490b38f1 100644
--- a/x11/lesstif/patches/patch-bn
+++ b/x11/lesstif/patches/patch-bn
@@ -1,16 +1,16 @@
-$NetBSD: patch-bn,v 1.2 2001/06/30 19:08:28 jlam Exp $
+$NetBSD: patch-bn,v 1.3 2002/12/05 19:10:48 drochner Exp $
---- scripts/autoconf/Makefile.am.orig Sun Sep 12 07:13:53 1999
-+++ scripts/autoconf/Makefile.am
-@@ -5,10 +5,6 @@
+--- scripts/autoconf/Makefile.in.orig Thu Dec 5 18:17:46 2002
++++ scripts/autoconf/Makefile.in Thu Dec 5 18:20:59 2002
+@@ -140,9 +140,9 @@
- EXTRA_DIST= ac_find_motif.m4
+ EXTRA_DIST = ac_find_motif.m4
-aclocaldir = @ACLOCALDIR@
--
--if Aclocal
+aclocaldir = ${prefix}/share/aclocal
- aclocal_DATA = ac_find_motif.m4
--
--endif
+-@Aclocal_TRUE@aclocal_DATA = ac_find_motif.m4
++aclocal_DATA = ac_find_motif.m4
+ subdir = scripts/autoconf
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/include/LTconfig.h