Fix OpenMotif package to not overwrite X11R6 files when installed without

xpkgwedge.  Also, OpenMotif can actually be installed into ${LOCALBASE}
if xpkgwedge is installed.  Use x11.buildlink.mk and mark as
USE_BUILDLINK_ONLY, and add a buildlink.mk file for use by other package
Makefiles.

23 files changed, 542 insertions, 259 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 2c11b2caa99..2846cd69493 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/08 20:03:43 jlam Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -6,56 +6,118 @@ PKGVER=		2.1.30
 DISTNAME=	openmotif${PKGVER}
 PKGNAME=	openmotif-${PKGVER}
 CATEGORIES=	x11
-MASTER_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/tars/ \
-		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/tars/ \
-		ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PKGVER}/tars/
+MOTIF_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \
+		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \
+		ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PKGVER}/
+MASTER_SITES=	${MOTIF_SITES:=tars/}
 
-PATCH_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/fixes/ \
-		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/fixes/ \
-		ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PKGVER}/fixes/
-PATCHFILES=	patch1 patch2 patch3 patch4 patch5
-PATCH_DIST_STRIP=-p1
+PATCH_SITES=		${MOTIF_SITES:=fixes/}
+PATCHFILES=		patch1 patch2 patch3 patch4 patch5
+PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.opengroup.org/openmotif/
-COMMENT=	Open Motif
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.opengroup.org/openmotif/
+COMMENT=		Open Motif
 
-BROKEN=		"package overwrites and then deletes base system files (makedepend, host.def, etc)"
+CONFLICTS+=		lesstif-*
 
