diff options
| author | jlam <jlam@pkgsrc.org> | 2000-12-22 17:26:18 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-12-22 17:26:18 +0000 |
| commit | c788cdc7d80be0e4b147aedc81c6017e287a97da (patch) | |
| tree | 7508366f1ef7becae93914cbae4785a898754206 /x11/lesstif | |
| parent | 6968ccff3d613827a8a5f96fee1d0b3614c8fdb5 (diff) | |
| download | pkgsrc-c788cdc7d80be0e4b147aedc81c6017e287a97da.tar.gz | |
Update lesstif and lesstif12 to version 0.92.6. Make me the maintainer
since I'm most familiar with the hack to include the LessTif X11 config
files. Relevant changes from version 0.91.8:
* Build/Install Uil libs and Headers (and tests) by default.
* Fixed some FontList interfaces to conform to the docs. Might fix
memory leaks as well.
* Ongoing work to use ANSI C89 as much as possible. Drop alternatives
being used (e.g. bcopy() and friends)
* The Motif 2.x Xme() funcs should now all exist in stubs at least; some
had already been "implemented" earlier.
* Build support for a Motif 2.1 compatible tree. This will soon replace
the 2.0 tree.
* Work in progres for creating XmPrint API. (2.1 functionality)
Diffstat (limited to 'x11/lesstif')
47 files changed, 1299 insertions, 497 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 66dd1e8eb08..a7c3e802d6f 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2000/10/23 19:45:05 jlam Exp $ +# $NetBSD: Makefile,v 1.53 2000/12/22 17:26:18 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # -BUILD_DEPENDS+= lynx:../../www/lynx - CONFIGURE_ARGS+= --disable-build-12 CONFIGURE_ARGS+= --enable-build-20 CONFIGURE_ARGS+= --enable-default-20 @@ -11,12 +9,18 @@ CONFIGURE_ARGS+= --enable-default-20 DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -post-build: +pre-install: ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ - -e "s,@X11BASE@,${X11BASE},g" \ + -e "s,@CP@,${CP},g" \ + -e "s,@GREP@,${GREP},g" \ + -e "s,@RM@,${RM},g" \ + -e "s,@RMDIR@,${RMDIR},g" \ + -e "s,@TRUE@,${TRUE},g" \ < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ - -e "s,@X11BASE@,${X11BASE},g" \ + -e "s,@CP@,${CP},g" \ + -e "s,@GREP@,${GREP},g" \ + -e "s,@LN@,${LN},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} post-install: diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common index ae89b42026d..2206bc6ae43 100644 --- a/x11/lesstif/Makefile.common +++ b/x11/lesstif/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.3 2000/10/23 19:45:05 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2000/12/22 17:26:18 jlam Exp $ DISTNAME= lesstif-${LESSTIF_VERSION} -LESSTIF_VERSION= 0.91.8 +LESSTIF_VERSION= 0.92.6 CATEGORIES= x11 MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \ ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \ @@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/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= packages@netbsd.org +MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.lesstif.org/ BUILD_DEPENDS+= autoconf:../../devel/autoconf @@ -25,7 +25,13 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/Xbae/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose -CONFIGURE_ARGS+= --enable-xdnd +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 FILESDIR= ${.CURDIR}/../../x11/lesstif/files PATCHDIR= ${.CURDIR}/../../x11/lesstif/patches @@ -34,8 +40,11 @@ post-extract: cd ${WRKSRC}/lib/config; ${MV} host.def LessTif.def pre-configure: - for d in . lib/Xlt lib/Xbae test ; do \ - cd ${WRKSRC}/$$d && libtoolize --force && aclocal && autoheader && automake -a -i && autoconf; \ + ${TOUCH} ${WRKDIR}/nonexecutable + ${CHMOD} a-x ${WRKDIR}/nonexecutable + for dir in . lib/Xlt lib/Xbae test ; do \ + cd ${WRKSRC}/$$dir && libtoolize --force && aclocal \ + && autoheader && automake -a -i && autoconf; \ done .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5 index 9780cbaeec6..c16d530f59f 100644 --- a/x11/lesstif/files/md5 +++ b/x11/lesstif/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.21 2000/10/23 19:45:08 jlam Exp $ +$NetBSD: md5,v 1.22 2000/12/22 17:26:18 jlam Exp $ -MD5 (lesstif-0.91.8.tar.gz) = 4b91059f06b4764d247af4fda968e1cc +MD5 (lesstif-0.92.6.tar.gz) = c6fc1b7b79e7d5e2e69f6a763cd973dd diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum index 3e5d6789b85..3b1e2903558 100644 --- a/x11/lesstif/files/patch-sum +++ b/x11/lesstif/files/patch-sum @@ -1,23 +1,42 @@ -$NetBSD: patch-sum,v 1.17 2000/10/23 19:45:08 jlam Exp $ +$NetBSD: patch-sum,v 1.18 2000/12/22 17:26:18 jlam Exp $ -MD5 (patch-aa) = f4006d871d14ebef13e1e625437d071a -MD5 (patch-ab) = 2af3d1361a6df268fc5d68b222b8b037 -MD5 (patch-ac) = a5ba6f0b459e60f32c0ba26c18d5464e -MD5 (patch-ad) = 0de2ac2fa21267f5489a55d363a6a2f4 -MD5 (patch-ae) = 105fc92adbb8716287d1d62ce8371681 -MD5 (patch-af) = faacbb261c275fb065cbbe1d59cc92e0 -MD5 (patch-ag) = 4e8afb72a8ec981ec99a8de36a14f6bc -MD5 (patch-ah) = fa6d0469298ce223a2bf1d090953c4e6 -MD5 (patch-ai) = 584bdfcfb4cc79ae8a7334b18bfc4b8f -MD5 (patch-aj) = fc85758a1771e83ba99c6c146015acda -MD5 (patch-ak) = e7ebd4ee7ce2eb4f6f805318fcf4991d -MD5 (patch-al) = c0f366a04cd3e2140f278c3d4d715233 -MD5 (patch-am) = 08d057ac808ab8c914edeaa321f55638 -MD5 (patch-an) = 1f1ecdc3e7879b2ab587c8486fbde407 -MD5 (patch-ao) = 070e7fac68615a1729864b663efa2bd9 -MD5 (patch-ap) = 3ec5a0689b9ea93f679b72ea7c9c5e09 -MD5 (patch-aq) = a8b4441ffe4be86ce27f1c72f79d72d6 -MD5 (patch-ar) = 4c99d6f84fde742a610f257a9e6067c3 -MD5 (patch-as) = 142cce459071b0044183b917e7b2c430 -MD5 (patch-at) = aa39fb291a286ce2d33df08f5429dbeb -MD5 (patch-au) = 1327dc62791d641799b2a38c9808abd2 +MD5 (patch-aa) = 11fb90ec85f6fdcf00f1eb3189fcd6ce +MD5 (patch-ab) = 873ad5e0bcb9e745a93c66ad42d1b33e +MD5 (patch-ac) = 2af3d1361a6df268fc5d68b222b8b037 +MD5 (patch-ad) = bbfbc4ab8e96665847b02669787456de +MD5 (patch-ae) = 57b04945fc95b6754e352c27cf3376eb +MD5 (patch-af) = 07ecad482a769ffed790b5b6f0108818 +MD5 (patch-ag) = 5b4aa475da1c59176f812103bf34c100 +MD5 (patch-ah) = 8edaafa56aa58863fc1ec00e347d51b3 +MD5 (patch-ai) = 45fadd8d838faaf901c455f5549e01ee +MD5 (patch-aj) = 53b0ea30e3744a1b0581ad632645323c +MD5 (patch-ak) = 2d157ad66c7cfe6cf0506af5b97f7e68 +MD5 (patch-al) = 3a9b3c51b6b33215a02346dd8bbf761a +MD5 (patch-am) = 9485dc2475d677bcbddc82b05d9da7fc +MD5 (patch-an) = eda102cb133bedf807bbc8f8e1ab83fc +MD5 (patch-ao) = b3539cdd8b0fef2921a6af18dea49d58 +MD5 (patch-ap) = 0c10604e728cde6fe495e809c04f8b36 +MD5 (patch-aq) = a42bae50b24ccf04bc9d53bf7b92405d +MD5 (patch-ar) = 584bdfcfb4cc79ae8a7334b18bfc4b8f +MD5 (patch-as) = 2b1d18f26d0ed4ce8bf15a9203d6c222 +MD5 (patch-at) = faf91d39e529c5026b705a5a8651b6ea +MD5 (patch-au) = c7a1cb4a3f2757c75667b44812c6585e +MD5 (patch-av) = 2341623a802a85fd3ad05c831259f671 +MD5 (patch-aw) = 28b0b3ba12bda0ee86602b9164147fbd +MD5 (patch-ax) = f657570dc8e4e0ff7dc63a5a6f18e7a4 +MD5 (patch-ay) = 9a72704bff3b3b70bd65ec1389c5bd24 +MD5 (patch-az) = eb3ff630916691d0c70366ea4af0d819 +MD5 (patch-ba) = b74b567b0f74fdf2410f50b8de74809e +MD5 (patch-bb) = 83e25e1cdb6ed962179f34839e1a98c1 +MD5 (patch-bc) = 3779b947503f14dc6af1cd05d598af14 +MD5 (patch-bd) = 09966373d3f05f364899ef1018692296 +MD5 (patch-be) = 85900ee01c4e23d6967fb7219dd6d891 +MD5 (patch-bf) = d2727db776be7e91b2f921ccba28d36f +MD5 (patch-bg) = 58e3dade86f5c4ffe77af57e27dc23a2 +MD5 (patch-bh) = a3f0e98177cb7ddb4ee5842770313d60 +MD5 (patch-bi) = dde797988f3617bf47c9a1903c621173 +MD5 (patch-bj) = e33c4158fb87321098c1f5d51513e281 +MD5 (patch-bk) = 585d1c3d7c53408993af5f3e7d3291af +MD5 (patch-bl) = 3e12ed60bd2b76f9ed0fa42373b472fa +MD5 (patch-bm) = b91afa211bf7966fe931716e7acc84c2 +MD5 (patch-bn) = 1327dc62791d641799b2a38c9808abd2 diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 4a830bf55d9..457b24082eb 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,30 +1,24 @@ -$NetBSD: patch-aa,v 1.15 2000/10/23 19:45:10 jlam Exp $ +$NetBSD: patch-aa,v 1.16 2000/12/22 17:26:18 jlam Exp $ ---- Makefile.am.orig Tue May 2 17:05:14 2000 +--- Makefile.am.orig Mon Dec 18 07:58:29 2000 +++ Makefile.am -@@ -3,29 +3,37 @@ +@@ -3,25 +3,32 @@ # - MAINTAINERCLEANFILES=Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs -+ + MAINTAINERCLEANFILES=Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs release-notes.html release-notes.txt +if Version_1_2 -+SUBDIRS = include lib -+ -+DIST_SUBDIRS = include lib test ++SUBDIRS = include lib +else - SUBDIRS = include lib clients scripts doc @BuildTestDir@ - - DIST_SUBDIRS = include lib clients scripts doc test + SUBDIRS = include scripts lib clients doc @BuildTestDir@ +endif + DIST_SUBDIRS = include scripts lib clients doc test + AUTOMAKE_OPTIONS = 1.4 -+EXTRA_DIST= acconfig.h configure \ -+ BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES ++EXTRA_DIST= acconfig.h configure \ ++ BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES + -+# Only install the documentation if installing 2.0-compatible libraries. -+# -+if Version_2_0 # # Install some information files # @@ -32,25 +26,32 @@ $NetBSD: patch-aa,v 1.15 2000/10/23 19:45:10 jlam Exp $ # poluting /usr/local for default installs. # -rootdir= $(exec_prefix)/LessTif --root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ -+doc_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ - KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt ++# Only install the documentation if installing 2.0-compatible libraries. ++# ++if Version_2_0 ++rootdir= $(docdir) + root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ + KNOWN_BUGS README RELEASE-POLICY release-notes.txt -EXTRA_DIST= acconfig.h configure \ - BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES - @MAINT@changelog: - @MAINT@ @( cd $(srcdir)/lib/Xm ; cvs -Q log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: ) | $(srcdir)/scripts/parselog >ChangeLog + @MAINT@ @ cvs -Q -z8 log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: \ + @MAINT@ include \ +@@ -32,7 +39,6 @@ + @MAINT@ clients \ + @MAINT@ | $(srcdir)/scripts/parselog >ChangeLog -htmldir= $(exec_prefix)/LessTif/doc html_DATA= release-notes.html all-local: BUG-REPORTING -@@ -47,6 +55,4 @@ - release-notes.html: $(srcdir)/NOTES - rm -f $@ - cp $(srcdir)/NOTES $@ -- --#install-data-hook: --# ${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html +@@ -49,6 +55,7 @@ + + #install-data-hook: + # ${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html +endif + + + # diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab index e621d88d9b3..f1b4a805f2c 100644 --- a/x11/lesstif/patches/patch-ab +++ b/x11/lesstif/patches/patch-ab @@ -1,13 +1,43 @@ -$NetBSD: patch-ab,v 1.11 2000/10/23 19:45:10 jlam Exp $ +$NetBSD: patch-ab,v 1.12 2000/12/22 17:26:18 jlam Exp $ ---- clients/Motif-1.2/mwm/system.mwmrc.orig Sun Jan 16 06:06:11 2000 -+++ clients/Motif-1.2/mwm/system.mwmrc -@@ -4,7 +4,7 @@ - Menu DefaultRootMenu - { - "Root Menu" f.title -- "New Window" f.exec "xterm -e /bin/bash &" -+ "New Window" f.exec "xterm &" - "Shuffle Up" f.circle_up - "Shuffle Down" f.circle_down - "Refresh" f.refresh +--- clients/Motif-1.2/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000 ++++ clients/Motif-1.2/mwm/Makefile.am +@@ -4,8 +4,8 @@ + + if Version_1_2 + bin_PROGRAMS= mwm ++bindir= $(prefix)/LessTif/Motif1.2/bin + endif +-bindir = $(prefix)/LessTif/Motif1.2/bin + + 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 mwmerr.c mwmparse.y mwmlex.l mwmstrings.h \ +@@ -37,6 +38,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 + +@@ -48,12 +50,6 @@ + mwmlex.o: mwmparse.h + + YFLAGS= -d +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 2b865fcfa71..f669a76fa89 100644 --- a/x11/lesstif/patches/patch-ac +++ b/x11/lesstif/patches/patch-ac @@ -1,25 +1,13 @@ -$NetBSD: patch-ac,v 1.11 2000/10/23 19:45:16 jlam Exp $ +$NetBSD: patch-ac,v 1.12 2000/12/22 17:26:18 jlam Exp $ ---- configure.in.orig Thu Aug 31 04:46:02 2000 -+++ configure.in -@@ -506,7 +506,7 @@ - dnl We provide for such a translation via Debian's man2html. - dnl - --AC_CHECK_PROG(VarHaveMan2html, man2html, yes, no) -+dnl AC_CHECK_PROG(VarHaveMan2html, man2html, yes, no) - AM_CONDITIONAL(HaveMan2html, test x$VarHaveMan2html = xyes) - - dnl -@@ -609,6 +609,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 AC_SUBST(version) - AC_SUBST(version_suffix) +--- clients/Motif-1.2/mwm/system.mwmrc.orig Sun Jan 16 06:06:11 2000 ++++ clients/Motif-1.2/mwm/system.mwmrc +@@ -4,7 +4,7 @@ + Menu DefaultRootMenu + { + "Root Menu" f.title +- "New Window" f.exec "xterm -e /bin/bash &" ++ "New Window" f.exec "xterm &" + "Shuffle Up" f.circle_up + "Shuffle Down" f.circle_down + "Refresh" f.refresh diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad index 77463e5f559..17cc75dc2dd 100644 --- a/x11/lesstif/patches/patch-ad +++ b/x11/lesstif/patches/patch-ad @@ -1,14 +1,24 @@ -$NetBSD: patch-ad,v 1.14 2000/10/23 19:45:16 jlam Exp $ +$NetBSD: patch-ad,v 1.15 2000/12/22 17:26:19 jlam Exp $ ---- doc/Makefile.am.orig Fri Jan 7 11:57:44 2000 -+++ doc/Makefile.am -@@ -6,8 +6,7 @@ +--- clients/Motif-1.2/uil/Makefile.am.orig Sat Dec 9 12:11:14 2000 ++++ clients/Motif-1.2/uil/Makefile.am +@@ -5,8 +5,8 @@ + if Version_1_2 + bin_PROGRAMS= uil + noinst_PROGRAMS = newuil ++bindir= $(prefix)/LessTif/Motif1.2/bin + endif +-bindir = $(prefix)/LessTif/Motif1.2/bin - SUBDIRS = www.lesstif.org lessdox + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h --rootdir= $(exec_prefix)/LessTif/doc --root_DATA= All.html Clipboard.txt DragAndDrop.txt Form.txt \ -+html_DATA= All.html Clipboard.txt DragAndDrop.txt Form.txt \ - GeoUtils.txt Geometry.html SyntheticResources.txt \ - UIL.txt XmStrings.txt thread.html INSTALL.html +@@ -35,9 +35,3 @@ + lex.o: yacc.h + YFLAGS= -d +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 54939884bd6..6db1c13b582 100644 --- a/x11/lesstif/patches/patch-ae +++ b/x11/lesstif/patches/patch-ae @@ -1,26 +1,24 @@ -$NetBSD: patch-ae,v 1.14 2000/10/23 19:45:16 jlam Exp $ +$NetBSD: patch-ae,v 1.15 2000/12/22 17:26:19 jlam Exp $ ---- doc/lessdox/clients/Makefile.am.orig Tue Dec 21 19:26:24 1999 -+++ doc/lessdox/clients/Makefile.am -@@ -6,10 +6,9 @@ - EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) - SUFFIXES= .1 .3 .5 .html +--- clients/Motif-1.2/xmbind/Makefile.am.orig Fri Nov 24 09:58:21 2000 ++++ clients/Motif-1.2/xmbind/Makefile.am +@@ -4,8 +4,8 @@ --mandir= $(exec_prefix)/LessTif/doc/man --man1dir= $(exec_prefix)/LessTif/doc/man/man1 --man3dir= $(exec_prefix)/LessTif/doc/man/man3 --man5dir= $(exec_prefix)/LessTif/doc/man/man5 -+man1dir= $(mandir)/man1 -+man3dir= $(mandir)/man3 -+man5dir= $(mandir)/man5 + if Version_1_2 + bin_PROGRAMS= xmbind ++bindir= $(prefix)/LessTif/Motif1.2/bin + endif +-bindir = $(prefix)/LessTif/Motif1.2/bin - man1_DATA= mwm.1 xmbind.1 lesstif.1 xbae.1 xlt.1 - man3_DATA= -@@ -24,7 +23,6 @@ - # build them. - # + MAINTAINERCLEANFILES=Makefile.in --htmldir= $(exec_prefix)/LessTif/doc/html - if HaveMan2html +@@ -17,9 +17,3 @@ + $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) - html_DATA= mwm.html mwmrc.html xmbind.html lesstif.html xlt.html xbae.html + xmbind_SOURCES= xmbind.c +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 6ffe6b67b4f..66ec0ac579f 100644 --- a/x11/lesstif/patches/patch-af +++ b/x11/lesstif/patches/patch-af @@ -1,26 +1,44 @@ -$NetBSD: patch-af,v 1.12 2000/10/23 19:45:16 jlam Exp $ +$NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $ ---- doc/lessdox/functions/Makefile.am.orig Sun Sep 19 12:51:05 1999 -+++ doc/lessdox/functions/Makefile.am -@@ -6,10 +6,9 @@ - EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA) - SUFFIXES= .1 .3 .5 .html - --mandir= $(exec_prefix)/LessTif/doc/man --man1dir= $(exec_prefix)/LessTif/doc/man/man1 --man3dir= $(exec_prefix)/LessTif/doc/man/man3 --man5dir= $(exec_prefix)/LessTif/doc/man/man5 -+man1dir= $(mandir)/man1 -+man3dir= $(mandir)/man3 -+man5dir= $(mandir)/man5 - - man1_DATA= - man3_DATA= -@@ -24,7 +23,6 @@ - # build them. - # - --htmldir= $(exec_prefix)/LessTif/doc/html - if HaveMan2html - - html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ +--- clients/Motif-2.0/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000 ++++ clients/Motif-2.0/mwm/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_0 + bin_PROGRAMS= mwm +-endif ++if DefaultVersion20 ++bindir = $(prefix)/bin ++else + bindir = $(prefix)/LessTif/Motif2.0/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h + +@@ -59,10 +63,12 @@ + LDADD= ../../../lib/Xm-2.0/libXm.la \ + $(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) + ++if Version_2_0 + appdir= $(libdir)/X11/app-defaults + + 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)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 75ad0d4f7bd..d435d3e2c45 100644 --- a/x11/lesstif/patches/patch-ag +++ b/x11/lesstif/patches/patch-ag @@ -1,38 +1,29 @@ -$NetBSD: patch-ag,v 1.11 2000/10/23 19:45:17 jlam Exp $ +$NetBSD: patch-ag,v 1.12 2000/12/22 17:26:19 jlam Exp $ ---- doc/lessdox/widgets/Makefile.am.orig Thu Nov 11 10:22:20 1999 -+++ doc/lessdox/widgets/Makefile.am -@@ -6,10 +6,9 @@ - EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA) - SUFFIXES= .1 .3 .5 .html +--- clients/Motif-2.0/uil/Makefile.am.orig Thu Dec 7 04:12:29 2000 ++++ clients/Motif-2.0/uil/Makefile.am +@@ -5,9 +5,13 @@ + if Version_2_0 + bin_PROGRAMS= uil + noinst_PROGRAMS = newuil +-endif --mandir= $(prefix)/LessTif/doc/man --man1dir= $(prefix)/LessTif/doc/man/man1 --man3dir= $(prefix)/LessTif/doc/man/man3 --man5dir= $(prefix)/LessTif/doc/man/man5 -+man1dir= $(mandir)/man1 -+man3dir= $(mandir)/man3 -+man5dir= $(mandir)/man5 ++if DefaultVersion20 ++bindir = $(prefix)/bin ++else + bindir = $(prefix)/LessTif/Motif2.0/bin ++endif ++endif - man1_DATA= - man3_DATA= \ -@@ -54,8 +53,6 @@ - # build them. - # + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h --htmldir= $(prefix)/LessTif/doc/html +@@ -65,9 +69,3 @@ + rm $$i; \ + fi ; \ + done - - if HaveMan2html - - html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ -@@ -77,10 +74,3 @@ - man2html -f <$(srcdir)/$*.5 >$*.html - - endif -- --# --# 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 +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 2cd231a3edb..b378c352a87 100644 --- a/x11/lesstif/patches/patch-ah +++ b/x11/lesstif/patches/patch-ah @@ -1,30 +1,28 @@ -$NetBSD: patch-ah,v 1.12 2000/10/23 19:45:17 jlam Exp $ +$NetBSD: patch-ah,v 1.13 2000/12/22 17:26:19 jlam Exp $ ---- doc/www.lesstif.org/Makefile.am.orig Tue Jul 11 12:26:20 2000 -+++ doc/www.lesstif.org/Makefile.am -@@ -11,8 +11,7 @@ - # Lets put the informational stuff in a sub directory to avoid - # polluting /usr/local for default installs. - # --docdir= $(exec_prefix)/LessTif/doc --doc_DATA= COPYING.LIB.html FAQ.html INSTALL.html apps.html \ -+html_DATA= COPYING.LIB.html FAQ.html INSTALL.html apps.html \ - bugs.html cdrom.html core.html current.html \ - cvs.html download.html index.html links.html lists.html \ - mirrors.html platforms.html release-policy.html \ -@@ -20,7 +19,7 @@ - versions.html web_button.html known.html help.html \ - Advocacy.html Xbae.html Xlt.html feedback.html +--- clients/Motif-2.0/xmbind/Makefile.am.orig Fri Nov 24 09:58:21 2000 ++++ clients/Motif-2.0/xmbind/Makefile.am +@@ -4,8 +4,12 @@ --rootdir= $(exec_prefix)/LessTif -+rootdir= $(docdir) - root_DATA= Install + if Version_2_0 + bin_PROGRAMS= xmbind +-endif ++if DefaultVersion20 ++bindir = $(prefix)/bin ++else + bindir = $(prefix)/LessTif/Motif2.0/bin ++endif ++endif - all-local: FAQ -@@ -43,5 +42,5 @@ + MAINTAINERCLEANFILES=Makefile.in - endif - --root2dir= $(exec_prefix)/LessTif -+root2dir= $(docdir) - root2_DATA= FAQ +@@ -45,9 +49,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 638b1f3076a..3e7ae5989b4 100644 --- a/x11/lesstif/patches/patch-ai +++ b/x11/lesstif/patches/patch-ai @@ -1,13 +1,44 @@ -$NetBSD: patch-ai,v 1.14 2000/10/23 19:45:17 jlam Exp $ +$NetBSD: patch-ai,v 1.15 2000/12/22 17:26:19 jlam Exp $ ---- doc/www.lesstif.org/images/Makefile.am.orig Tue Jul 11 12:26:18 2000 -+++ doc/www.lesstif.org/images/Makefile.am -@@ -10,7 +10,7 @@ - # Lets put the informational stuff in a sub directory to avoid - # poluting /usr/local for default installs. - # --rootdir= $(exec_prefix)/LessTif/doc/images -+rootdir= $(htmldir)/images - root_DATA= hungry.png \ - lesstif-realsmall.png lesstif-small.png lesstif.png \ - ltsunlogo.png lesstif.jpg ltsunlogo.jpg \ +--- clients/Motif-2.1/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000 ++++ clients/Motif-2.1/mwm/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_1 + bin_PROGRAMS= mwm +-endif ++if DefaultVersion21 ++bindir = $(prefix)/bin ++else + bindir = $(prefix)/LessTif/Motif2.1/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h + +@@ -72,10 +76,12 @@ + LDADD= ../../../lib/Xm-2.1/libXm.la \ + $(X_LIBS) $(LIBXP) -lXt $(X_PRE_LIBS) -lXext -lX11 ${X_EXTRA_LIBS} + ++if Version_2_1 + appdir= $(libdir)/X11/app-defaults + + 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)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 42749dd73f9..cbe5f261109 100644 --- a/x11/lesstif/patches/patch-aj +++ b/x11/lesstif/patches/patch-aj @@ -1,16 +1,29 @@ -$NetBSD: patch-aj,v 1.10 2000/10/23 19:45:17 jlam Exp $ +$NetBSD: patch-aj,v 1.11 2000/12/22 17:26:19 jlam Exp $ ---- include/Motif-1.2/Mrm/Makefile.am.orig Sun Apr 11 08:28:41 1999 -+++ include/Motif-1.2/Mrm/Makefile.am -@@ -16,11 +16,3 @@ - mrm_HEADERS= MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h +--- clients/Motif-2.1/uil/Makefile.am.orig Thu Dec 7 04:12:29 2000 ++++ 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 = $(prefix)/bin ++else + bindir = $(prefix)/LessTif/Motif2.1/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h - endif +@@ -75,10 +79,3 @@ + rm $$i; \ + fi ; \ + done +- -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 +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index 5fbfc88b9ca..696d57930df 100644 --- a/x11/lesstif/patches/patch-ak +++ b/x11/lesstif/patches/patch-ak @@ -1,15 +1,29 @@ -$NetBSD: patch-ak,v 1.10 2000/10/23 19:45:17 jlam Exp $ +$NetBSD: patch-ak,v 1.11 2000/12/22 17:26:19 jlam Exp $ ---- include/Motif-1.2/Xm/Makefile.am.orig Sun Apr 11 08:28:42 1999 -+++ include/Motif-1.2/Xm/Makefile.am -@@ -46,10 +46,3 @@ - xm_DATA = Xm.h +--- clients/Motif-2.1/xmbind/Makefile.am.orig Fri Nov 24 09:58:22 2000 ++++ clients/Motif-2.1/xmbind/Makefile.am +@@ -4,8 +4,12 @@ - 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) + if Version_2_1 + bin_PROGRAMS= xmbind -endif ++if DefaultVersion21 ++bindir = $(prefix)/bin ++else + bindir = $(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)$(prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(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 index c4555641716..614a846928d 100644 --- a/x11/lesstif/patches/patch-al +++ b/x11/lesstif/patches/patch-al @@ -1,25 +1,22 @@ -$NetBSD: patch-al,v 1.9 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-al,v 1.10 2000/12/22 17:26:19 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,7 @@ - # Lets put the headers in a sub directory to avoid - # poluting /usr/local with more directories for default installs. - # --mrmdir = $(prefix)/LessTif/Motif2.0/include/Mrm -+mrmdir = $(includedir)/Mrm +--- configure.in.orig Thu Dec 21 07:37:01 2000 ++++ configure.in +@@ -656,6 +656,17 @@ + dnl AC_SUBST(libdir) + AC_SUBST(bindir) - HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h - -@@ -30,11 +30,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 -- ++docdir='${prefix}/share/doc/lesstif' ++htmldir='${prefix}/share/doc/html/lesstif' ++man1dir='${mandir}/man1' ++man3dir='${mandir}/man3' ++man5dir='${mandir}/man5' ++AC_SUBST(docdir) ++AC_SUBST(htmldir) ++AC_SUBST(man1dir) ++AC_SUBST(man3dir) ++AC_SUBST(man5dir) ++ + 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 eb419a95cf6..29663dee8c0 100644 --- a/x11/lesstif/patches/patch-am +++ b/x11/lesstif/patches/patch-am @@ -1,25 +1,13 @@ -$NetBSD: patch-am,v 1.8 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-am,v 1.9 2000/12/22 17:26:19 jlam Exp $ ---- include/Motif-2.0/Xm/Makefile.am.orig Wed Aug 16 12:39:26 2000 -+++ include/Motif-2.0/Xm/Makefile.am -@@ -11,7 +11,7 @@ - # Lets put the headers in a sub directory to avoid - # poluting /usr/local with more directories for default installs. - # --xmdir= $(prefix)/LessTif/Motif2.0/include/Xm -+xmdir= $(includedir)/Xm +--- doc/Makefile.am.orig Fri Jan 7 11:57:44 2000 ++++ doc/Makefile.am +@@ -6,7 +6,7 @@ - HEADERS1_2 = \ - ArrowB.h ArrowBG.h AtomMgr.h \ -@@ -73,11 +73,4 @@ - fi ; \ - done + SUBDIRS = www.lesstif.org lessdox --endif --install-data-hook: --if Version_2_0 --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 - endif +-rootdir= $(exec_prefix)/LessTif/doc ++rootdir= $(htmldir) + root_DATA= All.html Clipboard.txt DragAndDrop.txt Form.txt \ + GeoUtils.txt Geometry.html SyntheticResources.txt \ + UIL.txt XmStrings.txt thread.html INSTALL.html diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an index c2717c73c8f..c23fbf4b225 100644 --- a/x11/lesstif/patches/patch-an +++ b/x11/lesstif/patches/patch-an @@ -1,29 +1,22 @@ -$NetBSD: patch-an,v 1.10 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-an,v 1.11 2000/12/22 17:26:19 jlam Exp $ ---- lib/Makefile.am.orig Tue May 2 17:05:15 2000 -+++ lib/Makefile.am -@@ -3,4 +3,20 @@ - # - MAINTAINERCLEANFILES=Makefile.in -+ -+if Version_1_2 -+SUBDIRS= \ -+ Xm Mrm Uil \ -+ Xm-2.0 Mrm-2.0 Uil-2.0 \ -+ Xm-2.1 Mrm-2.1 \ -+ Xm-CDE Mrm-CDE \ -+ @BuildXltDir@ @BuildXbaeDir@ -+ -+DIST_SUBDIRS= \ -+ Xm Mrm Uil \ -+ Xm-2.0 Mrm-2.0 Uil-2.0 \ -+ Xm-2.1 Mrm-2.1 \ -+ Xm-CDE Mrm-CDE \ -+ Xlt Xbae -+else - SUBDIRS= config \ - Xm Mrm Uil \ -@@ -16,2 +32,3 @@ - Xm-CDE Mrm-CDE \ - Xlt Xbae -+endif +--- doc/lessdox/clients/Makefile.am.orig Wed Dec 20 04:34:35 2000 ++++ doc/lessdox/clients/Makefile.am +@@ -6,17 +6,10 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html + +-mandir= $(exec_prefix)/LessTif/doc/man +-man1dir= $(exec_prefix)/LessTif/doc/man/man1 +-man3dir= $(exec_prefix)/LessTif/doc/man/man3 +-man5dir= $(exec_prefix)/LessTif/doc/man/man5 +- + man1_DATA= mwm.1 xmbind.1 lesstif.1 uil.1 xbae.1 xlt.1 + man3_DATA= + man5_DATA= mwmrc.5 + +- +-htmldir= $(exec_prefix)/LessTif/doc/html + + html_DATA= mwm.html mwmrc.html xmbind.html lesstif.html uil.html \ + xlt.html xbae.html diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao index ea138725e80..4ea928007e3 100644 --- a/x11/lesstif/patches/patch-ao +++ b/x11/lesstif/patches/patch-ao @@ -1,38 +1,22 @@ -$NetBSD: patch-ao,v 1.8 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-ao,v 1.9 2000/12/22 17:26:19 jlam Exp $ ---- lib/Mrm-2.0/Makefile.am.orig Wed Aug 30 12:15:23 2000 -+++ lib/Mrm-2.0/Makefile.am -@@ -45,8 +45,6 @@ - -DX_LIB_PATH=\"@x_libraries@\" \ - -DLESSTIFHOME=\"@prefix@\" +--- doc/lessdox/functions/Makefile.am.orig Wed Dec 20 04:34:35 2000 ++++ doc/lessdox/functions/Makefile.am +@@ -6,17 +6,10 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html --libdir = $(prefix)/LessTif/Motif2.0/lib +-mandir= $(exec_prefix)/LessTif/doc/man +-man1dir= $(exec_prefix)/LessTif/doc/man/man1 +-man3dir= $(exec_prefix)/LessTif/doc/man/man3 +-man5dir= $(exec_prefix)/LessTif/doc/man/man5 - - lib_LTLIBRARIES= libMrm.la + man1_DATA= + man3_DATA= + man5_DATA= - libMrm_la_SOURCES= ${SRCS_1_2:%=../Mrm/%} ${SRCS_2_0} -@@ -67,24 +65,4 @@ - rm $$i; \ - fi ; \ - done --endif - --install-data-hook: --if Version_2_0 --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so.2* .) --endif --if DefaultVersion20 -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.la .) --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so .) --endif --if LibtoolStatic -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.a .) --endif --endif - endif +-htmldir= $(exec_prefix)/LessTif/doc/html + + html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ + ${man5_DATA:.5=.html} diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap index a18871501e7..052f1412de6 100644 --- a/x11/lesstif/patches/patch-ap +++ b/x11/lesstif/patches/patch-ap @@ -1,27 +1,33 @@ -$NetBSD: patch-ap,v 1.7 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-ap,v 1.8 2000/12/22 17:26:19 jlam Exp $ ---- lib/Mrm/Makefile.am.orig Fri Oct 22 08:49:34 1999 -+++ lib/Mrm/Makefile.am -@@ -24,22 +24,3 @@ - lookup.h misc.h uil.h +--- doc/lessdox/widgets/Makefile.am.orig Wed Dec 20 04:34:35 2000 ++++ doc/lessdox/widgets/Makefile.am +@@ -6,11 +6,6 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html - endif +-mandir= $(prefix)/LessTif/doc/man +-man1dir= $(prefix)/LessTif/doc/man/man1 +-man3dir= $(prefix)/LessTif/doc/man/man3 +-man5dir= $(prefix)/LessTif/doc/man/man5 +- + man1_DATA= + man3_DATA= \ + XmClipboard.3 LessTifInternals.3 \ +@@ -45,8 +40,6 @@ + + man5_DATA= + +-htmldir= $(prefix)/LessTif/doc/html +- + html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ + ${man5_DATA:.5=.html} + +@@ -71,5 +64,5 @@ + # 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 Version_1_2 --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.1* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .) --endif --if DefaultVersion12 -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .) --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .) --endif --if LibtoolStatic -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.a .) --endif --endif --endif +- if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi ++#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 diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq index 84d6aef79bd..0f336ac16fd 100644 --- a/x11/lesstif/patches/patch-aq +++ b/x11/lesstif/patches/patch-aq @@ -1,38 +1,30 @@ -$NetBSD: patch-aq,v 1.8 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-aq,v 1.9 2000/12/22 17:26:19 jlam Exp $ ---- lib/Xm-2.0/Makefile.am.orig Tue Aug 8 18:21:12 2000 -+++ lib/Xm-2.0/Makefile.am -@@ -69,8 +69,6 @@ - # Lets put the headers in a sub directory to avoid - # poluting /usr/local with more directories for default installs. +--- doc/www.lesstif.org/Makefile.am.orig Mon Dec 18 07:58:29 2000 ++++ doc/www.lesstif.org/Makefile.am +@@ -11,8 +11,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. # --libdir = $(prefix)/LessTif/Motif2.0/lib -- - lib_LTLIBRARIES= libXm.la +-docdir= $(exec_prefix)/LessTif/doc +-doc_DATA= COPYING.LIB.html FAQ.html INSTALL.html apps.html \ ++html_DATA= COPYING.LIB.html FAQ.html INSTALL.html apps.html \ + bugs.html cdrom.html core.html current.html \ + cvs.html download.html index.html links.html lists.html \ + mirrors.html platforms.html release-policy.html \ +@@ -20,7 +19,7 @@ + versions.html web_button.html known.html help.html \ + Advocacy.html Xbae.html Xlt.html feedback.html - libXm_la_SOURCES= ${SRCS_1_2:%=../Xm/%} ${SRCS_2_0} -@@ -87,24 +85,4 @@ - rm $$i; \ - fi ; \ - done --endif -- --install-data-hook: --if Version_2_0 --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .) --endif --if DefaultVersion20 -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .) --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .) --endif --if LibtoolStatic -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.a .) --endif --endif - endif +-rootdir= $(exec_prefix)/LessTif ++rootdir= $(docdir) + root_DATA= Install + + all-local: FAQ +@@ -32,5 +31,5 @@ + $(HTML2TEXT) $(srcdir)/INSTALL.html >$@ + + +-root2dir= $(exec_prefix)/LessTif ++root2dir= $(docdir) + root2_DATA= FAQ diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar index 4f2955afa97..014a811b0c4 100644 --- a/x11/lesstif/patches/patch-ar +++ b/x11/lesstif/patches/patch-ar @@ -1,27 +1,13 @@ -$NetBSD: patch-ar,v 1.6 2000/10/23 19:45:18 jlam Exp $ +$NetBSD: patch-ar,v 1.7 2000/12/22 17:26:19 jlam Exp $ ---- lib/Xm/Makefile.am.orig Thu Jun 22 15:37:11 2000 -+++ lib/Xm/Makefile.am -@@ -54,22 +54,3 @@ - Xmos.c alloca.c misc.c $(XDND_SRCS) - - endif --install-data-hook: --if Version_1_2 --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.1* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .) --endif --if DefaultVersion12 -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .) --if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .) --endif --if LibtoolStatic -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.a .) --endif --endif --endif +--- doc/www.lesstif.org/images/Makefile.am.orig Tue Jul 11 12:26:18 2000 ++++ doc/www.lesstif.org/images/Makefile.am +@@ -10,7 +10,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(exec_prefix)/LessTif/doc/images ++rootdir= $(htmldir)/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 index 732b334c86d..0d5886388f9 100644 --- a/x11/lesstif/patches/patch-as +++ b/x11/lesstif/patches/patch-as @@ -1,24 +1,29 @@ -$NetBSD: patch-as,v 1.6 2000/10/23 19:45:19 jlam Exp $ +$NetBSD: patch-as,v 1.7 2000/12/22 17:26:19 jlam Exp $ ---- lib/config/LessTif.tmpl.orig Tue Aug 29 11:04:58 2000 -+++ lib/config/LessTif.tmpl -@@ -165,7 +165,7 @@ - #endif +--- 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) - #ifndef LessTifXmVersion --# define LessTifXmVersion 1 /* configure-time option */ -+# define LessTifXmVersion 2 /* NetBSD installs Xm-2.0 be default */ - #endif ++if Version_1_2 + # + # Install headers + # +@@ -14,16 +15,6 @@ + # + mrmdir = $(prefix)/LessTif/Motif1.2/include/Mrm - #if LessTifXmVersion == 1 -@@ -176,8 +176,8 @@ - # define LTDepXpLib /**/ - #elif LessTifXmVersion == 2 - # define XmVersion 2 --# define XmRevision 1 --# define MotifSharedRev 2.1 /* why 2.0? */ -+# define XmRevision 0 -+# define MotifSharedRev 2.0 - # define LTXpLib $(XPLIB) - # define LTDepXpLib $(DEPXPLIB) - #else +-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 index 1b7c7ade416..1f398696959 100644 --- a/x11/lesstif/patches/patch-at +++ b/x11/lesstif/patches/patch-at @@ -1,17 +1,39 @@ -$NetBSD: patch-at,v 1.7 2000/10/23 19:45:19 jlam Exp $ +$NetBSD: patch-at,v 1.8 2000/12/22 17:26:19 jlam Exp $ ---- lib/config/Makefile.am.orig Wed Aug 30 09:48:20 2000 -+++ lib/config/Makefile.am -@@ -6,10 +6,10 @@ +--- 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 @@ - configdir= $(libdir)/X11/config + EXTRA_DIST= $(xm_both_h) --EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl -+EXTRA_DIST = LessTif.rules LessTif.tmpl LessTif.def Imake.tmpl ++if Version_1_2 + # + # Install headers + # +@@ -81,8 +82,6 @@ + # + xmdir= $(prefix)/LessTif/Motif1.2/include/Xm - 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 +-if Version_1_2 +- + xm_HEADERS = $(xm_both_h) + # + # Note Xm.h is built by configure, therefore it's not necessarily in +@@ -91,17 +90,4 @@ + # + 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 index 27dbb0f21e3..2d2f19ca9cc 100644 --- a/x11/lesstif/patches/patch-au +++ b/x11/lesstif/patches/patch-au @@ -1,16 +1,29 @@ -$NetBSD: patch-au,v 1.5 2000/10/23 19:45:19 jlam Exp $ +$NetBSD: patch-au,v 1.6 2000/12/22 17:26:19 jlam Exp $ ---- scripts/autoconf/Makefile.am.orig Sun Sep 12 07:13:53 1999 -+++ scripts/autoconf/Makefile.am -@@ -5,10 +5,6 @@ +--- 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) - EXTRA_DIST= ac_find_motif.m4 ++if Version_1_2 + # + # Install headers + # +@@ -14,16 +15,6 @@ + # + uildir = $(prefix)/LessTif/Motif1.2/include/uil --aclocaldir = @ACLOCALDIR@ +-if Version_1_2 - --if Aclocal -+aclocaldir = ${prefix}/share/aclocal + uil_HEADERS= $(h) - aclocal_DATA = ac_find_motif.m4 -- + 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 new file mode 100644 index 00000000000..3696ae90974 --- /dev/null +++ b/x11/lesstif/patches/patch-av @@ -0,0 +1,32 @@ +$NetBSD: patch-av,v 1.3 2000/12/22 17:26:19 jlam Exp $ + +--- include/Motif-2.0/Mrm/Makefile.am.orig Sun Jan 2 08:22:55 2000 ++++ include/Motif-2.0/Mrm/Makefile.am +@@ -8,10 +8,14 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid ++# Let's put the headers in a sub directory if not a default install. + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion20 ++mrmdir = $(includedir)/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 new file mode 100644 index 00000000000..bb407b2c781 --- /dev/null +++ b/x11/lesstif/patches/patch-aw @@ -0,0 +1,30 @@ +$NetBSD: patch-aw,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- include/Motif-2.0/Xm/Makefile.am.orig Tue Dec 5 11:19:25 2000 ++++ include/Motif-2.0/Xm/Makefile.am +@@ -6,10 +6,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion20 ++xmdir= $(includedir)/Xm ++else + xmdir= $(prefix)/LessTif/Motif2.0/include/Xm ++endif + + HEADERS1_2 = \ + ArrowB.h ArrowBG.h AtomMgr.h \ +@@ -68,9 +71,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 new file mode 100644 index 00000000000..9b6f27ce60b --- /dev/null +++ b/x11/lesstif/patches/patch-ax @@ -0,0 +1,32 @@ +$NetBSD: patch-ax,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- include/Motif-2.0/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000 ++++ include/Motif-2.0/uil/Makefile.am +@@ -8,10 +8,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion20 ++uildir = $(includedir)/uil ++else + uildir = $(prefix)/LessTif/Motif2.0/include/uil ++endif + + HEADERS1_2 = Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h + +@@ -29,11 +32,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 new file mode 100644 index 00000000000..42e00c7d252 --- /dev/null +++ b/x11/lesstif/patches/patch-ay @@ -0,0 +1,33 @@ +$NetBSD: patch-ay,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- include/Motif-2.1/Mrm/Makefile.am.orig Mon Nov 27 05:36:00 2000 ++++ include/Motif-2.1/Mrm/Makefile.am +@@ -7,10 +7,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion21 ++mrmdir = $(includedir)/Mrm ++else + mrmdir = $(prefix)/LessTif/Motif2.1/include/Mrm ++endif + + HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h + HEADERS2_0 = +@@ -33,12 +36,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 new file mode 100644 index 00000000000..0f6a0a0d8e1 --- /dev/null +++ b/x11/lesstif/patches/patch-az @@ -0,0 +1,30 @@ +$NetBSD: patch-az,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- include/Motif-2.1/Xm/Makefile.am.orig Thu Dec 14 16:30:23 2000 ++++ include/Motif-2.1/Xm/Makefile.am +@@ -6,10 +6,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion21 ++xmdir= $(includedir)/Xm ++else + xmdir= $(prefix)/LessTif/Motif2.1/include/Xm ++endif + + HEADERS1_2 = \ + ArrowB.h ArrowBG.h AtomMgr.h \ +@@ -73,9 +76,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 new file mode 100644 index 00000000000..101da3564ae --- /dev/null +++ b/x11/lesstif/patches/patch-ba @@ -0,0 +1,32 @@ +$NetBSD: patch-ba,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- include/Motif-2.1/uil/Makefile.am.orig Wed Dec 6 08:26:37 2000 ++++ include/Motif-2.1/uil/Makefile.am +@@ -8,10 +8,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion21 ++uildir = $(includedir)/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 +37,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 new file mode 100644 index 00000000000..c853f516ca1 --- /dev/null +++ b/x11/lesstif/patches/patch-bb @@ -0,0 +1,16 @@ +$NetBSD: patch-bb,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- lib/Dt/Makefile.am.orig Sat Dec 16 15:44:05 2000 ++++ lib/Dt/Makefile.am +@@ -7,7 +7,11 @@ + + if BuildLibDt + ++if DefaultVersion21 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.1/lib ++endif + lib_LTLIBRARIES= libDt.la + + includedir= $(prefix)/LessTif/Motif2.1/include/Dt diff --git a/x11/lesstif/patches/patch-bc b/x11/lesstif/patches/patch-bc new file mode 100644 index 00000000000..80cdf343a92 --- /dev/null +++ b/x11/lesstif/patches/patch-bc @@ -0,0 +1,25 @@ +$NetBSD: patch-bc,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- lib/Makefile.am.orig Tue Dec 5 17:51:35 2000 ++++ lib/Makefile.am +@@ -3,5 +3,12 @@ + # + 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 \ +@@ -10,5 +17,5 @@ + Dt + +-DIST_SUBDIRS= config \ ++DIST_SUBDIRS= $(CONFIGDIR) \ + Xm Mrm Uil \ + Xm-2.0 Mrm-2.0 Uil-2.0 \ diff --git a/x11/lesstif/patches/patch-bd b/x11/lesstif/patches/patch-bd new file mode 100644 index 00000000000..4ed016431b3 --- /dev/null +++ b/x11/lesstif/patches/patch-bd @@ -0,0 +1,41 @@ +$NetBSD: patch-bd,v 1.1 2000/12/22 17:26:20 jlam Exp $ + +--- lib/Mrm-2.0/Makefile.am.orig Wed Aug 30 12:15:19 2000 ++++ lib/Mrm-2.0/Makefile.am +@@ -45,7 +45,11 @@ + -DX_LIB_PATH=\"@x_libraries@\" \ + -DLESSTIFHOME=\"@prefix@\" + ++if DefaultVersion20 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.0/lib ++endif + + lib_LTLIBRARIES= libMrm.la + +@@ -67,24 +71,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..7ec494c0104 --- /dev/null +++ b/x11/lesstif/patches/patch-be @@ -0,0 +1,41 @@ +$NetBSD: patch-be,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Mrm-2.1/Makefile.am.orig Wed Dec 6 10:37:47 2000 ++++ lib/Mrm-2.1/Makefile.am +@@ -52,7 +52,11 @@ + -DX_LIB_PATH=\"@x_libraries@\" \ + -DLESSTIFHOME=\"@prefix@\" + ++if DefaultVersion21 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.1/lib ++endif + + lib_LTLIBRARIES= libMrm.la + +@@ -78,24 +82,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..31124b6429e --- /dev/null +++ b/x11/lesstif/patches/patch-bf @@ -0,0 +1,27 @@ +$NetBSD: patch-bf,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Mrm/Makefile.am.orig Sun Oct 8 02:02:21 2000 ++++ lib/Mrm/Makefile.am +@@ -25,22 +25,3 @@ + lookup.h misc.h uil.h + + endif +-install-data-hook: +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.1* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..49d16e1edf6 --- /dev/null +++ b/x11/lesstif/patches/patch-bg @@ -0,0 +1,41 @@ +$NetBSD: patch-bg,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Uil-2.0/Makefile.am.orig Wed Oct 25 04:56:15 2000 ++++ lib/Uil-2.0/Makefile.am +@@ -40,7 +40,11 @@ + -DX_LIB_PATH=\"@x_libraries@\" \ + -DLESSTIFHOME=\"@prefix@\" + ++if DefaultVersion20 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.0/lib ++endif + + lib_LTLIBRARIES= libUil.la + +@@ -59,24 +63,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..85eadfb13b5 --- /dev/null +++ b/x11/lesstif/patches/patch-bh @@ -0,0 +1,41 @@ +$NetBSD: patch-bh,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Uil-2.1/Makefile.am.orig Wed Dec 6 10:37:47 2000 ++++ lib/Uil-2.1/Makefile.am +@@ -47,7 +47,11 @@ + -DX_LIB_PATH=\"@x_libraries@\" \ + -DLESSTIFHOME=\"@prefix@\" + ++if DefaultVersion21 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.1/lib ++endif + + lib_LTLIBRARIES= libUil.la + +@@ -71,24 +75,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..539743aeb73 --- /dev/null +++ b/x11/lesstif/patches/patch-bi @@ -0,0 +1,27 @@ +$NetBSD: patch-bi,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Uil/Makefile.am.orig Fri Oct 27 04:47:11 2000 ++++ lib/Uil/Makefile.am +@@ -25,22 +25,3 @@ + + + endif +-install-data-hook: +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.1* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libUil.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..d2a4998d59d --- /dev/null +++ b/x11/lesstif/patches/patch-bj @@ -0,0 +1,45 @@ +$NetBSD: patch-bj,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Xm-2.0/Makefile.am.orig Thu Nov 2 16:32:08 2000 ++++ lib/Xm-2.0/Makefile.am +@@ -66,10 +66,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion20 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.0/lib ++endif + + lib_LTLIBRARIES= libXm.la + +@@ -87,24 +90,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..b68c52698fe --- /dev/null +++ b/x11/lesstif/patches/patch-bk @@ -0,0 +1,45 @@ +$NetBSD: patch-bk,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Xm-2.1/Makefile.am.orig Sun Nov 19 08:06:40 2000 ++++ lib/Xm-2.1/Makefile.am +@@ -88,10 +88,13 @@ + # + # Install headers + # +-# Lets put the headers in a sub directory to avoid +-# poluting /usr/local with more directories for default installs. ++# Let's put the headers in a sub directory if not a default install. + # ++if DefaultVersion21 ++libdir = $(prefix)/lib ++else + libdir = $(prefix)/LessTif/Motif2.1/lib ++endif + + lib_LTLIBRARIES= libXm.la + +@@ -114,24 +117,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..20039752e79 --- /dev/null +++ b/x11/lesstif/patches/patch-bl @@ -0,0 +1,27 @@ +$NetBSD: patch-bl,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/Xm/Makefile.am.orig Sun Oct 8 02:02:21 2000 ++++ lib/Xm/Makefile.am +@@ -56,22 +56,3 @@ + libXm_la_SOURCES= $(src) $(XDND_SRCS) + + endif +-install-data-hook: +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.1* +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.la +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so +- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(prefix)/lib/libXm.a +- (cd $(DESTDIR)$(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 new file mode 100644 index 00000000000..e823852021a --- /dev/null +++ b/x11/lesstif/patches/patch-bm @@ -0,0 +1,17 @@ +$NetBSD: patch-bm,v 1.1 2000/12/22 17:26:21 jlam Exp $ + +--- lib/config/Makefile.am.orig Wed Aug 30 09:45:04 2000 ++++ lib/config/Makefile.am +@@ -6,10 +6,10 @@ + + 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 diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn new file mode 100644 index 00000000000..6b9cc3cdb62 --- /dev/null +++ b/x11/lesstif/patches/patch-bn @@ -0,0 +1,16 @@ +$NetBSD: patch-bn,v 1.1 2000/12/22 17:26:22 jlam Exp $ + +--- scripts/autoconf/Makefile.am.orig Sun Sep 12 07:13:53 1999 ++++ scripts/autoconf/Makefile.am +@@ -5,10 +5,6 @@ + + EXTRA_DIST= ac_find_motif.m4 + +-aclocaldir = @ACLOCALDIR@ +- +-if Aclocal ++aclocaldir = ${prefix}/share/aclocal + + aclocal_DATA = ac_find_motif.m4 +- +-endif diff --git a/x11/lesstif/pkg/DEINSTALL b/x11/lesstif/pkg/DEINSTALL index 072dd4eec1e..e267f532553 100644 --- a/x11/lesstif/pkg/DEINSTALL +++ b/x11/lesstif/pkg/DEINSTALL @@ -1,29 +1,38 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2000/10/23 19:45:23 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2000/12/22 17:26:22 jlam Exp $ PKGNAME=$1 STAGE=$2 +LOCALBASE="@LOCALBASE@" + +CP="@CP@" +GREP="@GREP@" +RM="@RM@" +RMDIR="@RMDIR@" +TRUE="@TRUE@" + case ${STAGE} in DEINSTALL) ;; + POST-DEINSTALL) - LOCALBASE=@LOCALBASE@ X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def echo -n "Updating ${X11_HOSTDEF}..." - cp -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak - ( grep -v LessTif ${X11_HOSTDEF}.bak || true ) \ + ${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak + ( ${GREP} -v LessTif ${X11_HOSTDEF}.bak || ${TRUE} ) \ > ${X11_HOSTDEF} echo "done." if [ ${PKG_PREFIX} != ${LOCALBASE} ] then - rm -f ${LOCALBASE}/share/aclocal/ac_find_motif.m4 - rmdir -p ${PKG_PREFIX}/share/aclocal 2>/dev/null || true + ${RM} -f ${LOCALBASE}/share/aclocal/ac_find_motif.m4 + ${RMDIR} -p ${PKG_PREFIX}/share/aclocal 2>/dev/null || ${TRUE} fi ;; + *) echo "Unexpected argument: ${STAGE}" exit 1 diff --git a/x11/lesstif/pkg/INSTALL b/x11/lesstif/pkg/INSTALL index bed2b5a712e..81b32b15815 100644 --- a/x11/lesstif/pkg/INSTALL +++ b/x11/lesstif/pkg/INSTALL @@ -1,29 +1,37 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/10/23 19:45:24 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2000/12/22 17:26:22 jlam Exp $ PKGNAME=$1 STAGE=$2 +LOCALBASE="@LOCALBASE@" + +CP="@CP@" +GREP="@GREP@" +LN="@LN@" + case ${STAGE} in PRE-INSTALL) ;; + POST-INSTALL) - LOCALBASE=@LOCALBASE@ X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def echo -n "Updating ${X11_HOSTDEF}..." - cp -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak - ( grep -v LessTif ${X11_HOSTDEF}.bak; echo '#include <LessTif.def>' ) \ + ${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak + ( ${GREP} -v LessTif ${X11_HOSTDEF}.bak; \ + echo '#include <LessTif.def>' ) \ > ${X11_HOSTDEF} echo "done." if [ ${PKG_PREFIX} != ${LOCALBASE} ] then - ln -fs ${PKG_PREFIX}/share/aclocal/ac_find_motif.m4 \ + ${LN} -fs ${PKG_PREFIX}/share/aclocal/ac_find_motif.m4 \ ${LOCALBASE}/share/aclocal/ac_find_motif.m4 fi ;; + *) echo "Unexpected argument: ${STAGE}" exit 1 diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 8257d6f20d7..6a1b953e927 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2000/10/23 19:45:24 jlam Exp $ +@comment $NetBSD: PLIST,v 1.28 2000/12/22 17:26:22 jlam Exp $ bin/mwm bin/mxmkmf bin/uil @@ -25,6 +25,7 @@ include/Xm/CascadeB.h include/Xm/CascadeBG.h include/Xm/CascadeBGP.h include/Xm/CascadeBP.h +include/Xm/ColorObjP.h include/Xm/ComboBox.h include/Xm/ComboBoxP.h include/Xm/Command.h @@ -39,6 +40,7 @@ include/Xm/DesktopP.h include/Xm/DialogS.h include/Xm/DialogSEP.h include/Xm/DialogSP.h +include/Xm/DialogSavvyT.h include/Xm/Display.h include/Xm/DisplayP.h include/Xm/DragC.h @@ -70,6 +72,7 @@ include/Xm/GrabShell.h include/Xm/GrabShellP.h include/Xm/IconG.h include/Xm/IconGP.h +include/Xm/JoinSideT.h include/Xm/Label.h include/Xm/LabelG.h include/Xm/LabelGP.h @@ -125,6 +128,7 @@ include/Xm/ShellEP.h include/Xm/SpecRenderT.h include/Xm/SpinB.h include/Xm/SpinBP.h +include/Xm/TakesDefT.h include/Xm/TearOffBP.h include/Xm/TearOffP.h include/Xm/Text.h @@ -143,7 +147,9 @@ include/Xm/ToggleBP.h include/Xm/TraitP.h include/Xm/Transfer.h include/Xm/TransferP.h +include/Xm/TransferT.h include/Xm/TransltnsP.h +include/Xm/TxtPropCv.h include/Xm/VaSimpleP.h include/Xm/VendorS.h include/Xm/VendorSEP.h @@ -153,11 +159,16 @@ include/Xm/VirtKeysP.h include/Xm/WorldP.h include/Xm/Xm.h include/Xm/XmAll.h +include/Xm/XmIm.h include/Xm/XmP.h include/Xm/XmStrDefs.h include/Xm/XmosP.h -include/Xm/Xpm.h include/Xm/XpmP.h +include/uil/Uil.h +include/uil/UilDBDef.h +include/uil/UilDef.h +include/uil/UilSymDef.h +include/uil/UilSymGl.h lib/X11/app-defaults/Mwm lib/X11/config/LessTif.def lib/X11/config/LessTif.rules @@ -168,11 +179,15 @@ lib/X11/mwm/system.mwmrc lib/libMrm.a lib/libMrm.la lib/libMrm.so.2.0 +lib/libUil.a +lib/libUil.la +lib/libUil.so.2.0 lib/libXm.a lib/libXm.la lib/libXm.so.2.0 man/man1/lesstif.1 man/man1/mwm.1 +man/man1/uil.1 man/man1/xbae.1 man/man1/xlt.1 man/man1/xmbind.1 @@ -244,11 +259,67 @@ share/doc/html/lesstif/Form.txt share/doc/html/lesstif/GeoUtils.txt share/doc/html/lesstif/Geometry.html share/doc/html/lesstif/INSTALL.html +share/doc/html/lesstif/LessTifInternals.html share/doc/html/lesstif/SyntheticResources.txt share/doc/html/lesstif/UIL.txt 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 +share/doc/html/lesstif/XmCascadeButton.html +share/doc/html/lesstif/XmCascadeButtonGadget.html +share/doc/html/lesstif/XmClipboard.html +share/doc/html/lesstif/XmComboBox.html +share/doc/html/lesstif/XmCommand.html +share/doc/html/lesstif/XmDesktop.html +share/doc/html/lesstif/XmDialogShell.html +share/doc/html/lesstif/XmDialogShellExt.html +share/doc/html/lesstif/XmDisplay.html +share/doc/html/lesstif/XmDragContext.html +share/doc/html/lesstif/XmDragIcon.html +share/doc/html/lesstif/XmDragOverShell.html +share/doc/html/lesstif/XmDrawingArea.html +share/doc/html/lesstif/XmDrawnButton.html +share/doc/html/lesstif/XmDropSiteManager.html +share/doc/html/lesstif/XmDropTransfer.html +share/doc/html/lesstif/XmFileSelectionBox.html +share/doc/html/lesstif/XmForm.html +share/doc/html/lesstif/XmFrame.html +share/doc/html/lesstif/XmGadget.html +share/doc/html/lesstif/XmGrabShell.html +share/doc/html/lesstif/XmIconGadget.html +share/doc/html/lesstif/XmLabel.html +share/doc/html/lesstif/XmLabelGadget.html +share/doc/html/lesstif/XmList.html +share/doc/html/lesstif/XmMainWindow.html +share/doc/html/lesstif/XmManager.html +share/doc/html/lesstif/XmMenuShell.html +share/doc/html/lesstif/XmMessageBox.html +share/doc/html/lesstif/XmNotebook.html +share/doc/html/lesstif/XmPanedWindow.html +share/doc/html/lesstif/XmPrimitive.html +share/doc/html/lesstif/XmProtocol.html +share/doc/html/lesstif/XmPushButton.html +share/doc/html/lesstif/XmPushButtonGadget.html +share/doc/html/lesstif/XmRowColumn.html +share/doc/html/lesstif/XmSash.html +share/doc/html/lesstif/XmScale.html +share/doc/html/lesstif/XmScreen.html +share/doc/html/lesstif/XmScrollBar.html +share/doc/html/lesstif/XmScrolledWindow.html +share/doc/html/lesstif/XmSelectionBox.html +share/doc/html/lesstif/XmSeparator.html +share/doc/html/lesstif/XmSeparatorGadget.html +share/doc/html/lesstif/XmSpinBox.html share/doc/html/lesstif/XmStrings.txt +share/doc/html/lesstif/XmTearOffButton.html +share/doc/html/lesstif/XmText.html +share/doc/html/lesstif/XmTextField.html +share/doc/html/lesstif/XmToggleButton.html +share/doc/html/lesstif/XmToggleButtonGadget.html +share/doc/html/lesstif/XmVendorShell.html +share/doc/html/lesstif/XmWorld.html share/doc/html/lesstif/apps.html share/doc/html/lesstif/bugs.html share/doc/html/lesstif/cdrom.html @@ -271,9 +342,12 @@ share/doc/html/lesstif/images/vh40.jpg share/doc/html/lesstif/images/vh40.png share/doc/html/lesstif/index.html share/doc/html/lesstif/known.html +share/doc/html/lesstif/lesstif.html share/doc/html/lesstif/links.html share/doc/html/lesstif/lists.html share/doc/html/lesstif/mirrors.html +share/doc/html/lesstif/mwm.html +share/doc/html/lesstif/mwmrc.html share/doc/html/lesstif/platforms.html share/doc/html/lesstif/release-notes.html share/doc/html/lesstif/release-policy.html @@ -281,8 +355,12 @@ share/doc/html/lesstif/test_policy.html share/doc/html/lesstif/test_summary.html share/doc/html/lesstif/testers.html share/doc/html/lesstif/thread.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 share/doc/lesstif/COPYING @@ -291,14 +369,13 @@ share/doc/lesstif/CREDITS share/doc/lesstif/FAQ share/doc/lesstif/Install share/doc/lesstif/KNOWN_BUGS -share/doc/lesstif/NEWS share/doc/lesstif/README share/doc/lesstif/RELEASE-POLICY -share/doc/lesstif/TODO share/doc/lesstif/release-notes.txt @dirrm share/doc/lesstif @dirrm share/doc/html/lesstif/images @dirrm share/doc/html/lesstif @dirrm lib/X11/mwm +@dirrm include/uil @dirrm include/Xm @dirrm include/Mrm |