Remove building some data files that aren't used anyway.

Add cross-compilation support for the rest.

4 files changed, 55 insertions, 2 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 1572c87edad..4b1979f8604 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/12/15 19:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2007/08/15 19:26:39 joerg Exp $
 
 PKGVER=		2.2.3
 DISTNAME=	openMotif-${PKGVER}
@@ -50,6 +50,14 @@ SUBST_SED.man_rename=		-e 's: Core.3: XCore.3:g'
 SUBST_SED.man_rename+=		-e 's: Object.3: XObject.3:g'
 SUBST_SED.man_rename+=		-e 's: Shell.3: XShell.3:g'
 
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+.endif
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+MAKE_FLAGS+=	CROSS_COMPILING=yes CC_FOR_BUILD=${NATIVE_CC:Q} \
+    CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
+.endif
 
 # 1) Fix the man pages to refer to the correct sections.
 # 2) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index ff32709e174..a8358501ec0 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/12/15 19:13:22 joerg Exp $
+$NetBSD: distinfo,v 1.25 2007/08/15 19:26:39 joerg Exp $
 
 SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4
 RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179
@@ -24,3 +24,5 @@ SHA1 (patch-bh) = 09401eb3e5e6e7e911a9268f2ba0cd6ddaeed3b4
 SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723
 SHA1 (patch-bj) = ac2b1d9fc09ff1bc712e776a3e2e469c1993c385
 SHA1 (patch-bk) = 3d8c264c8060616878dec5a7a21a479aa801e95d
+SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea
+SHA1 (patch-bm) = 7d41d373b7428cd9eb53841b6636318431d40206
diff --git a/x11/openmotif/patches/patch-bl b/x11/openmotif/patches/patch-bl
new file mode 100644
index 00000000000..c6660cc733e
--- /dev/null
+++ b/x11/openmotif/patches/patch-bl
@@ -0,0 +1,23 @@
+$NetBSD: patch-bl,v 1.1 2007/08/15 19:26:39 joerg Exp $
+
+--- tools/wml/Makefile.in.orig	2004-04-06 19:50:28.000000000 +0200
++++ tools/wml/Makefile.in
+@@ -426,17 +426,7 @@ UilLexPars.c: Uil.c
+ 	$(LN_S) Uil.h UilLexPars.h
+ 	$(LN_S) Uil.c UilLexPars.c
+ 
+-$(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE)
+-	$(RM) $(WMLTARGETS) wml.report wml-uil.mm
+-	./wmluiltok <$(srcdir)/Uil.y >tokens.dat
+-	$(RM) wml-uil.mm
+-	./wml $(srcdir)/$(TABLE)
+-	$(RM) tokens.dat
+-
+-all: motif.wmd
+-
+-motif.wmd: wmldbcreate
+-	./wmldbcreate -o motif.wmd
++all:
+ 
+ clean-local:
+ 	$(RM) $(WMLTARGETS) $(WMDTABLE) $(REPORT) lex.yy.c libwml.a wml \
diff --git a/x11/openmotif/patches/patch-bm b/x11/openmotif/patches/patch-bm
new file mode 100644
index 00000000000..fbe27377754
--- /dev/null
+++ b/x11/openmotif/patches/patch-bm
@@ -0,0 +1,20 @@
+$NetBSD: patch-bm,v 1.1 2007/08/15 19:26:39 joerg Exp $
+
+--- config/util/Makefile.in.orig	2007-08-06 16:22:42.000000000 +0200
++++ config/util/Makefile.in
+@@ -197,9 +197,15 @@ distclean-libtool:
+ 
+ maintainer-clean-libtool:
+ 
++ifndef CROSS_COMPILING
+ makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
+ 	@rm -f makestrs$(EXEEXT)
+ 	$(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
++else
++makestrs$(EXEEXT): $(makestrs_SOURCES) $(makestrs_DEPENDENCIES)
++	$(CC_FOR_BUILD) $(X_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
++	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
++endif
+ 
+ tags: TAGS
+