-CONFLICTS+=	lesstif-*
-DIST_SUBDIR=	openmotif
-WRKSRC=		${WRKDIR}/motif
-USE_X11BASE=	yes
-ALL_TARGET=	World
+DIST_SUBDIR=		openmotif
+WRKSRC=			${WRKDIR}/motif
+USE_X11BASE=		# defined
+USE_BUILDLINK_ONLY=	# defined
+ALL_TARGET=		World
 
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
+
+FILES_SUBST=		X11BASE=${X11BASE}
+FILES_SUBST+=		CP=${CP:Q}
+FILES_SUBST+=		ECHO=${ECHO:Q}
+FILES_SUBST+=		GREP=${GREP:Q}
+FILES_SUBST+=		LN=${LN:Q}
+FILES_SUBST+=		MV=${MV:Q}
+FILES_SUBST+=		RM=${RM:Q}
+FILES_SUBST+=		RMDIR=${RMDIR:Q}
+FILES_SUBST+=		TRUE=${TRUE:Q}
+FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+
+post-extract:
+	${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules
+	${CP} ${FILESDIR}/OpenMotif.def ${WRKSRC}/config/cf/Motif.def
+
+# 1) Fix the man pages to refer to the correct sections.
+# 2) Link Motif.* to OpenMotif.*.
+# 3) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
+#    avoid manpage conflicts with other packages.
+#
 post-patch:
-# fix sections
-	cd ${WRKSRC}/doc/man; for n in man1/*.1 man3/*.3 man4/*.4 man5/*.5 ; \
-		do ${SED} 's/user cmd/1/g; s/library call/3/g; s/special file/5/g; s/file formats/5/g;' $$n >$$n.new && ${MV} -f $$n.new $$n; done
-	${CP} -f ${WRKSRC}/doc/man/man4/mwmrc.4 ${WRKSRC}/doc/man/man5/mwmrc.5
-	cd ${WRKSRC}/config/cf && \
-	    for n in site.def Motif.tmpl host.def ; \
-		do ${SED} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%X11BASE%%|${X11BASE}|g' $$n > $$n.new && ${MV} -f $$n.new $$n ; \
-	    done
+	cd ${WRKSRC}/doc/man;						\
+	for file in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do		\
+		${SED}	-e "s|user cmd|1|g"				\
+			-e "s|library call|3|g"				\
+			-e "s|special file|5|g"				\
+			-e "s|file formats|5|g"				\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done;								\
+	${CP} -f man4/mwmrc.4 man5/mwmrc.5
+	cd ${WRKSRC}/config/cf;						\
+	files="Motif.rules Motif.tmpl";					\
+	for file in $${files}; do					\
+		dest="Open$${file}";					\
+		${RM} -f $${dest};					\
+		${LN} -s $${file} $${dest};				\
+	done
+	cd ${WRKSRC}/doc/man/man3;					\
+	for name in Core Object Shell; do                               \
+		${MV} -f $${name}.3 X$${name}.3;			\
+		files=`${GREP} -l ".fB$${name}.fP(3)" *.3`;		\
+		for file in $${files}; do				\
+			${MV} -f $${file} $${file}.presubst;		\
+			${SED} "s|\(.fB\)$${name}\(.fP(3)\)|\1X$${name}\2|g" \
+				$${file}.presubst > $${file};		\
+			${RM} -f $${file}.presubst;			\
+		done;							\
+	done
 
+# Link the appropriate directories since we're building OpenMotif outside
+# of the X11R6 source tree.
+#
 do-configure:
-	${CP} -f `ls ${X11BASE}/lib/X11/config/* | ${GREP} -v '\(Motif\|cde\|\/site.def\|host.def\)'` ${WRKDIR}/motif/config/cf
 	${MKDIR} ${WRKSRC}/imports/x11
-	cd ${WRKSRC}/imports/x11 && for i in bin include lib ; do \
-	    if [ -f $$i ] ; then ${RM} $$i; fi; \
-	    ${LN} -s ${X11BASE}/$$i $$i; \
+	cd ${WRKSRC}/imports/x11; for dir in bin include lib; do	\
+		if [ -e $${dir} ]; then					\
+			${RM} $${dir};					\
+		fi;							\
+		${LN} -s ${BUILDLINK_X11_DIR}/$${dir} $${dir};		\
 	done
 
-# tblize the manpages.
+# Filter the manpages through tbl.
 post-build:
-	for i in man1 man3 man5 ; do cd ${WRKSRC}/doc/man/$$i; \
-		for m in *.[135]; do tbl $$m > $$m.new && ${MV} -f $$m.new $$m; done; \
+	cd ${WRKSRC}/doc/man;						\
+	for file in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do		\
+                tbl $${file} > $${file}.tblized;			\
+		${MV} -f $${file}.tblized $${file};			\
 	done
 
-# Install the manpages.
+pre-install:
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
+
+# Install the OpenMotif config files and manpages.
 post-install:
-	for i in man1 man3 man5 ; do cd ${WRKSRC}/doc/man/$$i; \
-	    for m in *.[135]; do ${INSTALL_MAN} $$m ${PREFIX}/man/$$i; done; \
+	cd ${WRKSRC}/config/cf;						\
+	files="Motif.def Motif.rules Motif.tmpl";			\
+	for file in $${files}; do					\
+		dest="${PREFIX}/lib/X11/config/Open$${file}";		\
+		${INSTALL_DATA} $${file} $${dest};			\
 	done
+	cd ${WRKSRC}/doc/man;						\
+	for file in man1/*.1 man3/*.3 man5/*.5; do			\
+		${INSTALL_MAN} $${file} ${PREFIX}/man/$${file};		\
+        done
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/buildlink.mk b/x11/openmotif/buildlink.mk
new file mode 100644
index 00000000000..cd349ad4070
--- /dev/null
+++ b/x11/openmotif/buildlink.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/09/08 20:03:43 jlam Exp $
+#
+# This Makefile fragment is included by packages that use openmotif.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.openmotif to the dependency pattern
+#     for the version of openmotif desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(OPENMOTIF_BUILDLINK_MK)
+OPENMOTIF_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.openmotif?=	openmotif>=2.1.30
+DEPENDS+=	${BUILDLINK_DEPENDS.openmotif}:../../x11/openmotif
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.openmotif=openmotif
+BUILDLINK_PREFIX.openmotif_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.openmotif=	include/Mrm/*
+BUILDLINK_FILES.openmotif+=	include/Xm/*
+BUILDLINK_FILES.openmotif+=	include/uil/*
+BUILDLINK_FILES.openmotif+=	lib/libMrm.*
+BUILDLINK_FILES.openmotif+=	lib/libUil.*
+BUILDLINK_FILES.openmotif+=	lib/libXm.*
+
+BUILDLINK_TARGETS.openmotif=	openmotif-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.openmotif}
+
+MOTIFBASE=			${BUILDLINK_PREFIX.openmotif}
+
+pre-configure: ${BUILDLINK_TARGETS.openmotif}
+openmotif-buildlink: _BUILDLINK_USE
+
+.endif	# OPENMOTIF_BUILDLINK_MK
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 007922a4c18..92c095fafee 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:41 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/09/08 20:03:43 jlam Exp $
 
 SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
 Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
@@ -12,15 +12,18 @@ SHA1 (openmotif/patch4) = 63af3871e562b79f4544c37a783e3396c33a21ec
 Size (openmotif/patch4) = 126297 bytes
 SHA1 (openmotif/patch5) = 0100c1100714ff454bbd40d1abc0da566c03fe6e
 Size (openmotif/patch5) = 480141 bytes
-SHA1 (patch-aa) = dd7877ff9663475c5595df46d54358c02626aaba
-SHA1 (patch-ab) = 3d5eb587c8e76ee661da8aa2de476f4d3f8e7f33
-SHA1 (patch-ac) = 9cd69af480755c5bafebc9b9fcf7f0670d4403c9
-SHA1 (patch-ad) = 5b609ccb106f42b94d893b15da9c913f6be462a1
-SHA1 (patch-ae) = 55dcfe1f6c26e37a591c387e067c953ff437c565
-SHA1 (patch-af) = eed0db72c910c8ca3fa84688e61e5a7495844c62
-SHA1 (patch-ag) = 548a08419a5e3511897407ca7ae0f0d5b9c163d7
-SHA1 (patch-ah) = f0b2028398eab6d72b04c50ca6ee50c9736dcede
-SHA1 (patch-ai) = a75f59d53b9902c3130e43ff82f65b0676359ad0
-SHA1 (patch-aj) = 92b4fc367c0728154d5e29349d5e3ae463921f21
-SHA1 (patch-ak) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1
-SHA1 (patch-al) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17
+SHA1 (patch-aa) = 8b7cd330749eb27bfd08480f66da95a256dbf390
+SHA1 (patch-ab) = e6969390c2ac41bce9e36e17958d3e92ac2d87a4
+SHA1 (patch-ac) = 9ca57238197458fb1729ba1c4300bf5ad82805a2
+SHA1 (patch-ad) = 675b77555994293f69182c67c336683755a6b0f4
+SHA1 (patch-ae) = 4bea5f3b09574d2c51a2b77e1daef78098e87c71
+SHA1 (patch-af) = 10d4f98dd3a593c17ec6a59eb326c6f3d778c9cb
+SHA1 (patch-ag) = e10b1c61597db9800bc6a84ff88372271e461484
+SHA1 (patch-ah) = db57ad992f2f68b2f4d5393be336cd47b9781746
+SHA1 (patch-ai) = 548a08419a5e3511897407ca7ae0f0d5b9c163d7
+SHA1 (patch-aj) = 10eeb1a20575e007de16a606bbccb3c663b2be75
+SHA1 (patch-ak) = e11410034479271779385035acbffe1a815b704f
+SHA1 (patch-al) = 541f2d751958fae906008a3196d19a42d71b8548
+SHA1 (patch-am) = 4678858fb8c2d709a1f0aff5bf4f135d0ec54fe7
+SHA1 (patch-an) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1
+SHA1 (patch-ao) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17
diff --git a/x11/openmotif/files/NoInstall.rules b/x11/openmotif/files/NoInstall.rules
new file mode 100644
index 00000000000..e1934711d43
--- /dev/null
+++ b/x11/openmotif/files/NoInstall.rules
@@ -0,0 +1,56 @@
+XCOMM $NetBSD: NoInstall.rules,v 1.1 2001/09/08 20:03:43 jlam Exp $
+XCOMM
+XCOMM Redefine installation targets to nothing.
+
+#undef InstallNamedTarget
+#define InstallNamedTarget(step,srcname,flags,dest,dstname)
+#undef InstallTarget
+#define InstallTarget(step,file,flags,dest)
+#undef InstallLibrary
+#define InstallLibrary(libname,dest)
+#undef InstallLibraryAlias
+#define InstallLibraryAlias(libname,alias,dest)
+#undef InstallLintLibrary
+#define InstallLintLibrary(libname,dest)
+#undef InstallManPageLong
+#define InstallManPageLong(file,destdir,dest)
+#undef InstallManPage
+#define InstallManPage(file,destdir)
+#undef InstallManPageAliases
+#define InstallManPageAliases(file,destdir,aliases)
+#undef InstallNamedNonExec
+#define InstallNamedNonExec(srcname,dstname,dest)
+#undef InstallNonExecFile
+#define InstallNonExecFile(file,dest)
+#undef InstallNonExecFileNoClobber
+#define InstallNonExecFileNoClobber(file,dest)
+#undef InstallNonExec
+#define InstallNonExec(file,dest)
+#undef InstallProgramWithFlags
+#define InstallProgramWithFlags(program,dest,flags)
+#undef InstallProgram
+#define InstallProgram(program,dest)
+#undef InstallScript
+#define InstallScript(program,dest)
+#undef InstallNamedProg
+#define InstallNamedProg(srcname,dstname,dest)
+#undef InstallNamedProgNoClobber
+#define InstallNamedProgNoClobber(srcname,dstname,dest)
+#undef InstallMultipleDestFlags
+#define InstallMultipleDestFlags(step,list,dest,flags)
+#undef InstallMultipleDest
+#define InstallMultipleDest(step,list,dest)
+#undef InstallMultiple
+#define InstallMultiple(list,dest)
+#undef InstallMultipleFlags
+#define InstallMultipleFlags(list,dest,flags)
+#undef InstallMultipleMan
+#define InstallMultipleMan(list,dest)
+#undef InstallSubdirs
+#define InstallSubdirs(dirs)
+#undef InstallManSubdirs
+#define InstallManSubdirs(dirs)
+#undef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)
+#undef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
diff --git a/x11/openmotif/files/OpenMotif.def b/x11/openmotif/files/OpenMotif.def
new file mode 100644
index 00000000000..e9ea618f581
--- /dev/null
+++ b/x11/openmotif/files/OpenMotif.def
@@ -0,0 +1,13 @@
+/*	$NetBSD: OpenMotif.def,v 1.1 2001/09/08 20:03:44 jlam Exp $	*/
+
+#ifndef TopLevelProject
+# defined TopLevelProject	OpenMotif
+#endif
+
+#ifndef ProjectRulesFile
+# define ProjectRulesFile	<OpenMotif.rules>
+#endif
+
+#ifndef ProjectTmplFile
+# define ProjectTmplFile	<OpenMotif.tmpl>
+#endif
diff --git a/x11/openmotif/patches/patch-aa b/x11/openmotif/patches/patch-aa
index d8f9e186ca1..d504f2d87f8 100644
--- a/x11/openmotif/patches/patch-aa
+++ b/x11/openmotif/patches/patch-aa
@@ -1,22 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2001/04/05 14:06:56 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- Imakefile.orig	Thu May  4 08:30:42 2000
-+++ Imakefile	Wed Aug  9 19:29:42 2000
-@@ -57,7 +57,7 @@
- ImakeDependency(xmakefile)
- xmakefile:: Imakefile
- 	RMoveToBakFile(xmakefile)
--	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-+	$(IMAKE) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+--- bindings/Imakefile.orig	Sat Sep  8 03:30:19 2001
++++ bindings/Imakefile
+@@ -37,10 +37,10 @@
+ XCOMM HISTORY
+ XCOMM 
+ XCOMM   $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $
+-INSTALLFLAGS = $(INSTINCFLAGS)
  
- 
- VerifyOS::
-@@ -89,7 +90,7 @@
- #ifdef UseInstalled
- TESTS_IMAKE = $(IMAKE) -DUseInstalled
- #else
--TESTS_IMAKE = ../$(IMAKE)
-+TESTS_IMAKE = $(IMAKE)
- #endif
- DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(INCDIR) $(USRINCDIR) $(LIBDIR) $(XAPPLOADDIR)
- CDE_DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(PROJECTROOT)/share/include
+ FILES = \
+ 	xmbind.alias \
++	CDE \
+ 	acorn \
+ 	apollo \
+ 	dec \
diff --git a/x11/openmotif/patches/patch-ab b/x11/openmotif/patches/patch-ab
index fbaee3bacba..59f9a33744a 100644
--- a/x11/openmotif/patches/patch-ab
+++ b/x11/openmotif/patches/patch-ab
@@ -1,17 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- bindings/Imakefile.orig	Wed May  3 11:12:34 2000
-+++ bindings/Imakefile	Sun Oct 29 14:23:39 2000
-@@ -37,10 +37,10 @@
- XCOMM HISTORY
- XCOMM 
- XCOMM   $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $
--INSTALLFLAGS = $(INSTINCFLAGS)
+--- bitmaps/Imakefile.orig	Fri Sep  7 22:06:54 2001
++++ bitmaps/Imakefile
+@@ -56,4 +56,4 @@
  
- FILES = \
- 	xmbind.alias \
-+	CDE \
- 	acorn \
- 	apollo \
- 	dec \
+ all::
  
+-InstallMultipleFlags($(HEADERS),$(XPROJECTROOT)/include/X11/bitmaps/,$(INSTINCFLAGS))
++InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
diff --git a/x11/openmotif/patches/patch-ac b/x11/openmotif/patches/patch-ac
index 298f2f81df1..44794e84ef1 100644
--- a/x11/openmotif/patches/patch-ac
+++ b/x11/openmotif/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- clients/uil/Imakefile.orig	Sun Oct 29 14:29:52 2000
-+++ clients/uil/Imakefile	Sun Oct 29 14:30:05 2000
-@@ -40,8 +40,10 @@
+--- clients/mwm/Imakefile.orig	Fri Sep  7 22:06:54 2001
++++ clients/mwm/Imakefile
+@@ -217,7 +217,7 @@
+ CppFileTarget(sys.mwmrc,sys.mwmrc.src,$(LOCAL_CPP_DEFINES),)
+ */
  
- #define DoNormalLib	NormalLibUil
- #define DoSharedLib	SharedLibUil
-+#if 0
- #define DoDebugLib	DebugLibUil
- #define DoProfileLib	ProfileLibUil
-+#endif
- #define LibName		Uil
- #define	SoRev		SOUILREV
- #define HasSharedData	NO
+-InstallNonExecFile(system.mwmrc,$(XPROJECTROOT)/lib/X11)
++InstallNonExecFile(system.mwmrc,$(LIBDIR))
+ InstallAppDefaults(Mwm)
+ 
+ MessageCatalogRule(Mwm)
diff --git a/x11/openmotif/patches/patch-ad b/x11/openmotif/patches/patch-ad
index 2d42c0697ab..2d18dac2c65 100644
--- a/x11/openmotif/patches/patch-ad
+++ b/x11/openmotif/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- config/cf/Imakefile.orig	Sun Oct 29 15:17:58 2000
-+++ config/cf/Imakefile	Sun Oct 29 15:19:49 2000
-@@ -121,7 +121,7 @@
- QNX.cf \
- xfree86.cf
+--- config/cf/Imakefile.orig	Sat Sep  8 00:39:50 2001
++++ config/cf/Imakefile
+@@ -123,6 +123,8 @@
  
--INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
-+INSTFILES = Motif.rules Motif.tmpl host.def
+ INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
  
++#include <NoInstall.rules>
++
  all::
  
+ InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS))
diff --git a/x11/openmotif/patches/patch-ae b/x11/openmotif/patches/patch-ae
index c32f13b2389..d620905ebf8 100644
--- a/x11/openmotif/patches/patch-ae
+++ b/x11/openmotif/patches/patch-ae
@@ -1,26 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- config/cf/Motif.rules.orig	Sun Oct 29 15:34:02 2000
-+++ config/cf/Motif.rules	Sun Oct 29 15:34:14 2000
-@@ -50,9 +50,10 @@
- # define MotifIsTopLevelProject	NO
+--- config/cf/bsdLib.rules.orig	Sat Sep  8 03:07:54 2001
++++ config/cf/bsdLib.rules
+@@ -153,7 +153,7 @@
+ #define ShLibIncludeFile <bsdLib.tmpl>
  #endif
