From cee4348b3f97538421ce720167a4231a51614ad2 Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 30 Jun 2000 06:01:26 +0000 Subject: [PATCH] upgrade to LessTif 0.91.3 --- x11/lesstif/Makefile | 29 ++++--------------- x11/lesstif/files/md5 | 6 ++-- .../patches/{patch-af => patch-Makefile.in} | 8 ++--- x11/lesstif/patches/patch-aa | 11 ------- x11/lesstif/patches/patch-ak | 12 -------- x11/lesstif/patches/patch-configure | 11 +++++++ .../{patch-ah => patch-doc_Makefile.in} | 6 ++-- ... => patch-doc_lessdox_clients_Makefile.in} | 8 ++--- ...> patch-doc_lessdox_functions_Makefile.in} | 8 ++--- ... => patch-doc_lessdox_widgets_Makefile.in} | 10 +++---- ... => patch-doc_www.lesstif.org_Makefile.in} | 8 ++--- ...ch-doc_www.lesstif.org_images_Makefile.in} | 6 ++-- ...{patch-ab => patch-lib_config_Makefile.in} | 6 ++-- .../{patch-ac => patch-lib_config_mxmkmf.in} | 0 .../patches/{patch-ad => patch-ltmain.sh} | 6 ++-- 15 files changed, 52 insertions(+), 83 deletions(-) rename x11/lesstif/patches/{patch-af => patch-Makefile.in} (81%) delete mode 100644 x11/lesstif/patches/patch-aa delete mode 100644 x11/lesstif/patches/patch-ak create mode 100644 x11/lesstif/patches/patch-configure rename x11/lesstif/patches/{patch-ah => patch-doc_Makefile.in} (70%) rename x11/lesstif/patches/{patch-ai => patch-doc_lessdox_clients_Makefile.in} (80%) rename x11/lesstif/patches/{patch-al => patch-doc_lessdox_functions_Makefile.in} (77%) rename x11/lesstif/patches/{patch-ae => patch-doc_lessdox_widgets_Makefile.in} (85%) rename x11/lesstif/patches/{patch-aj => patch-doc_www.lesstif.org_Makefile.in} (79%) rename x11/lesstif/patches/{patch-ag => patch-doc_www.lesstif.org_images_Makefile.in} (67%) rename x11/lesstif/patches/{patch-ab => patch-lib_config_Makefile.in} (67%) rename x11/lesstif/patches/{patch-ac => patch-lib_config_mxmkmf.in} (100%) rename x11/lesstif/patches/{patch-ad => patch-ltmain.sh} (93%) diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index f7cb105bbd2..204132e1a1f 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.39 2000/06/20 01:24:44 brad Exp $ +# $OpenBSD: Makefile,v 1.40 2000/06/30 06:01:26 brad Exp $ # $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $ -DISTNAME= lesstif-0.91.0 +DISTNAME= lesstif-0.91.3 CATEGORIES= x11 NEED_VERSION= 1.301 -MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/obsolete/ \ - ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/obsolete/ \ - ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/obsolete/ +MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ + ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \ + ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ MAINTAINER= brad@openbsd.org @@ -44,23 +44,4 @@ pre-install: esac) .endif -STATIC_LIBS= libMrm.a libXm.a -SHARED_LIBS= libMrm.so.1.2 libXm.so.1.2 - -# link the 1.2 motif libraries from $(prefix)/LessTif/Motif1.2/lib -# to $(prefix)/lib (where OpenBSD looks for them) and then run -# ldconfig to update the library cache - -post-install: - @rm -f ${PREFIX}/lib/libMrm.so - @rm -f ${PREFIX}/lib/libXm.so -.for lib in ${STATIC_LIBS} - @ln -sf ${TRUEPREFIX}/LessTif/Motif1.2/lib/${lib} ${PREFIX}/lib -.endfor -.for lib in ${SHARED_LIBS} - @if [ "x${NO_SHARED_LIBS}" = "x" ]; then \ - ln -sf ${TRUEPREFIX}/LessTif/Motif1.2/lib/${lib} ${PREFIX}/lib; \ - fi -.endfor - .include diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5 index 1f0667640a7..f9597a9085d 100644 --- a/x11/lesstif/files/md5 +++ b/x11/lesstif/files/md5 @@ -1,3 +1,3 @@ -MD5 (lesstif-0.91.0.tar.gz) = 5c42293a1bd6de9661babb94a096d798 -RMD160 (lesstif-0.91.0.tar.gz) = 69bf439e6409541253e096ea29fa13e8223f52e5 -SHA1 (lesstif-0.91.0.tar.gz) = 83b266541a91e5b3e8ea0e3587dc1d3cae8454cf +MD5 (lesstif-0.91.3.tar.gz) = 56a9a10b2506950274348efff48423c0 +RMD160 (lesstif-0.91.3.tar.gz) = 5faa92e8c02dadb367229ae03c85a37ac205f243 +SHA1 (lesstif-0.91.3.tar.gz) = d09bcb40ed89bf33a0b4d5bc4e7aa6237e6e2eb1 diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-Makefile.in similarity index 81% rename from x11/lesstif/patches/patch-af rename to x11/lesstif/patches/patch-Makefile.in index f8db36af0e8..9ae04476631 100644 --- a/x11/lesstif/patches/patch-af +++ b/x11/lesstif/patches/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sun May 14 20:49:26 2000 -+++ Makefile.in Sat Jun 17 02:45:03 2000 -@@ -131,7 +131,7 @@ +--- Makefile.in.orig Sun Jun 25 12:37:47 2000 ++++ Makefile.in Thu Jun 29 22:41:07 2000 +@@ -127,7 +127,7 @@ # Lets put the informational stuff in a sub directory to avoid # poluting /usr/local for default installs. # @@ -9,7 +9,7 @@ root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt -@@ -140,7 +140,7 @@ +@@ -136,7 +136,7 @@ BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa deleted file mode 100644 index 113b1646952..00000000000 --- a/x11/lesstif/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Mon Jun 19 12:52:18 2000 -+++ configure Mon Jun 19 12:52:32 2000 -@@ -909,7 +909,7 @@ - - - --PACKAGE=lesstif -+PACKAGE=LessTif - - VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION - diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak deleted file mode 100644 index 66a3c22ed0d..00000000000 --- a/x11/lesstif/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/Makefile.in.orig Sun May 14 20:47:09 2000 -+++ lib/Makefile.in Sat Jun 17 02:49:53 2000 -@@ -121,9 +121,6 @@ - MAINTAINERCLEANFILES = Makefile.in - SUBDIRS = config \ - Xm Mrm Uil \ -- Xm-2.0 Mrm-2.0 Uil-2.0 \ -- Xm-2.1 Mrm-2.1 \ -- Xm-CDE Mrm-CDE \ - @BuildXltDir@ @BuildXbaeDir@ - - diff --git a/x11/lesstif/patches/patch-configure b/x11/lesstif/patches/patch-configure new file mode 100644 index 00000000000..40c17a65464 --- /dev/null +++ b/x11/lesstif/patches/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun Jun 25 12:38:21 2000 ++++ configure Thu Jun 29 22:39:03 2000 +@@ -783,7 +783,7 @@ + + + +-PACKAGE=lesstif ++PACKAGE=LessTif + + VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION + diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-doc_Makefile.in similarity index 70% rename from x11/lesstif/patches/patch-ah rename to x11/lesstif/patches/patch-doc_Makefile.in index b70c83401d7..207626e65e9 100644 --- a/x11/lesstif/patches/patch-ah +++ b/x11/lesstif/patches/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Sun May 14 20:47:14 2000 -+++ doc/Makefile.in Sat Jun 17 02:47:17 2000 -@@ -123,7 +123,7 @@ +--- doc/Makefile.in.orig Sun Jun 25 12:38:15 2000 ++++ doc/Makefile.in Thu Jun 29 22:41:51 2000 +@@ -119,7 +119,7 @@ SUBDIRS = www.lesstif.org lessdox diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-doc_lessdox_clients_Makefile.in similarity index 80% rename from x11/lesstif/patches/patch-ai rename to x11/lesstif/patches/patch-doc_lessdox_clients_Makefile.in index d1606bd7ec2..cabac7c2dae 100644 --- a/x11/lesstif/patches/patch-ai +++ b/x11/lesstif/patches/patch-doc_lessdox_clients_Makefile.in @@ -1,6 +1,6 @@ ---- doc/lessdox/clients/Makefile.in.orig Sun May 14 20:47:15 2000 -+++ doc/lessdox/clients/Makefile.in Sat Jun 17 02:47:48 2000 -@@ -121,12 +121,12 @@ +--- doc/lessdox/clients/Makefile.in.orig Sun Jun 25 12:38:17 2000 ++++ doc/lessdox/clients/Makefile.in Thu Jun 29 22:42:16 2000 +@@ -117,12 +117,12 @@ EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) SUFFIXES = .1 .3 .5 .html @@ -18,7 +18,7 @@ man3_DATA = man5_DATA = mwmrc.5 -@@ -139,7 +139,7 @@ +@@ -135,7 +135,7 @@ # build them. # diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-doc_lessdox_functions_Makefile.in similarity index 77% rename from x11/lesstif/patches/patch-al rename to x11/lesstif/patches/patch-doc_lessdox_functions_Makefile.in index 4e9ac166aa5..ee46124a586 100644 --- a/x11/lesstif/patches/patch-al +++ b/x11/lesstif/patches/patch-doc_lessdox_functions_Makefile.in @@ -1,6 +1,6 @@ ---- doc/lessdox/functions/Makefile.in.orig Sun May 14 20:47:15 2000 -+++ doc/lessdox/functions/Makefile.in Sat Jun 17 02:50:22 2000 -@@ -121,10 +121,10 @@ +--- doc/lessdox/functions/Makefile.in.orig Sun Jun 25 12:38:18 2000 ++++ doc/lessdox/functions/Makefile.in Thu Jun 29 22:43:43 2000 +@@ -117,10 +117,10 @@ EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) SUFFIXES = .1 .3 .5 .html @@ -15,7 +15,7 @@ man1_DATA = man3_DATA = -@@ -139,7 +139,7 @@ +@@ -135,7 +135,7 @@ # build them. # diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-doc_lessdox_widgets_Makefile.in similarity index 85% rename from x11/lesstif/patches/patch-ae rename to x11/lesstif/patches/patch-doc_lessdox_widgets_Makefile.in index 319743b1524..1aa218efdd8 100644 --- a/x11/lesstif/patches/patch-ae +++ b/x11/lesstif/patches/patch-doc_lessdox_widgets_Makefile.in @@ -1,6 +1,6 @@ ---- doc/lessdox/widgets/Makefile.in.orig Sun May 14 20:47:15 2000 -+++ doc/lessdox/widgets/Makefile.in Sat Jun 17 02:42:39 2000 -@@ -121,10 +121,10 @@ +--- doc/lessdox/widgets/Makefile.in.orig Sun Jun 25 12:38:18 2000 ++++ doc/lessdox/widgets/Makefile.in Thu Jun 29 22:40:47 2000 +@@ -117,10 +117,10 @@ EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) SUFFIXES = .1 .3 .5 .html @@ -15,7 +15,7 @@ man1_DATA = man3_DATA = \ -@@ -170,7 +170,7 @@ +@@ -166,7 +166,7 @@ # build them. # @@ -24,7 +24,7 @@ @HaveMan2html_TRUE@html_DATA = \ @HaveMan2html_TRUE@${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ -@@ -384,7 +384,7 @@ +@@ -381,7 +381,7 @@ # in both the http://www.lesstif.org and the locally installed case. # install-data-hook: diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-doc_www.lesstif.org_Makefile.in similarity index 79% rename from x11/lesstif/patches/patch-aj rename to x11/lesstif/patches/patch-doc_www.lesstif.org_Makefile.in index 3f585cdff0e..7c69e6a393e 100644 --- a/x11/lesstif/patches/patch-aj +++ b/x11/lesstif/patches/patch-doc_www.lesstif.org_Makefile.in @@ -1,6 +1,6 @@ ---- doc/www.lesstif.org/Makefile.in.orig Sun May 14 20:47:15 2000 -+++ doc/www.lesstif.org/Makefile.in Mon Jun 19 03:36:19 2000 -@@ -128,7 +128,7 @@ +--- doc/www.lesstif.org/Makefile.in.orig Sun Jun 25 12:38:15 2000 ++++ doc/www.lesstif.org/Makefile.in Thu Jun 29 22:42:41 2000 +@@ -124,7 +124,7 @@ # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # @@ -9,7 +9,7 @@ doc_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 \ -@@ -138,10 +138,10 @@ +@@ -134,10 +134,10 @@ Advocacy.html Xbae.html Xlt.html diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-doc_www.lesstif.org_images_Makefile.in similarity index 67% rename from x11/lesstif/patches/patch-ag rename to x11/lesstif/patches/patch-doc_www.lesstif.org_images_Makefile.in index 7d74c02f676..2835bd37114 100644 --- a/x11/lesstif/patches/patch-ag +++ b/x11/lesstif/patches/patch-doc_www.lesstif.org_images_Makefile.in @@ -1,6 +1,6 @@ ---- doc/www.lesstif.org/images/Makefile.in.orig Sun May 14 20:47:15 2000 -+++ doc/www.lesstif.org/images/Makefile.in Sat Jun 17 02:45:37 2000 -@@ -127,7 +127,7 @@ +--- doc/www.lesstif.org/images/Makefile.in.orig Sun Jun 25 12:38:16 2000 ++++ doc/www.lesstif.org/images/Makefile.in Thu Jun 29 22:41:30 2000 +@@ -123,7 +123,7 @@ # Lets put the informational stuff in a sub directory to avoid # poluting /usr/local for default installs. # diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-lib_config_Makefile.in similarity index 67% rename from x11/lesstif/patches/patch-ab rename to x11/lesstif/patches/patch-lib_config_Makefile.in index 5210cfc14c7..1b3d9931f73 100644 --- a/x11/lesstif/patches/patch-ab +++ b/x11/lesstif/patches/patch-lib_config_Makefile.in @@ -1,6 +1,6 @@ ---- lib/config/Makefile.in.orig Sun May 14 20:47:09 2000 -+++ lib/config/Makefile.in Sat Jun 17 02:41:05 2000 -@@ -121,7 +121,7 @@ +--- lib/config/Makefile.in.orig Sun Jun 25 12:37:48 2000 ++++ lib/config/Makefile.in Thu Jun 29 22:39:27 2000 +@@ -117,7 +117,7 @@ MAINTAINERCLEANFILES = Makefile.in bin_SCRIPTS = mxmkmf diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-lib_config_mxmkmf.in similarity index 100% rename from x11/lesstif/patches/patch-ac rename to x11/lesstif/patches/patch-lib_config_mxmkmf.in diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ltmain.sh similarity index 93% rename from x11/lesstif/patches/patch-ad rename to x11/lesstif/patches/patch-ltmain.sh index 76cbe90a7bd..84044b4a496 100644 --- a/x11/lesstif/patches/patch-ad +++ b/x11/lesstif/patches/patch-ltmain.sh @@ -1,6 +1,6 @@ ---- ltmain.sh.orig Thu Dec 9 18:49:04 1999 -+++ ltmain.sh Sat Jun 17 02:42:06 2000 -@@ -4292,40 +4292,6 @@ +--- ltmain.sh.orig Wed Jul 7 16:30:58 1999 ++++ ltmain.sh Thu Jun 29 22:40:19 2000 +@@ -3522,40 +3522,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0