Update openmotif to 2.1.30nb1. Changes from version 2.1.30 are that we

no longer install all of the demo programs with openmotif (which are
largely just bloat), and we use bsd.pkg.install.mk to replace some of the
bloat in the package Makefile.

6 files changed, 15 insertions, 154 deletions

diff --git a/x11/openmotif/DEINSTALL b/x11/openmotif/DEINSTALL
index f39010ade5c..61a28c40ffb 100644
--- a/x11/openmotif/DEINSTALL
+++ b/x11/openmotif/DEINSTALL
@@ -1,18 +1,4 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:11:16 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CP="@CP@"
-CMP="@CMP@"
-ECHO="@ECHO@"
-GREP="@GREP@"
-MV="@MV@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
+# $NetBSD: DEINSTALL,v 1.2 2002/01/10 12:10:45 jlam Exp $
 
 X11BASE=@X11BASE@
 MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
@@ -52,4 +38,3 @@ POST-DEINSTALL)
 	exit 1
 	;;
 esac
-exit 0
diff --git a/x11/openmotif/INSTALL b/x11/openmotif/INSTALL
index 0fdfcd12137..950c4db1622 100644
--- a/x11/openmotif/INSTALL
+++ b/x11/openmotif/INSTALL
@@ -1,16 +1,4 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:11:16 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CP="@CP@"
-ECHO="@ECHO@"
-GREP="@GREP@"
-LN="@LN@"
-MV="@MV@"
-RM="@RM@"
+# $NetBSD: INSTALL,v 1.2 2002/01/10 12:10:45 jlam Exp $
 
 X11BASE=@X11BASE@
 MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules
@@ -56,4 +44,3 @@ POST-INSTALL)
 	exit 1
 	;;
 esac
