Update to lesstif 0.83.

10 files changed, 137 insertions, 88 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 2d3fdb0c896..52276a958e3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,27 +1,30 @@
 # New ports collection makefile for:	lesstif
-# Version required:	0.82
+# Version required:	0.83
 # Date created:		December 10, 1996
 # Whom:			1wardd@airmail.net
 #
-# $NetBSD: Makefile,v 1.9 1998/02/11 10:22:26 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/03/23 12:35:51 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
-DISTNAME=	lesstif-0.82
+DISTNAME=	lesstif-0.83
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.lesstif.org/pub/hungry/lesstif/  \
 		ftp://ftp.hungry.com/pub/hungry/lesstif/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=  yes
 USE_X11=	yes
 # change this and remove the strip statement in post-install for debugging
-CONFIGURE_ENV=	CCFLAGS="-O -pipe"
+CONFIGURE_ENV=	CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 # this is worst case, when you're about to overwrite real Motif with Lesstif
 IS_INTERACTIVE=	yes
 
+MAN1=		mwm.1
+MAN5=		mwmrc.5
+
 pre-fetch:
 	@if [ -d ${X11BASE}/include/Xm ]; then \
 		if [ -d ${X11BASE}/lib/X11/lesstif ]; then \
@@ -47,12 +50,6 @@ pre-fetch:
 	fi
 
 post-install:
