merge of 186f778d1d10c9a87957e79c704e1336f936d92c

     and 9dd1ab5bac61847d1fe071f6cc0431ca2e4fe94f

5 files changed, 92 insertions, 0 deletions

diff --git a/packages/regina-rexx/.mtn2git_empty b/packages/regina-rexx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/regina-rexx/.mtn2git_empty
diff --git a/packages/regina-rexx/files/.mtn2git_empty b/packages/regina-rexx/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/regina-rexx/files/.mtn2git_empty
diff --git a/packages/regina-rexx/files/use-proper-host-tools.patch b/packages/regina-rexx/files/use-proper-host-tools.patch
new file mode 100644
index 0000000000..6032ef08a3
--- /dev/null
+++ b/packages/regina-rexx/files/use-proper-host-tools.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- regina-rexx-3.3-r0/Makefile.in~use-proper-host-tools.patch
++++ regina-rexx-3.3-r0/Makefile.in
+@@ -321,8 +321,8 @@
+ # Convert .mts to .mtb
+ #
+ $(MTBFILES): msgcmp$(EXE) $(MTSSRC)
+-	./msgcmp $(MTSSRC)
+-	./rexx $(srcdir)/checkmts.rexx $(srcdir)
++	$(STAGING_BINDIR)/msgcmp-multi-input $(MTSSRC)
++	$(STAGING_BINDIR)/rexx $(srcdir)/checkmts.rexx $(srcdir)
+ 
+ msgcmp$(EXE): msgcmp.$(OBJ)
+ 	$(PURIFY) $(CC) $(LINKOPT) -o msgcmp$(EXE) msgcmp.$(OBJ)
+@@ -919,22 +919,22 @@
+ 	$(INSTALL) -m 644 -c ./de.mtb $(sharedir)/de.mtb
+ 	$(INSTALL) -m 644 -c ./es.mtb $(sharedir)/es.mtb
+ 	$(INSTALL) -m 644 -c ./pl.mtb $(sharedir)/pl.mtb
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
+ 	-chmod 755 $(sharedir)/rexxcps.rexx
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
+ 	-chmod 755 $(sharedir)/animal.rexx
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
+ 	-chmod 755 $(sharedir)/block.rexx
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
+ 	-chmod 755 $(sharedir)/dateconv.rexx
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
+ 	-chmod 755 $(sharedir)/timeconv.rexx
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
+ 	-chmod 755 $(sharedir)/newstr.rexx
+ 
+ installregina:
+ 	$(INSTALL) -m 755 -c ./regina$(EXE) $(bindir)/regina$(EXE)
+-	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
++	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
+ 	-chmod 755 $(sharedir)/dynfunc.rexx
+ 
+ installlib: installregina
diff --git a/packages/regina-rexx/regina-rexx-native_3.3.bb b/packages/regina-rexx/regina-rexx-native_3.3.bb
new file mode 100644
index 0000000000..d2f68cab43
--- /dev/null
+++ b/packages/regina-rexx/regina-rexx-native_3.3.bb
@@ -0,0 +1,12 @@
+include regina-rexx_${PV}.bb
+inherit native
+DEPENDS = ""
+
+do_compile() {
+	oe_runmake CEXTRA='-DREGINA_SHARE_DIRECTORY=\"$(sharedir)\"'
+}
+
+do_stage_append() {
+	install -m 0644 ./msgcmp ${STAGING_BINDIR}/msgcmp-multi-input
+}
+
diff --git a/packages/regina-rexx/regina-rexx_3.3.bb b/packages/regina-rexx/regina-rexx_3.3.bb
new file mode 100644
index 0000000000..66adc5948a
--- /dev/null
+++ b/packages/regina-rexx/regina-rexx_3.3.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "A cross-platform REXX interpreter"
+SECTION = "devel/rexx"
+LICENSE = "GPL"
+HOMEPAGE = "http://regina-rexx.sf.net"
+DEPENDS = "regina-rexx-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/regina-rexx/regina33.zip \
+           file://use-proper-host-tools.patch;patch=1"
+S = "${WORKDIR}"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+# need to use configure script built by ancient autotools
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_compile() {
+	oe_runmake STAGING_BINDIR="${STAGING_BINDIR}"
+}
+
+do_install() {
+	oe_runmake install bindir="${D}${bindir}" libdir="${D}${libdir}" includedir="${D}${includedir}" \
+                           sharedir="${D}${datadir}" mandir="${D}${mandir}" sysconfdir="${D}${sysconfdir}" \
+                           STAGING_BINDIR="${STAGING_BINDIR}"
+}
+
+FILES_${PN} += "${datadir}"
+