-exit 0
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 2a413f9fa98..dc9644ac051 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2001/09/28 08:54:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/01/10 12:10:45 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 
 
 PKGVER=		2.1.30
 DISTNAME=	openmotif${PKGVER}
 PKGNAME=	openmotif-${PKGVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 MOTIF_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \
 		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \
@@ -27,20 +28,10 @@ USE_X11BASE=		# defined
 USE_BUILDLINK_ONLY=	# defined
 ALL_TARGET=		World
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+DEINSTALL_TMPL=		${.CURDIR}/DEINSTALL
+INSTALL_TMPL=		${.CURDIR}/INSTALL
 
-FILES_SUBST=		X11BASE=${X11BASE}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		CMP=${CMP: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!@/}
+FILES_SUBST+=		X11BASE=${X11BASE}
 
 post-extract:
 	${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules
@@ -101,11 +92,6 @@ post-build:
 		${MV} -f $${file}.tblized $${file};			\
 	done
 
-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:
 	cd ${WRKSRC}/config/cf;						\
@@ -118,7 +104,7 @@ post-install:
 	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/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/PLIST b/x11/openmotif/PLIST
index d04c81fcee1..14eb02edf37 100644
--- a/x11/openmotif/PLIST
+++ b/x11/openmotif/PLIST
@@ -1,46 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:16 zuntum Exp $
-bin/DNDDemo
-bin/UTMXmText
-bin/aicon
-bin/airport
-bin/autopopups
-bin/combo_box
-bin/container
-bin/dainput
-bin/dogs
-bin/draw
-bin/earth
-bin/exm_in_c
-bin/exm_in_uil
-bin/filemanager
-bin/fileview
-bin/getsubres
-bin/helloint
-bin/hellomotif
-bin/i18ninput
-bin/motifshell
+@comment $NetBSD: PLIST,v 1.2 2002/01/10 12:10:45 jlam Exp $
 bin/mwm
-bin/notebook
-bin/onHelp
-bin/periodic
-bin/piano
-bin/sampler2_0
-bin/setDate
-bin/simpleDemo
-bin/simple_drag
-bin/simple_drop
-bin/simpledrop
-bin/spin_box
-bin/tic_mark
-bin/todo
 bin/uil
-bin/uilsymdump
-bin/xmanimate
-bin/xmapdef
 bin/xmbind
-bin/xmfonts
-bin/xmforc
-bin/xmform
 include/Mrm/MrmAppl.h
 include/Mrm/MrmDecls.h
 include/Mrm/MrmPublic.h
@@ -236,17 +197,7 @@ include/uil/UilDef.h
 include/uil/UilSymDef.h
 include/uil/UilSymGl.h
 include/uil/XmAppl.uil
-lib/X11/app-defaults/Fileview
 lib/X11/app-defaults/Mwm
-lib/X11/app-defaults/XmdAirport
-lib/X11/app-defaults/XmdAnimate
-lib/X11/app-defaults/XmdDraw
-lib/X11/app-defaults/XmdFilemanager
-lib/X11/app-defaults/XmdI18nInput
-lib/X11/app-defaults/XmdPeriodic
-lib/X11/app-defaults/XmdSampler2_0
-lib/X11/app-defaults/XmdSetDate
-lib/X11/app-defaults/XmdTodo
 lib/X11/bindings/CDE
 lib/X11/bindings/acorn
 lib/X11/bindings/apollo
@@ -277,41 +228,7 @@ lib/X11/bindings/xmbind.alias
 lib/X11/config/OpenMotif.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
-lib/X11/help/getsubres.help
-lib/X11/help/helpOn.help
-lib/X11/help/i18ninput.help
-lib/X11/help/sampler2_0.help
-lib/X11/help/todo.help
-lib/X11/help/xmanimate.help
-lib/X11/motifshell/help
-lib/X11/motifshell/membership
-lib/X11/motifshell/motif
-lib/X11/motifshell/motifshell.c
-lib/X11/motifshell/principles
-lib/X11/motifshell/research
-lib/X11/motifshell/welcome
 lib/X11/system.mwmrc
-lib/X11/uid/C/uid/l_strings.uid
-lib/X11/uid/English.uid
-lib/X11/uid/French.uid
-lib/X11/uid/German.uid
-lib/X11/uid/dog.uid
-lib/X11/uid/dogs.uid
-lib/X11/uid/english/uid/l_strings.uid
-lib/X11/uid/exm_in_uil.uid
-lib/X11/uid/french/uid/l_strings.uid
-lib/X11/uid/hebrew/uid/l_strings.uid
-lib/X11/uid/helloint.uid
-lib/X11/uid/hellomotif.uid
-lib/X11/uid/japanese/uid/l_strings.uid
-lib/X11/uid/periodic.uid
-lib/X11/uid/plane.uid
-lib/X11/uid/superman.uid
-lib/X11/uid/swedish/uid/l_strings.uid
-lib/X11/uid/xmanimate.uid
 lib/libMrm.a
 lib/libMrm.so
 lib/libMrm.so.2
@@ -880,21 +797,6 @@ 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
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 8cead9740e5..d40af741339 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/12/06 19:09:16 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/01/10 12:10:45 jlam Exp $
 
 SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
 Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
@@ -18,7 +18,7 @@ SHA1 (patch-ac) = 9ca57238197458fb1729ba1c4300bf5ad82805a2
 SHA1 (patch-ad) = 675b77555994293f69182c67c336683755a6b0f4
 SHA1 (patch-ae) = 4bea5f3b09574d2c51a2b77e1daef78098e87c71
 SHA1 (patch-af) = 10d4f98dd3a593c17ec6a59eb326c6f3d778c9cb
-SHA1 (patch-ag) = e10b1c61597db9800bc6a84ff88372271e461484
+SHA1 (patch-ag) = 01c6c803889be6bf710331a855261621c4e0e3d0
 SHA1 (patch-ah) = db57ad992f2f68b2f4d5393be336cd47b9781746
 SHA1 (patch-ai) = 548a08419a5e3511897407ca7ae0f0d5b9c163d7
 SHA1 (patch-aj) = 10eeb1a20575e007de16a606bbccb3c663b2be75
diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag
index 47b9273d563..0dbf64f6484 100644
--- a/x11/openmotif/patches/patch-ag
+++ b/x11/openmotif/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2001/09/08 20:03:44 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/01/10 12:10:46 jlam Exp $
 
---- config/cf/host.def.orig	Sat Sep  8 01:35:59 2001
+--- config/cf/host.def.orig	Thu Jan 10 02:44:40 2002
 +++ config/cf/host.def
-@@ -1,17 +1,19 @@
+@@ -1,17 +1,20 @@
  #ifdef BeforeVendorCF
  
 -#define TopLevelProject         Motif
@@ -26,5 +26,6 @@ $NetBSD: patch-ag,v 1.2 2001/09/08 20:03:44 jlam Exp $
 +#define DebugLibMrm             NO
 +#define DebugLibUil             NO
  #define LexLib                  -lfl
++#define BuildMotifDemos         NO
  
  #endif /* BeforeVendorCF */