- 
--/* Include the X11 project rules file. */
-+#ifndef X11IsTopLevelProject
-+/* If we have not included X11.rules yet, do it now. */
- #include <X11.rules>
--
-+#endif
- 
- /* Use the in-tree Motif by default. */
- #ifndef UseInstalledMotif
-@@ -698,7 +699,7 @@
- #define Real_MessageCatalogRule(prefix)					@@\
- prefix.cat Concat(prefix,MsgCatI.h):					@@\
- 	$(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg	@@\
--	$(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg	@@\
-+	$(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg | sed '/^[ 	]*$$/d' > $(MLOCSRC)/C/msg/prefix.msg	@@\
- 	$(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg		@@\
- 									@@\
- includes:: prefix.cat Concat(prefix,MsgCatI.h)				@@\
+ #ifndef SharedLibraryLoadFlags
+-#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIR)
++#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
+ #endif
+ #ifndef PositionIndependentCFlags
+ #define PositionIndependentCFlags -fPIC
diff --git a/x11/openmotif/patches/patch-af b/x11/openmotif/patches/patch-af
index 52edc56da4e..0cc3e43a891 100644
--- a/x11/openmotif/patches/patch-af
+++ b/x11/openmotif/patches/patch-af
@@ -1,26 +1,35 @@
-$NetBSD: patch-af,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-af,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- config/imake/Imakefile.orig	Sun Oct 29 15:29:28 2000
-+++ config/imake/Imakefile	Sun Oct 29 15:31:43 2000
-@@ -5,6 +5,21 @@
- XCOMM
- XCOMM $XFree86: xc/config/imake/Imakefile,v 3.6.2.1 1997/06/11 12:08:33 dawes Exp $
+--- config/cf/bsdLib.tmpl.orig	Sat Sep  8 03:07:54 2001
++++ config/cf/bsdLib.tmpl
+@@ -59,18 +59,18 @@
+ #endif
  
-+XCOMM
-+XCOMM
-+XCOMM
-+
-+#ifdef NetBSDArchitecture
-+#undef InstallProgram
-+#define InstallProgram(file,dest) /* as nothing */
-+#undef InstallNamedProg
-+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */
-+#undef InstallManPage
-+#define InstallManPage(file,dest) /* as nothing */
-+#undef InstallManPageLong
-+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */
-+#endif
-+
- XCOMM Some compilers generate fatal errors if an -L directory does
- XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-          LDPRELIB =
+ #define SharedX11Reqs	SharedThreadReqs
+-#define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
+-#define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
+-#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXextReqs	$(LDPRELIB) $(XLIBONLY)
+-#define SharedXiReqs	$(LDPRELIB) $(XLIB)
+-#define SharedPexReqs	$(LDPRELIB) $(XLIBONLY) MathLibrary
+-#define SharedXtstReqs	$(LDPRELIB) $(XLIB)
+-#define SharedXieReqs	$(LDPRELIB) $(XLIBONLY)
+-#define SharedSMReqs	$(LDPRELIB) $(ICELIB)
+-#define SharedFrescoReqs	$(LDPRELIB) $(XLIBONLY) FrescoSysLibs
+-#define SharedXtfReqs	$(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
++#define SharedOldXReqs	$(LDPRELIBS) $(XLIBONLY)
++#define SharedXtReqs	$(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
++#define SharedXawReqs	$(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#define SharedXmuReqs	$(LDPRELIBS) $(XTOOLLIB) $(XLIB)
++#define SharedXextReqs	$(LDPRELIBS) $(XLIBONLY)
++#define SharedXiReqs	$(LDPRELIBS) $(XLIB)
++#define SharedPexReqs	$(LDPRELIBS) $(XLIBONLY) MathLibrary
++#define SharedXtstReqs	$(LDPRELIBS) $(XLIB)
++#define SharedXieReqs	$(LDPRELIBS) $(XLIBONLY)
++#define SharedSMReqs	$(LDPRELIBS) $(ICELIB)
++#define SharedFrescoReqs	$(LDPRELIBS) $(XLIBONLY) FrescoSysLibs
++#define SharedXtfReqs	$(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
+ 
+ #define SharedXReqs	$(XTOOLLIB) $(XPLIB) $(XLIB)
+ #define SharedXmReqs	$(LDPRELIBS) SharedXReqs
diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag
index 3f8cb497a8e..47b9273d563 100644
--- a/x11/openmotif/patches/patch-ag
+++ b/x11/openmotif/patches/patch-ag
@@ -1,12 +1,30 @@
-$NetBSD: patch-ag,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- config/imake/imake.c.orig	Sun Oct 29 15:34:13 2000
-+++ config/imake/imake.c	Sun Oct 29 15:38:27 2000
-@@ -148,6 +148,7 @@
- #if defined(__FreeBSD__) || defined(__NetBSD__)
- /* This needs to be before _POSIX_SOURCE gets defined */
- # include <sys/param.h>
-+# include <sys/time.h>
- # include <sys/types.h>
- # include <sys/sysctl.h>
- #endif
+--- config/cf/host.def.orig	Sat Sep  8 01:35:59 2001
++++ config/cf/host.def
+@@ -1,17 +1,19 @@
+ #ifdef BeforeVendorCF
+ 
+-#define TopLevelProject         Motif
+-#define ProjectRoot             /usr/X11R6
+-#define X11ProjectRoot          /usr/X11R6
++#define TopLevelProject         OpenMotif
++#undef ProjectRoot
++#define ProjectRoot             $(PREFIX)
++#undef X11ProjectRoot
++#define X11ProjectRoot          $(X11BASE)
+ #define VirtualBindingsPath     $(LIBDIR)/bindings
+ #define ImportX11               YES
+ #define USE_BYACC               YES
+ #define NoMessageCatalog        YES
+ #define ForceNormalLib          YES
+ #define HasVarDirectory         NO
+-#define DebugLibXm              YES
+-#define DebugLibMrm             YES
+-#define DebugLibUil             YES
++#define DebugLibXm              NO
++#define DebugLibMrm             NO
++#define DebugLibUil             NO
+ #define LexLib                  -lfl
+ 
+ #endif /* BeforeVendorCF */
diff --git a/x11/openmotif/patches/patch-ah b/x11/openmotif/patches/patch-ah
index b7c98c8f49f..d5257e3309c 100644
--- a/x11/openmotif/patches/patch-ah
+++ b/x11/openmotif/patches/patch-ah
@@ -1,21 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2001/04/05 14:06:57 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/09/08 20:03:44 jlam Exp $
 
---- config/util/Imakefile.orig	Sun Oct 29 14:31:06 2000
-+++ config/util/Imakefile	Sun Oct 29 14:31:30 2000
-@@ -1,4 +1,16 @@
- XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $
+--- config/imake/Imakefile.orig	Sat Sep  8 00:39:51 2001
++++ config/imake/Imakefile
+@@ -17,6 +17,8 @@
+ CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
+ DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
+ 
++#include <NoInstall.rules>
 +
-+#ifdef NetBSDArchitecture
-+#undef InstallProgram
-+#define InstallProgram(file,dest) /* as nothing */
-+#undef InstallNamedProg
-+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */
-+#undef InstallManPage
-+#define InstallManPage(file,dest) /* as nothing */
-+#undef InstallManPageLong
-+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */
-+#endif
-+
- #if UseCCMakeDepend
- MDEP_PROG = makedepend
+ #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
+ XBSDLIB = /**/
  #endif
diff --git a/x11/openmotif/patches/patch-ai b/x11/openmotif/patches/patch-ai
index 88d01142bba..cc6384a7d37 100644
--- a/x11/openmotif/patches/patch-ai
+++ b/x11/openmotif/patches/patch-ai
@@ -1,15 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2001/04/05 14:06:58 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2001/09/08 20:03:45 jlam Exp $
 
---- lib/Mrm/Imakefile.orig	Sun Oct 29 14:21:24 2000
-+++ lib/Mrm/Imakefile	Sun Oct 29 14:21:51 2000
-@@ -36,8 +36,10 @@
- 
- #define DoNormalLib	NormalLibMrm
- #define DoSharedLib	SharedLibMrm
-+#if 0
- #define DoDebugLib	DebugLibMrm
- #define DoProfileLib	ProfileLibMrm
-+#endif
- #define LibName		Mrm
- #define SoRev		SOMRMREV
- #define HasSharedData	NO
+--- config/imake/imake.c.orig	Sun Oct 29 15:34:13 2000
++++ config/imake/imake.c	Sun Oct 29 15:38:27 2000
+@@ -148,6 +148,7 @@
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+ /* This needs to be before _POSIX_SOURCE gets defined */
+ # include <sys/param.h>
++# include <sys/time.h>
+ # include <sys/types.h>
+ # include <sys/sysctl.h>
+ #endif
diff --git a/x11/openmotif/patches/patch-aj b/x11/openmotif/patches/patch-aj
index 6c6105397d9..18a129b62ec 100644
--- a/x11/openmotif/patches/patch-aj
+++ b/x11/openmotif/patches/patch-aj
@@ -1,15 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2001/04/05 14:06:58 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2001/09/08 20:03:45 jlam Exp $
 
---- lib/Xm/Imakefile.orig	Sun Oct 29 14:19:45 2000
-+++ lib/Xm/Imakefile	Sun Oct 29 14:20:15 2000
-@@ -41,8 +41,10 @@
+--- config/makedepend/Imakefile.orig	Sat Sep  8 00:39:51 2001
++++ config/makedepend/Imakefile
+@@ -13,6 +13,8 @@
+          LDPRELIB =
+         LDPRELIBS =
  
- #define DoNormalLib	NormalLibXm
- #define DoSharedLib	SharedLibXm
-+#if 0
- #define DoDebugLib	DebugLibXm
- #define DoProfileLib	ProfileLibXm
-+#endif
- #define LibName		Xm
- #define SoRev		SOXMREV
- #define HasSharedData	YES
++#include <NoInstall.rules>
++
+ #if HasGcc && !defined(PreIncDir)
+ #define PreIncDir /usr/local/lib/gcc-include
+ #endif
diff --git a/x11/openmotif/patches/patch-ak b/x11/openmotif/patches/patch-ak
index d3126b98cb2..db36b1f83a7 100644
--- a/x11/openmotif/patches/patch-ak
+++ b/x11/openmotif/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.1 2001/04/05 14:06:58 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2001/09/08 20:03:45 jlam Exp $
 
---- lib/Xm/TextF.c.orig	Sun Oct 29 15:43:15 2000
-+++ lib/Xm/TextF.c	Sun Oct 29 15:45:35 2000
-@@ -84,7 +84,7 @@
- #include <Xm/PrintSP.h>         /* for XmIsPrintShell */
+--- config/util/Imakefile.orig	Fri Apr 28 11:04:07 2000
++++ config/util/Imakefile
+@@ -22,6 +22,8 @@
+          LDPRELIB =
+         LDPRELIBS =
  
++#include <NoInstall.rules>
++
+ all:: $(PROGRAMS)
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__)
- /*
-  * Modification by Integrated Computer Solutions, Inc.  May 2000
-  *
+ includes:: ProgramTargetName(makestrs)
diff --git a/x11/openmotif/patches/patch-al b/x11/openmotif/patches/patch-al
index fab476ac7dd..3fd685a0315 100644
--- a/x11/openmotif/patches/patch-al
+++ b/x11/openmotif/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1 2001/04/05 14:06:58 wiz Exp $
+$NetBSD: patch-al,v 1.2 2001/09/08 20:03:45 jlam Exp $
 
---- tests/Performance/Startup/editor.c.orig	Wed May  3 05:12:48 2000
-+++ tests/Performance/Startup/editor.c	Wed Aug  9 19:29:43 2000
-@@ -238,7 +238,7 @@
+--- doc/man/Imakefile.orig	Fri Sep  7 22:06:56 2001
++++ doc/man/Imakefile
+@@ -3,7 +3,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+ 
+-SUBDIRS = man1 man3 man4 man5
++SUBDIRS = man1 man3 man5
+ 
+ all::
  
-     strcpy(tempname, "/tmp/xmeditXXXXXX");
-     
--    if ((tfp = fopen(mktemp(tempname), "w")) == NULL) {
-+    if ((tfp = mkstemp(tempname)) == NULL) {
-        fprintf(stderr, "Warning: unable to open temp file, text not saved.\n");
-        return(False);;
-     }
diff --git a/x11/openmotif/patches/patch-am b/x11/openmotif/patches/patch-am
new file mode 100644
index 00000000000..8e725d4e2e6
--- /dev/null
+++ b/x11/openmotif/patches/patch-am
@@ -0,0 +1,9 @@
+$NetBSD: patch-am,v 1.1 2001/09/08 20:03:45 jlam Exp $
+
+--- doc/man/man5/Imakefile.orig	Fri Sep  7 23:38:35 2001
++++ doc/man/man5/Imakefile
+@@ -8,3 +8,4 @@
+ InstallMotifManPage(Traits,5)
+ InstallMotifManPage(UIL,5)
+ InstallMotifManPage(WML,5)
++InstallMotifManPage(mwmrc,5)
diff --git a/x11/openmotif/patches/patch-an b/x11/openmotif/patches/patch-an
new file mode 100644
index 00000000000..08c578287e3
--- /dev/null
+++ b/x11/openmotif/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2001/09/08 20:03:45 jlam Exp $
+
+--- lib/Xm/TextF.c.orig	Sun Oct 29 15:43:15 2000
++++ lib/Xm/TextF.c	Sun Oct 29 15:45:35 2000
+@@ -84,7 +84,7 @@
+ #include <Xm/PrintSP.h>         /* for XmIsPrintShell */
+ 
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__)
+ /*
+  * Modification by Integrated Computer Solutions, Inc.  May 2000
+  *
diff --git a/x11/openmotif/patches/patch-ao b/x11/openmotif/patches/patch-ao
new file mode 100644
index 00000000000..1c6f3a2fe09
--- /dev/null
+++ b/x11/openmotif/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2001/09/08 20:03:45 jlam Exp $
+
+--- tests/Performance/Startup/editor.c.orig	Wed May  3 05:12:48 2000
++++ tests/Performance/Startup/editor.c	Wed Aug  9 19:29:43 2000
+@@ -238,7 +238,7 @@
+ 
+     strcpy(tempname, "/tmp/xmeditXXXXXX");
+     
+-    if ((tfp = fopen(mktemp(tempname), "w")) == NULL) {
++    if ((tfp = mkstemp(tempname)) == NULL) {
+        fprintf(stderr, "Warning: unable to open temp file, text not saved.\n");
+        return(False);;
+     }
diff --git a/x11/openmotif/pkg/DEINSTALL b/x11/openmotif/pkg/DEINSTALL
new file mode 100644
index 00000000000..b17255972eb
--- /dev/null
+++ b/x11/openmotif/pkg/DEINSTALL
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/09/08 20:03:45 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CP="@CP@"
+ECHO="@ECHO@"
+GREP="@GREP@"
+MV="@MV@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TRUE="@TRUE@"
+
+X11BASE=@X11BASE@
+MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
+MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl
+X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+
+POST-DEINSTALL)
+	${ECHO} -n "Updating ${X11_HOSTDEF}..."
+	${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
+	( ${GREP} -v OpenMotif ${X11_HOSTDEF}.bak || ${TRUE} ) \
+		> ${X11_HOSTDEF}
+	${ECHO} "done."
+
+	${RM} -f ${MOTIF_RULES} ${MOTIF_TMPL}
+	if [ ${PKG_PREFIX} = ${X11BASE} ]
+	then
+		${MV} -f ${MOTIF_RULES}.openmotif.bak ${MOTIF_RULES}
+		${MV} -f ${MOTIF_TMPL}.openmotif.bak ${MOTIF_TMPL}
+	fi
+	
+	${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
+	;;
+
+*)
+	${ECHO} "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/x11/openmotif/pkg/INSTALL b/x11/openmotif/pkg/INSTALL
new file mode 100644
index 00000000000..6e675d16a54
--- /dev/null
+++ b/x11/openmotif/pkg/INSTALL
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/09/08 20:03:45 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CP="@CP@"
+ECHO="@ECHO@"
+GREP="@GREP@"
+LN="@LN@"
+MV="@MV@"
+
+X11BASE=@X11BASE@
+MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
+MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl
+X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	if [ ${PKG_PREFIX} = ${X11BASE} ]
+	then
+		${MV} -f ${MOTIF_RULES} ${MOTIF_RULES}.openmotif.bak
+		${MV} -f ${MOTIF_TMPL} ${MOTIF_TMPL}.openmotif.bak
+	fi
+	${LN} -sf OpenMotif.rules ${MOTIF_RULES}
+	${LN} -sf OpenMotif.tmpl ${MOTIF_TMPL}
+
+	${ECHO} -n "Updating ${X11_HOSTDEF}..."
+	${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
+	( ${GREP} -v OpenMotif ${X11_HOSTDEF}.bak; \
+	  ${ECHO} '#include <OpenMotif.def>' ) \
+		> ${X11_HOSTDEF}
+	${ECHO} "done."
+	;;
+
+*)
+	${ECHO} "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/x11/openmotif/pkg/PLIST b/x11/openmotif/pkg/PLIST
index d41114f3f7c..51ac7a3aff3 100644
--- a/x11/openmotif/pkg/PLIST
+++ b/x11/openmotif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:11:02 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/09/08 20:03:45 jlam Exp $
 bin/DNDDemo
 bin/UTMXmText
 bin/aicon
@@ -18,7 +18,6 @@ bin/getsubres
 bin/helloint
 bin/hellomotif
 bin/i18ninput
-bin/makedepend
 bin/motifshell
 bin/mwm
 bin/notebook
@@ -46,7 +45,6 @@ include/Mrm/MrmAppl.h
 include/Mrm/MrmDecls.h
 include/Mrm/MrmPublic.h
 include/Mrm/MrmosI.h
-@dirrm include/Mrm
 include/X11/bitmaps/xm_error
 include/X11/bitmaps/xm_hour16
 include/X11/bitmaps/xm_hour16m
@@ -232,14 +230,12 @@ include/Xm/XmStrDefs.h
 include/Xm/Xmfuncs.h
 include/Xm/XmosP.h
 include/Xm/XpmP.h
-@dirrm include/Xm
 include/uil/Uil.h
 include/uil/UilDBDef.h
 include/uil/UilDef.h
 include/uil/UilSymDef.h
 include/uil/UilSymGl.h
 include/uil/XmAppl.uil
-@dirrm include/uil
 lib/X11/app-defaults/Fileview
 lib/X11/app-defaults/Mwm
 lib/X11/app-defaults/XmdAirport
@@ -278,12 +274,8 @@ lib/X11/bindings/sun
 lib/X11/bindings/sun_at
 lib/X11/bindings/tek
 lib/X11/bindings/xmbind.alias
-@dirrm lib/X11/bindings
-lib/X11/config/Motif.rules
-lib/X11/config/Motif.rules.openmotif
-lib/X11/config/Motif.tmpl
-lib/X11/config/Motif.tmpl.openmotif
-lib/X11/config/host.def
+lib/X11/config/OpenMotif.rules
+lib/X11/config/OpenMotif.tmpl
 lib/X11/help/aicon.help
 lib/X11/help/draw.help
 lib/X11/help/filemanager.help
@@ -293,7 +285,6 @@ lib/X11/help/i18ninput.help
 lib/X11/help/sampler2_0.help
 lib/X11/help/todo.help
 lib/X11/help/xmanimate.help
-@dirrm lib/X11/help
 lib/X11/motifshell/help
 lib/X11/motifshell/membership
 lib/X11/motifshell/motif
@@ -301,7 +292,6 @@ lib/X11/motifshell/motifshell.c
 lib/X11/motifshell/principles
 lib/X11/motifshell/research
 lib/X11/motifshell/welcome
-@dirrm lib/X11/motifshell
 lib/X11/system.mwmrc
 lib/X11/uid/C/uid/l_strings.uid
 lib/X11/uid/English.uid
@@ -321,19 +311,6 @@ lib/X11/uid/plane.uid
 lib/X11/uid/superman.uid
 lib/X11/uid/swedish/uid/l_strings.uid
 lib/X11/uid/xmanimate.uid
-@dirrm lib/X11/uid/C/uid
-@dirrm lib/X11/uid/C
-@dirrm lib/X11/uid/english/uid
-@dirrm lib/X11/uid/english
-@dirrm lib/X11/uid/french/uid
-@dirrm lib/X11/uid/french
-@dirrm lib/X11/uid/hebrew/uid
-@dirrm lib/X11/uid/hebrew
-@dirrm lib/X11/uid/japanese/uid
-@dirrm lib/X11/uid/japanese
-@dirrm lib/X11/uid/swedish/uid
-@dirrm lib/X11/uid/swedish
-@dirrm lib/X11/uid
 lib/libMrm.a
 lib/libMrm.so
 lib/libMrm.so.2
@@ -352,7 +329,6 @@ man/man1/xmbind.1
 man/man3/ApplicationShell.3
 man/man3/Composite.3
 man/man3/Constraint.3
-man/man3/Core.3
 man/man3/MrmCloseHierarchy.3
 man/man3/MrmFetchBitmapLiteral.3
 man/man3/MrmFetchColorLiteral.3
@@ -368,10 +344,8 @@ man/man3/MrmOpenHierarchyPerDisplay.3
 man/man3/MrmRegisterClass.3
 man/man3/MrmRegisterNames.3
 man/man3/MrmRegisterNamesInHierarchy.3
-man/man3/Object.3
 man/man3/OverrideShell.3
 man/man3/RectObj.3
-man/man3/Shell.3
 man/man3/TopLevelShell.3
 man/man3/TransientShell.3
 man/man3/Uil.3
@@ -379,6 +353,9 @@ man/man3/UilDumpSymbolTable.3
 man/man3/VendorShell.3
 man/man3/VirtualBindings.3
 man/man3/WMShell.3
+man/man3/XCore.3
+man/man3/XObject.3
+man/man3/XShell.3
 man/man3/XmActivateProtocol.3
 man/man3/XmActivateWMProtocol.3
 man/man3/XmAddProtocolCallback.3
@@ -902,3 +879,22 @@ man/man5/Traits.5
 man/man5/UIL.5
 man/man5/WML.5
 man/man5/mwmrc.5
+@dirrm lib/X11/uid/swedish/uid
+@dirrm lib/X11/uid/swedish
+@dirrm lib/X11/uid/japanese/uid
+@dirrm lib/X11/uid/japanese
+@dirrm lib/X11/uid/hebrew/uid
+@dirrm lib/X11/uid/hebrew
+@dirrm lib/X11/uid/french/uid
+@dirrm lib/X11/uid/french
+@dirrm lib/X11/uid/english/uid
+@dirrm lib/X11/uid/english
+@dirrm lib/X11/uid/C/uid
+@dirrm lib/X11/uid/C
+@dirrm lib/X11/uid
+@dirrm lib/X11/motifshell
+@dirrm lib/X11/help
+@dirrm lib/X11/bindings
+@dirrm include/uil
+@dirrm include/Xm
+@dirrm include/Mrm