1 files changed, 43 insertions, 25 deletions
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