[Lunar-commits] <moonbase-other> openMotif: Version bump, adding a PRE_BUILD and lets forgo demos (removing CONFIGURE).

[Dennis Veatch]

commit 048d0d54e287b8c6bc6107bf389a76d93d0249d3
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 12 Sep 2014 20:05:36 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/048d0d54e287b8c6bc6107bf389a76d93d0249d3

openMotif: Version bump, adding a PRE_BUILD and lets forgo demos (removing CONFIGURE).
---
  libs/openMotif/BUILD     | +2/-7     
  libs/openMotif/CONFIGURE | +0/-1     
  libs/openMotif/DETAILS   | +7/-9     
  libs/openMotif/PRE_BUILD | +7/-0     
  4 files changed, 16 insertions(+), 17 deletions(-)

--- a/libs/openMotif/BUILD
+++ b/libs/openMotif/BUILD
@@ -1,13 +1,8 @@
-(
 
-  if [ "$INSTALL_DEMOS" == "n" ] ; then
-    patch_it $SOURCE2 0
-  fi &&
+  ./autogen.sh &&
 
   OPTS+=" --x-libraries=/usr/lib/xorg --prefix=/usr --sysconfdir=/etc \
               --enable-jpeg --enable-png --enable-themes --with-x --enable-xft \
-              --x-includes=/usr/include/X11"
+              --x-includes=/usr/include/X11" &&
 
   default_build
-
-) > $C_FIFO 2>&1
--- a/libs/openMotif/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery INSTALL_DEMOS "Compile and install Motif demos?" n
--- a/libs/openMotif/DETAILS
+++ b/libs/openMotif/DETAILS
@@ -1,15 +1,12 @@
           MODULE=openMotif
-         VERSION=2.3.3
-          SOURCE=openmotif-$VERSION.tar.gz
-         SOURCE2=$MODULE-2.3.0-makefile-no-demos.patch
-      SOURCE_URL=ftp://ftp.ics.com/openmotif/2.3/$VERSION/
-     SOURCE2_URL=$PATCH_URL/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/openmotif-$VERSION
-      SOURCE_VFY=sha1:2a51e2f28078c4db7ff0c8517eb257001716b699
-     SOURCE2_VFY=sha1:32269c255330a0a1e0c52becb339feaa499df4a0
+         VERSION=2.3.4-src
+          SOURCE=motif-$VERSION.tgz
+      SOURCE_URL=$SFORGE_URL/motif/Motif%202.3.4%20Source%20Code/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/motif-${VERSION%-*}
+      SOURCE_VFY=sha1:49ecfe2a0939232ca78ce318d938044e7f751b6d
         WEB_SITE=http://www.motifzone.net/
          ENTERED=20021007
-         UPDATED=20090610
+         UPDATED=20140912
            SHORT="Motif GUI X11 toolkit."
 
 cat << EOF
@@ -17,3 +14,4 @@ Open Motif is the freely available source code distribution for a user
 interface component toolkit.  Open Motif is built on top of the standard
 X Toolkit(Xt) and X11 libraries.
 EOF
+
--- /dev/null
+++ b/libs/openMotif/PRE_BUILD
@@ -0,0 +1,7 @@
+  default_pre_build &&
+
+  sedit "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.ac &&
+
+# Lets forgo demos
+  sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+