Make this go on non-i386 systems. Currently ocamlopt is only available

on i386 so avoid using that on non-i386 systems.  Compiles and seems to work
on alpha.

2 files changed, 145 insertions, 2 deletions

diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index eb2640ab493..030c28f5850 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/19 10:59:00 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/17 11:56:22 dmcmahill Exp $
 #
 
 DISTNAME=	lablgtk-1.2.5
@@ -12,13 +12,26 @@ COMMENT=	GTK+ bindings for ocaml
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 
+.include "../../mk/bsd.prefs.mk"
+
+# currently ocamlopt is only available on i386
+.if (${MACHINE_ARCH} == "i386")
+USE_DOTOPT=	YES
+.else
+CAMLOPT=	ocamlc
+MAKE_ENV+=	CAMLOPT=${CAMLOPT}
+PLIST_SRC=	${PKGDIR}/PLIST.noopt
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-		configure USE_DOTOPT=1 USE_CC=1 CC=${CC}
+		configure USE_DOTOPT=${USE_DOTOPT} USE_CC=1 CC=${CC}
 
+.if (${MACHINE_ARCH} == "i386")
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
 		opt
+.endif
 
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../lang/ocaml/buildlink2.mk"
diff --git a/x11/lablgtk/PLIST.noopt b/x11/lablgtk/PLIST.noopt
new file mode 100644
index 00000000000..2d68725962f
--- /dev/null
+++ b/x11/lablgtk/PLIST.noopt
@@ -0,0 +1,130 @@
+@comment $NetBSD: PLIST.noopt,v 1.1 2003/03/17 11:56:22 dmcmahill Exp $
+bin/lablgtk
+lib/ocaml/lablgtk/gBin.cmi
+lib/ocaml/lablgtk/gBin.ml
+lib/ocaml/lablgtk/gBin.mli
+lib/ocaml/lablgtk/gButton.cmi
+lib/ocaml/lablgtk/gButton.ml
+lib/ocaml/lablgtk/gButton.mli
+lib/ocaml/lablgtk/gContainer.cmi
+lib/ocaml/lablgtk/gContainer.ml
+lib/ocaml/lablgtk/gContainer.mli
+lib/ocaml/lablgtk/gData.cmi
+lib/ocaml/lablgtk/gData.ml
+lib/ocaml/lablgtk/gData.mli
+lib/ocaml/lablgtk/gDraw.cmi
+lib/ocaml/lablgtk/gDraw.ml
+lib/ocaml/lablgtk/gDraw.mli
+lib/ocaml/lablgtk/gEdit.cmi
+lib/ocaml/lablgtk/gEdit.ml
+lib/ocaml/lablgtk/gEdit.mli
+lib/ocaml/lablgtk/gList.cmi
+lib/ocaml/lablgtk/gList.ml
+lib/ocaml/lablgtk/gList.mli
+lib/ocaml/lablgtk/gMain.cmi
+lib/ocaml/lablgtk/gMain.ml
+lib/ocaml/lablgtk/gMain.mli
+lib/ocaml/lablgtk/gMenu.cmi
+lib/ocaml/lablgtk/gMenu.ml
+lib/ocaml/lablgtk/gMenu.mli
+lib/ocaml/lablgtk/gMisc.cmi
+lib/ocaml/lablgtk/gMisc.ml
+lib/ocaml/lablgtk/gMisc.mli
+lib/ocaml/lablgtk/gObj.cmi
+lib/ocaml/lablgtk/gObj.ml
+lib/ocaml/lablgtk/gObj.mli
+lib/ocaml/lablgtk/gPack.cmi
+lib/ocaml/lablgtk/gPack.ml
+lib/ocaml/lablgtk/gPack.mli
+lib/ocaml/lablgtk/gRange.cmi
+lib/ocaml/lablgtk/gRange.ml
+lib/ocaml/lablgtk/gRange.mli
+lib/ocaml/lablgtk/gToolbox.cmi
+lib/ocaml/lablgtk/gToolbox.ml
+lib/ocaml/lablgtk/gToolbox.mli
+lib/ocaml/lablgtk/gTree.cmi
+lib/ocaml/lablgtk/gTree.ml
+lib/ocaml/lablgtk/gTree.mli
+lib/ocaml/lablgtk/gUtil.cmi
+lib/ocaml/lablgtk/gUtil.ml
+lib/ocaml/lablgtk/gUtil.mli
+lib/ocaml/lablgtk/gWindow.cmi
+lib/ocaml/lablgtk/gWindow.ml
+lib/ocaml/lablgtk/gWindow.mli
+lib/ocaml/lablgtk/gaux.cmi
+lib/ocaml/lablgtk/gaux.ml
+lib/ocaml/lablgtk/gdk.cmi
+lib/ocaml/lablgtk/gdk.ml
+lib/ocaml/lablgtk/gdk.mli
+lib/ocaml/lablgtk/gdkEvent.cmi
+lib/ocaml/lablgtk/gdkEvent.ml
+lib/ocaml/lablgtk/gdkKeysyms.cmi
+lib/ocaml/lablgtk/gdkKeysyms.ml
+lib/ocaml/lablgtk/gdkPixbuf.mli
+lib/ocaml/lablgtk/gdk_tags.h
+lib/ocaml/lablgtk/gdkprivate-win32.h
+lib/ocaml/lablgtk/glGtk.mli
+lib/ocaml/lablgtk/glade.mli
+lib/ocaml/lablgtk/glib.cmi
+lib/ocaml/lablgtk/glib.ml
+lib/ocaml/lablgtk/glib_tags.h
+lib/ocaml/lablgtk/gpointer.cmi
+lib/ocaml/lablgtk/gpointer.ml
+lib/ocaml/lablgtk/gpointer.mli
+lib/ocaml/lablgtk/gtk.cmi
+lib/ocaml/lablgtk/gtk.ml
+lib/ocaml/lablgtk/gtkArgv.cmi
+lib/ocaml/lablgtk/gtkArgv.ml
+lib/ocaml/lablgtk/gtkBase.cmi
+lib/ocaml/lablgtk/gtkBase.ml
+lib/ocaml/lablgtk/gtkBin.cmi
+lib/ocaml/lablgtk/gtkBin.ml
+lib/ocaml/lablgtk/gtkButton.cmi
+lib/ocaml/lablgtk/gtkButton.ml
+lib/ocaml/lablgtk/gtkData.cmi
+lib/ocaml/lablgtk/gtkData.ml
+lib/ocaml/lablgtk/gtkEdit.cmi
+lib/ocaml/lablgtk/gtkEdit.ml
+lib/ocaml/lablgtk/gtkInit.cmi
+lib/ocaml/lablgtk/gtkInit.cmo
+lib/ocaml/lablgtk/gtkInit.ml
+lib/ocaml/lablgtk/gtkList.cmi
+lib/ocaml/lablgtk/gtkList.ml
+lib/ocaml/lablgtk/gtkMain.cmi
+lib/ocaml/lablgtk/gtkMain.ml
+lib/ocaml/lablgtk/gtkMenu.cmi
+lib/ocaml/lablgtk/gtkMenu.ml
+lib/ocaml/lablgtk/gtkMisc.cmi
+lib/ocaml/lablgtk/gtkMisc.ml
+lib/ocaml/lablgtk/gtkNew.cmi
+lib/ocaml/lablgtk/gtkNew.ml
+lib/ocaml/lablgtk/gtkPack.cmi
+lib/ocaml/lablgtk/gtkPack.ml
+lib/ocaml/lablgtk/gtkRange.cmi
+lib/ocaml/lablgtk/gtkRange.ml
+lib/ocaml/lablgtk/gtkSignal.cmi
+lib/ocaml/lablgtk/gtkSignal.ml
+lib/ocaml/lablgtk/gtkSignal.mli
+lib/ocaml/lablgtk/gtkThInit.cmo
+lib/ocaml/lablgtk/gtkThInit.ml
+lib/ocaml/lablgtk/gtkThread.cmi
+lib/ocaml/lablgtk/gtkThread.cmo
+lib/ocaml/lablgtk/gtkThread.ml
+lib/ocaml/lablgtk/gtkThread.mli
+lib/ocaml/lablgtk/gtkTree.cmi
+lib/ocaml/lablgtk/gtkTree.ml
+lib/ocaml/lablgtk/gtkWindow.cmi
+lib/ocaml/lablgtk/gtkWindow.ml
+lib/ocaml/lablgtk/gtk_tags.h
+lib/ocaml/lablgtk/lablgtk.cma
+lib/ocaml/lablgtk/lablgtktop
+lib/ocaml/lablgtk/lablgtktop_t
+lib/ocaml/lablgtk/liblablgtk.a
+lib/ocaml/lablgtk/ml_gdk.h
+lib/ocaml/lablgtk/ml_glib.h
+lib/ocaml/lablgtk/ml_gpointer.h
+lib/ocaml/lablgtk/ml_gtk.h
+lib/ocaml/lablgtk/varcc
+lib/ocaml/lablgtk/wrappers.h
+lib/ocaml/lablgtk/xml_lexer.mli
+@dirrm lib/ocaml/lablgtk