Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13652
Modified Files:
openmotif4.patch
Log Message:
update to 2.3.1-1 tarball
Index: openmotif4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/openmotif4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openmotif4.patch 4 Jul 2008 18:13:16 -0000 1.2
+++ openmotif4.patch 28 Dec 2008 22:26:22 -0000 1.3
@@ -1,68 +1,66 @@
---- openmotif-2.3.0.orig/Makefile.in 2007-08-09 03:27:57.000000000 -0400
-+++ openmotif-2.3.0/Makefile.in 2008-04-25 22:31:30.000000000 -0400
-@@ -249,8 +249,7 @@
- include \
- tools \
- clients \
-- doc \
-- demos
-+ doc
-
- AUTOMAKE_OPTIONS = 1.4
- all: all-recursive
---- openmotif-2.3.0.orig/tools/wml/Makefile.in 2007-08-09 03:27:56.000000000
-0400
-+++ openmotif-2.3.0/tools/wml/Makefile.in 2008-04-25 22:34:46.000000000
-0400
-@@ -270,7 +270,7 @@
- wmluiltok_SOURCES = wmluiltok.l
- wmluiltok_LDADD = @LEXLIB@
- wml_SOURCES = wml.c
--wml_LDADD = -L. -lwml
-+wml_LDADD = libwml.a
+--- openmotif-2.3.1/tools/wml/Makefile.in.orig 2008-12-28 16:45:10.000000000
-0500
++++ openmotif-2.3.1/tools/wml/Makefile.in 2008-12-28 16:50:19.000000000
-0500
+@@ -72,10 +72,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(CPPFLAGS) $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -268,7 +268,7 @@
+ wml_LDADD = -L. -lwml
+ wml_DEPENDENCIES = libwml.a
wmldbcreate_LDADD = ../../lib/Xm/libXm.la
- INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${X_CFLAGS}
+-INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${X_CFLAGS}
++INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${CFLAGS} ${X_CFLAGS}
noinst_LIBRARIES = libwml.a
---- openmotif-2.3.0/configure.org 2008-07-03 09:55:51.000000000 -0400
-+++ openmotif-2.3.0/configure 2008-07-03 10:01:04.000000000 -0400
-@@ -21391,9 +21391,9 @@
- lt_save_CFLAGS="$CFLAGS"
- lt_save_CPPFLAGS="$CPPFLAGS"
- lt_save_LIBS="$LIBS"
--LIBS="$X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
--CFLAGS="$X_CFLAGS $CFLAGS"
--CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LIBS="$LIBS $X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- if test "$cross_compiling" = yes; then
- lt_cv_xthreads=dunno
- else
-@@ -21777,8 +21777,8 @@
+ libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c
wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
+ all: all-am
+@@ -373,18 +373,18 @@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
- save_LIBS="$LIBS"
- save_CFLAGS="$CFLAGS"
--LIBS="$X_LIBS $LIBS"
--CFLAGS="$X_CFLAGS $CFLAGS"
-+LIBS="$LIBS $X_LIBS"
-+CFLAGS="$CFLAGS $X_CFLAGS"
+ wmldbcreate.o: $(srcdir)/wmldbcreate.c
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmldbcreate.o -MD -MP -MF
$(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -MT wmldbcreate.o -MD -MP -MF
$(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
+ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wmldbcreate.Tpo $(DEPDIR)/wmldbcreate.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/wmldbcreate.c'
object='wmldbcreate.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
- for ac_header in X11/Xmu/Editres.h
- do
---- openmotif-2.3.0/lib/Mrm/Makefile.in.orig 2007-08-09 03:27:54.000000000
-0400
-+++ openmotif-2.3.0/lib/Mrm/Makefile.in 2008-07-03 13:16:15.000000000
-0400
-@@ -76,10 +76,10 @@
+ wmldbcreate.obj: $(srcdir)/wmldbcreate.c
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmldbcreate.obj -MD -MP
-MF $(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.obj `if test -f
'$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c'; else
$(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -MT wmldbcreate.obj -MD -MP -MF
$(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.obj `if test -f
'$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c'; else
$(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
+ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wmldbcreate.Tpo $(DEPDIR)/wmldbcreate.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/wmldbcreate.c'
object='wmldbcreate.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmldbcreate.obj `if
test -f '$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c';
else $(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c -o wmldbcreate.obj `if test -f
'$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c'; else
$(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
+
+ .l.c:
+ $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ --
$(LEXCOMPILE)
+--- openmotif-2.3.1/lib/Mrm/Makefile.in.orig 2008-09-19 10:55:04.000000000
-0400
++++ openmotif-2.3.1/lib/Mrm/Makefile.in 2008-12-28 16:54:05.000000000
-0500
+@@ -72,10 +72,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -238,7 +238,7 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -232,7 +232,7 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = Mrm.msg Imakefile
@@ -71,31 +69,31 @@
mrmdir = $(includedir)/Mrm
libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11
${X_EXTRA_LIBS}
lib_LTLIBRARIES = libMrm.la
-@@ -315,7 +315,7 @@
+@@ -309,7 +309,7 @@
rm -f "$${dir}/so_locations"; \
done
libMrm.la: $(libMrm_la_OBJECTS) $(libMrm_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libMrm_la_LDFLAGS) $(libMrm_la_OBJECTS)
$(libMrm_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libMrm_la_LDFLAGS) $(libMrm_la_OBJECTS)
$(LIBS) $(libMrm_la_LIBADD)
+- $(LINK) -rpath $(libdir) $(libMrm_la_OBJECTS) $(libMrm_la_LIBADD)
$(LIBS)
++ $(LINK) -rpath $(libdir) $(libMrm_la_OBJECTS) $(LIBS)
$(libMrm_la_LIBADD)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
---- openmotif-2.3.0/lib/Xm/Makefile.in.orig 2007-08-09 03:27:55.000000000
-0400
-+++ openmotif-2.3.0/lib/Xm/Makefile.in 2008-07-03 13:18:03.000000000 -0400
-@@ -163,10 +163,10 @@
+--- openmotif-2.3.1/lib/Xm/Makefile.in.orig 2008-09-19 10:55:05.000000000
-0400
++++ openmotif-2.3.1/lib/Xm/Makefile.in 2008-12-28 16:58:32.000000000 -0500
+@@ -159,10 +159,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -350,7 +350,7 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -344,7 +344,7 @@
INCLUDES = -I.. -I$(srcdir)/.. -DXMBINDDIR_FALLBACK=\"@xmbinddir_fallb...@\" \
-DINCDIR=\"@inc...@\" \
-DLIBDIR=\"@lib...@\" \
@@ -104,31 +102,31 @@
xmdir = $(includedir)/Xm
lib_LTLIBRARIES = libXm.la
-@@ -675,7 +675,7 @@
+@@ -669,7 +669,7 @@
rm -f "$${dir}/so_locations"; \
done
libXm.la: $(libXm_la_OBJECTS) $(libXm_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libXm_la_LDFLAGS) $(libXm_la_OBJECTS)
$(libXm_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libXm_la_LDFLAGS) $(libXm_la_OBJECTS)
$(LIBS) $(libXm_la_LIBADD)
+- $(LINK) -rpath $(libdir) $(libXm_la_OBJECTS) $(libXm_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libXm_la_OBJECTS) $(LIBS) $(libXm_la_LIBADD)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
---- openmotif-2.3.0/clients/mwm/Makefile.in.orig 2007-08-09
03:27:20.000000000 -0400
-+++ openmotif-2.3.0/clients/mwm/Makefile.in 2008-07-03 13:19:27.000000000
-0400
-@@ -75,10 +75,10 @@
+--- openmotif-2.3.1/clients/mwm/Makefile.in.orig 2008-09-19
10:54:57.000000000 -0400
++++ openmotif-2.3.1/clients/mwm/Makefile.in 2008-12-28 17:00:50.000000000
-0500
+@@ -71,10 +71,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -258,7 +258,7 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -255,7 +255,7 @@
-DCDE_INSTALLATION_TOP=\"@cde_installation_...@\" \
-DCDE_CONFIGURATION_TOP=\"@cde_configuration_...@\" \
-DBITMAPDIR=\"@INCDIR@/bitmaps\" \
@@ -137,30 +135,30 @@
SRCS1 = WmCDInfo.c WmCDecor.c WmCEvent.c\
WmCPlace.c WmColormap.c WmError.c\
-@@ -375,7 +375,7 @@
+@@ -372,7 +372,7 @@
done
mwm$(EXEEXT): $(mwm_OBJECTS) $(mwm_DEPENDENCIES)
@rm -f mwm$(EXEEXT)
-- $(LINK) $(mwm_LDFLAGS) $(mwm_OBJECTS) $(mwm_LDADD) $(LIBS)
-+ $(LINK) $(mwm_LDFLAGS) $(mwm_OBJECTS) $(LIBS) $(mwm_LDADD)
+- $(LINK) $(mwm_OBJECTS) $(mwm_LDADD) $(LIBS)
++ $(LINK) $(mwm_OBJECTS) $(LIBS) $(mwm_LDADD)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
---- openmotif-2.3.0/clients/uil/Makefile.in.orig 2007-08-09
03:27:21.000000000 -0400
-+++ openmotif-2.3.0/clients/uil/Makefile.in 2008-07-03 13:23:21.000000000
-0400
-@@ -94,10 +94,10 @@
+--- openmotif-2.3.1/clients/uil/Makefile.in.orig 2008-09-19
10:54:58.000000000 -0400
++++ openmotif-2.3.1/clients/uil/Makefile.in 2008-12-28 17:03:11.000000000
-0500
+@@ -96,10 +96,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -265,7 +265,7 @@
-I$(srcdir)/../../tools/wml \
-I../../include \
@@ -170,23 +168,23 @@
BUILT_SOURCES = UilParser.c UilLexPars.c UilDBDef.h
CLEANFILES = UilParser.c UilLexPars.c UilDBDef.h
---- openmotif-2.3.0/clients/xmbind/Makefile.in.orig 2007-08-09
03:27:21.000000000 -0400
-+++ openmotif-2.3.0/clients/xmbind/Makefile.in 2008-07-03 13:25:18.000000000
-0400
-@@ -61,10 +61,10 @@
+--- openmotif-2.3.1/clients/xmbind/Makefile.in.orig 2008-09-19
10:54:58.000000000 -0400
++++ openmotif-2.3.1/clients/xmbind/Makefile.in 2008-12-28 17:05:00.000000000
-0500
+@@ -57,10 +57,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -220,7 +220,7 @@
- target_vendor = @target_vendor@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -214,7 +214,7 @@
+ top_srcdir = @top_srcdir@
MAINTAINERCLEANFILES = Makefile.in
LDADD = ../../lib/Xm/libXm.la
-INCLUDES = -I$(srcdir)/../../lib ${X_CFLAGS}
@@ -194,69 +192,22 @@
all: all-am
.SUFFIXES:
---- openmotif-2.3.0/tools/wml/Makefile.in.orig 2008-07-03 13:13:39.000000000
-0400
-+++ openmotif-2.3.0/tools/wml/Makefile.in 2008-07-03 13:27:42.000000000
-0400
-@@ -77,10 +77,10 @@
+--- openmotif-2.3.1/config/util/Makefile.in.orig 2008-09-19
10:54:58.000000000 -0400
++++ openmotif-2.3.1/config/util/Makefile.in 2008-12-28 17:10:31.000000000
-0500
+@@ -54,10 +54,10 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -272,7 +272,7 @@
- wml_SOURCES = wml.c
- wml_LDADD = libwml.a
- wmldbcreate_LDADD = ../../lib/Xm/libXm.la
--INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${X_CFLAGS}
-+INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include
${CFLAGS} ${X_CFLAGS}
- noinst_LIBRARIES = libwml.a
- libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c
wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
- all: all-am
-@@ -377,18 +377,18 @@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- wmldbcreate.o: $(srcdir)/wmldbcreate.c
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmldbcreate.o
-MD -MP -MF "$(DEPDIR)/wmldbcreate.Tpo" -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c; \
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -MT wmldbcreate.o -MD -MP
-MF "$(DEPDIR)/wmldbcreate.Tpo" -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wmldbcreate.Tpo"
"$(DEPDIR)/wmldbcreate.Po"; else rm -f "$(DEPDIR)/wmldbcreate.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/wmldbcreate.c'
object='wmldbcreate.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
-...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c -o wmldbcreate.o `test -f
'$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
-
- wmldbcreate.obj: $(srcdir)/wmldbcreate.c
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
wmldbcreate.obj -MD -MP -MF "$(DEPDIR)/wmldbcreate.Tpo" -c -o wmldbcreate.obj
`if test -f '$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W)
'$(srcdir)/wmldbcreate.c'; else $(CYGPATH_W)
'$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`; \
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -MT wmldbcreate.obj -MD -MP
-MF "$(DEPDIR)/wmldbcreate.Tpo" -c -o wmldbcreate.obj `if test -f
'$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c'; else
$(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wmldbcreate.Tpo"
"$(DEPDIR)/wmldbcreate.Po"; else rm -f "$(DEPDIR)/wmldbcreate.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/wmldbcreate.c'
object='wmldbcreate.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmldbcreate.obj `if
test -f '$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c';
else $(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
-...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c -o wmldbcreate.obj `if test -f
'$(srcdir)/wmldbcreate.c'; then $(CYGPATH_W) '$(srcdir)/wmldbcreate.c'; else
$(CYGPATH_W) '$(srcdir)/$(srcdir)/wmldbcreate.c'; fi`
-
- .l.c:
- $(LEXCOMPILE) $<
---- openmotif-2.3.0/config/util/Makefile.in.orig 2008-07-03
13:30:45.000000000 -0400
-+++ openmotif-2.3.0/config/util/Makefile.in 2008-07-03 13:32:02.000000000
-0400
-@@ -58,10 +58,10 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ $(CPPFLAGS) $(AM_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+ $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -223,7 +223,7 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -217,7 +217,7 @@
mkdirhier.man mkdirhier.sh mkshadow syminst.sh x11mf.sh \
xmkmf.cpp xmkmf.man Makefile.ini
@@ -265,3 +216,41 @@
all: all-am
.SUFFIXES:
+--- openmotif-2.3.1/Makefile.in.orig 2008-09-19 10:55:05.000000000 -0400
++++ openmotif-2.3.1/Makefile.in 2008-12-28 16:45:10.000000000 -0500
+@@ -245,8 +245,7 @@
+ include \
+ tools \
+ clients \
+- doc \
+- demos
++ doc
+
+ AUTOMAKE_OPTIONS = 1.4
+ ACLOCAL_AMFLAGS = -I .
+--- openmotif-2.3.1/configure.orig 2008-09-19 10:54:56.000000000 -0400
++++ openmotif-2.3.1/configure 2008-12-28 16:45:10.000000000 -0500
+@@ -21974,9 +21974,9 @@
+ lt_save_CFLAGS="$CFLAGS"
+ lt_save_CPPFLAGS="$CPPFLAGS"
+ lt_save_LIBS="$LIBS"
+-LIBS="$X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+-CFLAGS="$X_CFLAGS $CFLAGS"
+-CPPFLAGS="$X_CFLAGS $CPPFLAGS"
++LIBS="$LIBS $X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++CFLAGS="$CFLAGS $X_CFLAGS"
++CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ if test "$cross_compiling" = yes; then
+ lt_cv_xthreads=dunno
+ else
+@@ -22351,8 +22351,8 @@
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+-LIBS="$X_LIBS $LIBS"
+-CFLAGS="$X_CFLAGS $CFLAGS"
++LIBS="$LIBS $X_LIBS"
++CFLAGS="$CFLAGS $X_CFLAGS"
+
+ for ac_header in X11/Xmu/Editres.h
+ do
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