-	${MKDIR} ${PREFIX}/lib/X11/mwm ${PREFIX}/lib/X11/app-defaults
-	${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/system.mwmrc \
-		${PREFIX}/lib/X11/mwm
-	${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/alt.map ${PREFIX}/lib/X11/mwm
-	${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/Mwm \
-		${PREFIX}/lib/X11/app-defaults/Mwm
 	${LDCONFIG} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index 86cbceef168..8b09af399f5 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1 +1 @@
-MD5 (lesstif-0.82.tar.gz) = c612c843030c622fea626a73de340dd0
+MD5 (lesstif-0.83.tar.gz) = e82ef9e2592aecd201546fa000ef9a75
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index a84e808cd35..4a50dbdbd8f 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,29 +1,11 @@
---- configure.orig	Wed Nov 19 23:32:40 1997
-+++ configure	Wed Jan 28 15:07:07 1998
-@@ -977,7 +977,7 @@
- 
- 
- include_subdirs="Motif$include_version_suffix"
--lib_subdirs="Xm$version_suffix Mrm$version_suffix config"
-+lib_subdirs="Xm$version_suffix Uil$version_suffix Mrm$version_suffix config"
- lib_cleandirs="Xm$version_suffix Uil$version_suffix Mrm$version_suffix config"
- client_subdirs="Motif-1.2"
- client_cleandirs="Motif-1.2"
-@@ -2672,7 +2672,7 @@
- 
- 
- major_shared=0
--minor_shared=82
-+minor_shared=1
- pico_version=
- 
- 
-@@ -2708,7 +2708,7 @@
+--- configure.orig	Sat Mar 14 16:50:38 1998
++++ configure	Sun Mar 22 22:59:29 1998
+@@ -3946,7 +3946,7 @@
  
  lexicographic_readdir=1
  
--CFLAGS="$debug_flag $verbose_flag $production_flag"
-+CFLAGS="$CCFLAGS $verbose_flag $production_flag"
+-CFLAGS="$debug_flag $conversions_flag $verbose_flag $production_flag"
++CFLAGS="$CCFLAGS $conversions_flag $verbose_flag $production_flag"
  GPROF_FLAGS="-pg"
  GPROF_CFLAGS=""
  EXTRACFLAGS=""
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
index 86ed5b31574..944ff461e21 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,24 +1,11 @@
---- lib/config/Makefile.in.orig	Fri Sep  5 19:42:19 1997
-+++ lib/config/Makefile.in	Sat Nov  1 16:52:46 1997
-@@ -28,7 +28,7 @@
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- 
--x_config_path=@libdir@/config
-+x_config_path=@prefix@/lib/X11/lesstif
- 
- STUFF=	Motif.tmpl Motif.rules Imake.tmpl
- 
-@@ -49,10 +49,10 @@
- install: $(STUFF)
- 	-mkdir -p ${x_config_path}
- 	for i in ${STUFF} ; do \
--	  ${INSTALL_PROGRAM} $$i ${x_config_path} ; \
-+	  ${BSD_INSTALL_DATA} $$i ${x_config_path} ; \
- 	done
- 	-mkdir -p ${bin_dir}
--	${INSTALL_PROGRAM} mxmkmf ${bin_dir}
-+	${BSD_INSTALL_SCRIPT} mxmkmf ${bin_dir}
- 
- install-list:
- 	for i in ${STUFF} ; do \
+--- lib/config/Makefile.in-orig	Sun Mar 22 19:46:26 1998
++++ lib/config/Makefile.in	Sun Mar 22 19:45:27 1998
+@@ -97,7 +97,7 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ bin_SCRIPTS=	mxmkmf
+ 
+-configdir=	$(libdir)/X11/config
++configdir=	$(libdir)/X11/lesstif
+ config_DATA=	Imake.tmpl Motif.rules Motif.tmpl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index f76a346f4bb..828aab0f09f 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,18 +1,11 @@
---- config/free_net-bsd-shared.mk.orig	Wed Nov 19 16:21:24 1997
-+++ config/free_net-bsd-shared.mk	Thu Nov 27 16:01:50 1997
-@@ -26,15 +26,10 @@
+--- doc/Makefile.in-orig	Sat Mar 14 16:50:01 1998
++++ doc/Makefile.in	Sun Mar 22 22:33:30 1998
+@@ -98,7 +98,7 @@
  
- ${SHARED_LIB}: $(SH_OBJS)
- 	ld -Bshareable -o ${SHARED_LIB} ${SH_OBJS}
--	chmod a+x ${SHARED_LIB}
--	rm -f lib${lib_name}.so
--	ln -s ${SHARED_LIB} lib${lib_name}.so
+ SUBDIRS	= www.lesstif.org lessdox
  
- install:: ${SHARED_LIB}
- 	mkdir -p ${lib_dir}
- 	${INSTALL_DATA} ${SHARED_LIB} ${lib_dir}
--	rm -f ${lib_dir}/lib${lib_name}.so
--	ln -s ${lib_dir}/${SHARED_LIB} ${lib_dir}/lib${lib_name}.so
- 
- install-list::
- 	echo ${lib_dir}/${SHARED_LIB}
+-rootdir=	$(exec_prefix)/LessTif/doc
++rootdir=	$(exec_prefix)/share/lesstif/doc
+ root_DATA=	INSTALL.html
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
index bdb6ce57158..06bc4d6b0b0 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,11 +1,26 @@
---- clients/Motif-1.2/mwm/Makefile.in.orig	Wed Nov 19 16:20:11 1997
-+++ clients/Motif-1.2/mwm/Makefile.in	Thu Nov 27 16:06:36 1997
-@@ -93,7 +93,7 @@
+--- doc/lessdox/clients/Makefile.in-orig	Sat Mar 14 16:50:03 1998
++++ doc/lessdox/clients/Makefile.in	Sun Mar 22 22:49:04 1998
+@@ -96,10 +96,10 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ SUFFIXES=	.1 .3 .5 .html
  
- mwmlex.o: y.tab.h
+-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
++mandir=		$(exec_prefix)/man
++man1dir=	$(mandir)/man1
++man3dir=	$(mandir)/man3
++man5dir=	$(mandir)/man5
  
--$(srcdir)/version.h: Makefile
-+version.h $(srcdir)/version.h: Makefile
- 	echo "#define VERSION \"@major_shared@.@minor_shared@\"" \
- 		> $(srcdir)/version.h
+ man1_DATA=	mwm.1
+ man3_DATA=
+@@ -114,7 +114,7 @@
+ # build them.
+ #
  
+-htmldir=	$(exec_prefix)/LessTif/doc/html
++htmldir=	$(exec_prefix)/share/lesstif/doc/clients
+ html_DATA=	mwm.html mwmrc.html xmbind.html
+ 
+ @HaveMan2html_TRUE@man1_HTML=	${man1_DATA:.1=.html}
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
new file mode 100644
index 00000000000..8f28a30b3da
--- /dev/null
+++ b/x11/lesstif/patches/patch-af
@@ -0,0 +1,11 @@
+--- doc/www.lesstif.org/Makefile.in-orig	Sat Mar 14 16:50:02 1998
++++ doc/www.lesstif.org/Makefile.in	Mon Mar 23 12:08:07 1998
+@@ -103,7 +103,7 @@
+ # Lets put the informational stuff in a sub directory to avoid 
+ # poluting /usr/local for default installs.
+ #
+-rootdir=	$(exec_prefix)/LessTif/doc
++rootdir=	$(exec_prefix)/share/lesstif/doc
+ root_DATA=	COPYING.LIB.html FAQ.html agenda.html bug-reporting.html \
+ 		core.html current.html download.html get.html \
+ 		lesstif.html links.html mailing-lists.html \
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
new file mode 100644
index 00000000000..562cdae565a
--- /dev/null
+++ b/x11/lesstif/patches/patch-ag
@@ -0,0 +1,11 @@
+--- Makefile.in-orig	Sat Mar 14 16:49:51 1998
++++ Makefile.in	Mon Mar 23 12:15:38 1998
+@@ -103,7 +103,7 @@
+ # Lets put the informational stuff in a sub directory to avoid 
+ # poluting /usr/local for default installs.
+ #
+-rootdir=	$(exec_prefix)/LessTif
++rootdir=	$(exec_prefix)/share/lesstif
+ root_DATA=	AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
+ 	INSTALL KNOWN_BUGS NEWS README RELEASE-POLICY TODO
+ 
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
new file mode 100644
index 00000000000..08e93044be4
--- /dev/null
+++ b/x11/lesstif/patches/patch-ah
@@ -0,0 +1,11 @@
+--- doc/www.lesstif.org/images/Makefile.in-orig	Sat Mar 14 16:50:02 1998
++++ doc/www.lesstif.org/images/Makefile.in	Mon Mar 23 12:48:24 1998
+@@ -102,7 +102,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=	$(exec_prefix)/share/lesstif/doc/images
+ root_DATA=	hungry.gif \
+ 		lesstif-realsmall.gif lesstif-small.gif lesstif.gif \
+ 		ltsunlogo.gif
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 9ec7162d19f..5752634542f 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1998/02/02 09:00:28 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/03/23 12:35:55 frueauf Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -127,18 +127,60 @@ include/Xm/XmP.h
 include/Xm/XmStrDefs.h
 include/Xm/XmosP.h
 lib/X11/app-defaults/Mwm
+lib/X11/mwm/README
 lib/X11/mwm/alt.map
 lib/X11/mwm/system.mwmrc
 lib/X11/lesstif/Imake.tmpl
 lib/X11/lesstif/Motif.rules
 lib/X11/lesstif/Motif.tmpl
-lib/libMrm.so.0.1
-lib/libUil.so.0.1
-lib/libXm.so.0.1
-lib/libltc.a
+lib/libXm.so.1.2
+lib/libXm.la
+lib/libMrm.so.1.2
+lib/libMrm.la
+share/lesstif/AUTHORS
+share/lesstif/BUG-REPORTING
+share/lesstif/COPYING
+share/lesstif/COPYING.LIB
+share/lesstif/CREDITS
+share/lesstif/INSTALL
+share/lesstif/KNOWN_BUGS
+share/lesstif/NEWS
+share/lesstif/README
+share/lesstif/RELEASE-POLICY
+share/lesstif/TODO
+share/lesstif/doc/COPYING.LIB.html
+share/lesstif/doc/FAQ.html
+share/lesstif/doc/INSTALL.html
+share/lesstif/doc/agenda.html
+share/lesstif/doc/bug-reporting.html
+share/lesstif/doc/core.html
+share/lesstif/doc/current.html
+share/lesstif/doc/download.html
+share/lesstif/doc/get.html
+share/lesstif/doc/clients/mwm.html
+share/lesstif/doc/clients/mwmrc.html
+share/lesstif/doc/clients/xmbind.html
+share/lesstif/doc/images/hungry.gif
+share/lesstif/doc/images/lesstif-realsmall.gif
+share/lesstif/doc/images/lesstif-small.gif
+share/lesstif/doc/images/lesstif.gif
+share/lesstif/doc/images/ltsunlogo.gif
+share/lesstif/doc/lesstif.html
+share/lesstif/doc/links.html
+share/lesstif/doc/mailing-lists.html
+share/lesstif/doc/platforms.html
+share/lesstif/doc/release-policy.html
+share/lesstif/doc/versions.html
+share/lesstif/doc/working.html
+man/man1/mwm.1
+man/man5/mwmrc.5
 @exec ldconfig || /usr/bin/true
 @unexec ldconfig || /usr/bin/true
 @dirrm lib/X11/mwm
 @dirrm lib/X11/lesstif
 @dirrm include/Xm
 @dirrm include/Mrm
+@dirrm share/lesstif/doc/images
+@dirrm share/lesstif/doc/clients
+@dirrm share/lesstif/doc
+@dirrm share/lesstif