rpms/openoffice.org/devel workspace.dmake43p01.patch,1.2,1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 5 08:41:17 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32521
Modified Files:
workspace.dmake43p01.patch
Log Message:
X
workspace.dmake43p01.patch:
dmake/ChangeLog | 1999 ++++++++++++++++++++++++++-
dmake/Makefile.am | 9
dmake/Makefile.in | 54
dmake/NEWS | 56
dmake/acinclude.m4 | 13
dmake/aclocal.m4 | 435 +----
dmake/autogen.sh | 37
dmake/config.h.in | 3
dmake/configure | 330 ++--
dmake/configure.in | 135 -
dmake/dag.c | 9
dmake/dmake.c | 25
dmake/dmake.h | 2
dmake/dmakeroot.h.in | 6
dmake/dmdump.c | 5
dmake/expand.c | 99 +
dmake/function.c | 93 +
dmake/getinp.c | 107 -
dmake/imacs.c | 7
dmake/infer.c | 32
dmake/mac/ruletab.c | 2
dmake/make.c | 34
dmake/makefile.mk | 6
dmake/man/dmake.nc | 1490 ++++++++++----------
dmake/man/dmake.tf | 111 +
dmake/msdos/Makefile.in | 14
dmake/msdos/ruletab.c | 2
dmake/msdos/startup.h | 2
dmake/msdos/zortech/startup.mk | 8
dmake/os2/ruletab.c | 2
dmake/parse.c | 7
dmake/posix.h | 3
dmake/qssl/ruletab.c | 2
dmake/qssl/startup.h | 3
dmake/readme/read1st.txt | 13
dmake/rulparse.c | 47
dmake/startup/Makefile.am | 6
dmake/startup/Makefile.in | 47
dmake/startup/msdos/macros.mk | 6
dmake/startup/os2/macros.mk | 6
dmake/startup/startup.mk | 4
dmake/startup/unix/Makefile.am | 2
dmake/startup/unix/Makefile.in | 38
dmake/startup/unix/cygwin/Makefile.in | 14
dmake/startup/unix/linux/Makefile.in | 14
dmake/startup/unix/macosx/Makefile.in | 14
dmake/startup/unix/solaris/Makefile.in | 14
dmake/startup/unix/sysvr4/Makefile.in | 14
dmake/startup/win95/macros.mk | 6
dmake/startup/winnt/Makefile.am | 2
dmake/startup/winnt/Makefile.in | 38
dmake/startup/winnt/macros.mk | 6
dmake/startup/winnt/mingw/Makefile.in | 14
dmake/startup/winnt/msvc6/Makefile.in | 14
dmake/stdmacs.h | 3
dmake/sysintf.c | 46
dmake/tempnam.c | 2
dmake/tos/ruletab.c | 2
dmake/tos/startup.h | 3
dmake/unix/Makefile.in | 14
dmake/unix/dcache.c | 3
dmake/unix/ruletab.c | 2
dmake/unix/runargv.c | 47
dmake/vextern.h | 7
dmake/win95/Makefile.in | 34
dmake/win95/borland/ruletab.c | 4
dmake/win95/borland/sysintf.h | 4
dmake/win95/microsft/Makefile.in | 14
dmake/win95/microsft/config.h | 9
dmake/win95/microsft/config.mk | 7
dmake/win95/microsft/ruletab.c | 4
dmake/win95/microsft/sysintf.h | 2
dmake/win95/microsft/vpp40/mk.bat | 70
dmake/win95/startup.h | 2
dmake/winnt/borland/ruletab.c | 4
dmake/winnt/borland/sysintf.h | 4
dmake/winnt/microsft/config.h | 11
dmake/winnt/microsft/ruletab.c | 4
dmake/winnt/microsft/sysintf.h | 4
dmake/winnt/mingw/sysintf.h | 2
dmake/winnt/startup.h | 2
openoffice.org/dmake/startup/config.mk.in | 5
openoffice.org/dmake/tests/Makefile.am | 9
openoffice.org/dmake/tests/Makefile.in | 367 ++++
openoffice.org/dmake/tests/function_macros-1 | 96 +
openoffice.org/dmake/tests/function_macros-2 | 64
openoffice.org/dmake/tests/function_macros-3 | 40
openoffice.org/dmake/tests/infra-0 | 42
openoffice.org/dmake/tests/macros-1 | 40
openoffice.org/dmake/tests/misc-1 | 34
openoffice.org/dmake/tests/misc-2 | 39
openoffice.org/dmake/tests/recipes-1 | 37
92 files changed, 4885 insertions(+), 1659 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 workspace.dmake43p01.patch
Index: workspace.dmake43p01.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.dmake43p01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.dmake43p01.patch 5 Sep 2005 08:28:43 -0000 1.2
+++ workspace.dmake43p01.patch 5 Sep 2005 08:41:13 -0000 1.3
@@ -3,7 +3,7 @@
RCS file: /cvs/tools/dmake/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.13
-diff -u -r1.2 -r1.2.2.13
+diff -u -p -r1.2 -r1.2.2.13
--- openoffice.org.orig/dmake/ChangeLog 22 Oct 2004 08:01:58 -0000 1.2
+++ openoffice.org/dmake/ChangeLog 2 Sep 2005 00:25:32 -0000 1.2.2.13
@@ -1 +1,1998 @@
@@ -2011,10 +2011,10 @@
RCS file: /cvs/tools/dmake/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.8.20.2
-diff -u -r1.8 -r1.8.20.2
+diff -u -p -r1.8 -r1.8.20.2
--- openoffice.org.orig/dmake/Makefile.am 25 Feb 2004 13:52:26 -0000 1.8
+++ openoffice.org/dmake/Makefile.am 2 Jun 2005 03:41:17 -0000 1.8.20.2
-@@ -73,12 +73,13 @@
+@@ -73,12 +73,13 @@ dmake_SOURCES = \
#dmake_LDADD = unix/libunix.a
#dmake_LDADD = win95/libwin95.a msdos/libmsdos.a win95/microsft/libmsft.a
@@ -2037,7 +2037,7 @@
RCS file: /cvs/tools/dmake/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.11.2.6
-diff -u -r1.11 -r1.11.2.6
+diff -u -p -r1.11 -r1.11.2.6
--- openoffice.org.orig/dmake/Makefile.in 22 Oct 2004 08:02:11 -0000 1.11
+++ openoffice.org/dmake/Makefile.in 2 Sep 2005 00:25:32 -0000 1.11.2.6
@@ -1,8 +1,8 @@
@@ -2051,7 +2051,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -98,13 +98,14 @@
+@@ -98,13 +98,14 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -2070,7 +2070,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
-@@ -114,7 +115,7 @@
+@@ -114,7 +115,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
@@ -2079,7 +2079,7 @@
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-@@ -126,8 +127,6 @@
+@@ -126,8 +127,6 @@ am_dmake_OBJECTS = infer.$(OBJEXT) make.
macparse.$(OBJEXT) rulparse.$(OBJEXT) percent.$(OBJEXT) \
function.$(OBJEXT)
dmake_OBJECTS = $(am_dmake_OBJECTS)
@@ -2088,7 +2088,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -172,6 +171,7 @@
+@@ -172,6 +171,7 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2096,7 +2096,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -218,7 +218,11 @@
+@@ -218,7 +218,11 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -2108,7 +2108,7 @@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
-@@ -248,10 +252,11 @@
+@@ -248,10 +252,11 @@ dmake_SOURCES = \
#dmake_LDADD = unix/libunix.a
#dmake_LDADD = win95/libwin95.a msdos/libmsdos.a win95/microsft/libmsft.a
@@ -2124,7 +2124,7 @@
# set the include path found by configure
INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@ -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@/gnu
-@@ -310,6 +315,8 @@
+@@ -310,6 +315,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_
distclean-hdr:
-rm -f config.h stamp-h1
@@ -2133,7 +2133,7 @@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -386,7 +393,13 @@
+@@ -386,7 +393,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2148,7 +2148,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -398,7 +411,7 @@
+@@ -398,7 +411,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -2157,7 +2157,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -406,7 +419,13 @@
+@@ -406,7 +419,13 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -2172,7 +2172,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -427,7 +446,7 @@
+@@ -427,7 +446,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -2181,7 +2181,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -502,6 +521,7 @@
+@@ -502,6 +521,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
@@ -2194,10 +2194,10 @@
RCS file: /cvs/tools/dmake/NEWS,v
retrieving revision 1.3
retrieving revision 1.3.2.8
-diff -u -r1.3 -r1.3.2.8
+diff -u -p -r1.3 -r1.3.2.8
--- openoffice.org.orig/dmake/NEWS 22 Oct 2004 08:02:25 -0000 1.3
+++ openoffice.org/dmake/NEWS 2 Jun 2005 03:58:00 -0000 1.3.2.8
-@@ -2,6 +2,62 @@
+@@ -2,6 +2,62 @@ News file for the dmake version that is
cvs. #i<number># denote issues tracked by the OpenOffice.org issue tracking
system, see <http://qa.openoffice.org/issue_handling/project_issues.html>.
@@ -2265,7 +2265,7 @@
RCS file: /cvs/tools/dmake/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.2.2.1
-diff -u -r1.2 -r1.2.2.1
+diff -u -p -r1.2 -r1.2.2.1
--- openoffice.org.orig/dmake/acinclude.m4 22 Oct 2004 08:03:07 -0000 1.2
+++ openoffice.org/dmake/acinclude.m4 22 Apr 2005 01:04:34 -0000 1.2.2.1
@@ -1,14 +1,3 @@
@@ -2289,7 +2289,7 @@
RCS file: /cvs/tools/dmake/aclocal.m4,v
retrieving revision 1.8
retrieving revision 1.8.2.3
-diff -u -r1.8 -r1.8.2.3
+diff -u -p -r1.8 -r1.8.2.3
--- openoffice.org.orig/dmake/aclocal.m4 22 Oct 2004 08:03:37 -0000 1.8
+++ openoffice.org/dmake/aclocal.m4 2 Sep 2005 00:25:33 -0000 1.8.2.3
@@ -1,7 +1,7 @@
@@ -2332,7 +2332,7 @@
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
-@@ -40,26 +28,15 @@
+@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -2366,7 +2366,7 @@
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -106,26 +83,16 @@
+@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
am_aux_dir=`cd $ac_aux_dir && pwd`
])
@@ -2401,7 +2401,7 @@
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
[...3821 lines suppressed...]
+++ openoffice.org/dmake/win95/borland/sysintf.h 17 Apr 2005 16:47:03 -0000 1.1.1.1.132.1
-@@ -48,9 +48,9 @@
+@@ -48,9 +48,9 @@ extern char * getcwd();
#ifdef _POSIX_NAME_MAX
#undef _POSIX_NAME_MAX
#endif
@@ -9185,7 +10041,7 @@
RCS file: /cvs/tools/dmake/win95/microsft/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.4.2.3
-diff -u -r1.4 -r1.4.2.3
+diff -u -p -r1.4 -r1.4.2.3
--- openoffice.org.orig/dmake/win95/microsft/Makefile.in 22 Oct 2004 08:11:22 -0000 1.4
+++ openoffice.org/dmake/win95/microsft/Makefile.in 2 Sep 2005 00:25:41 -0000 1.4.2.3
@@ -1,8 +1,8 @@
@@ -9199,7 +10055,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -36,6 +36,7 @@
+@@ -36,6 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -9207,7 +10063,7 @@
subdir = win95/microsft
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -81,6 +82,7 @@
+@@ -81,6 +82,7 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9215,7 +10071,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -127,7 +129,11 @@
+@@ -127,7 +129,11 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -9227,7 +10083,7 @@
datadir = @datadir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
-@@ -162,9 +168,9 @@
+@@ -162,9 +168,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
exit 1;; \
esac; \
done; \
@@ -9244,7 +10100,7 @@
RCS file: /cvs/tools/dmake/win95/microsft/config.h,v
retrieving revision 1.6
retrieving revision 1.6.2.2
-diff -u -r1.6 -r1.6.2.2
+diff -u -p -r1.6 -r1.6.2.2
--- openoffice.org.orig/dmake/win95/microsft/config.h 22 Oct 2004 08:11:51 -0000 1.6
+++ openoffice.org/dmake/win95/microsft/config.h 22 Apr 2005 04:22:29 -0000 1.6.2.2
@@ -38,7 +38,8 @@
@@ -9275,10 +10131,10 @@
RCS file: /cvs/tools/dmake/win95/microsft/config.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.1
--- openoffice.org.orig/dmake/win95/microsft/config.mk 22 Sep 2000 15:33:36 -0000 1.1.1.1
+++ openoffice.org/dmake/win95/microsft/config.mk 7 Apr 2005 22:30:57 -0000 1.1.1.1.132.1
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ TMPDIR :=
# Definition of macros for library, and C startup code.
# The following sources are required for MSC
@@ -9287,7 +10143,7 @@
DOS_SRC += runargv.c rmprq.c
.SETDIR=$(osrdir) : $(OSR_SRC)
-@@ -27,13 +27,14 @@
+@@ -27,13 +27,14 @@ SET_STACK = /stack:4096
ASFLAGS += -t -mx $(S_$(MODEL))
# Microsoft C doesn't need tail but needs head
@@ -9309,7 +10165,7 @@
RCS file: /cvs/tools/dmake/win95/microsft/ruletab.c,v
retrieving revision 1.2
retrieving revision 1.2.80.2
-diff -u -r1.2 -r1.2.80.2
+diff -u -p -r1.2 -r1.2.80.2
--- openoffice.org.orig/dmake/win95/microsft/ruletab.c 25 Mar 2003 14:02:53 -0000 1.2
+++ openoffice.org/dmake/win95/microsft/ruletab.c 15 Apr 2005 23:55:45 -0000 1.2.80.2
@@ -32,10 +32,10 @@
@@ -9330,10 +10186,10 @@
RCS file: /cvs/tools/dmake/win95/microsft/sysintf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.1
--- openoffice.org.orig/dmake/win95/microsft/sysintf.h 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/win95/microsft/sysintf.h 17 Apr 2005 16:47:03 -0000 1.1.1.1.132.1
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ extern char * getcwd();
#ifdef _POSIX_NAME_MAX
#undef _POSIX_NAME_MAX
#endif
@@ -9347,7 +10203,7 @@
RCS file: /cvs/tools/dmake/win95/microsft/vpp40/mk.bat,v
retrieving revision 1.3
retrieving revision 1.3.30.1
-diff -u -r1.3 -r1.3.30.1
+diff -u -p -r1.3 -r1.3.30.1
--- openoffice.org.orig/dmake/win95/microsft/vpp40/mk.bat 17 Dec 2003 16:17:27 -0000 1.3
+++ openoffice.org/dmake/win95/microsft/vpp40/mk.bat 7 Apr 2005 22:30:57 -0000 1.3.30.1
@@ -1,41 +1,41 @@
@@ -9432,7 +10288,7 @@
RCS file: /cvs/tools/dmake/winnt/startup.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.2
--- openoffice.org.orig/dmake/winnt/startup.h 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/startup.h 11 Apr 2005 03:28:55 -0000 1.1.1.1.132.2
@@ -24,6 +24,6 @@
@@ -9448,7 +10304,7 @@
RCS file: /cvs/tools/dmake/winnt/borland/ruletab.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.2
--- openoffice.org.orig/dmake/winnt/borland/ruletab.c 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/borland/ruletab.c 15 Apr 2005 23:55:46 -0000 1.1.1.1.132.2
@@ -32,9 +32,9 @@
@@ -9468,10 +10324,10 @@
RCS file: /cvs/tools/dmake/winnt/borland/sysintf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.1
--- openoffice.org.orig/dmake/winnt/borland/sysintf.h 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/borland/sysintf.h 17 Apr 2005 16:47:04 -0000 1.1.1.1.132.1
-@@ -48,9 +48,9 @@
+@@ -48,9 +48,9 @@ extern char * getcwd();
#ifdef _POSIX_NAME_MAX
#undef _POSIX_NAME_MAX
#endif
@@ -9488,7 +10344,7 @@
RCS file: /cvs/tools/dmake/winnt/microsft/config.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.2
--- openoffice.org.orig/dmake/winnt/microsft/config.h 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/microsft/config.h 22 Apr 2005 04:22:30 -0000 1.1.1.1.132.2
@@ -25,6 +25,11 @@
@@ -9521,7 +10377,7 @@
RCS file: /cvs/tools/dmake/winnt/microsft/ruletab.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.2
--- openoffice.org.orig/dmake/winnt/microsft/ruletab.c 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/microsft/ruletab.c 15 Apr 2005 23:55:46 -0000 1.1.1.1.132.2
@@ -32,10 +32,10 @@
@@ -9542,10 +10398,10 @@
RCS file: /cvs/tools/dmake/winnt/microsft/sysintf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.1
--- openoffice.org.orig/dmake/winnt/microsft/sysintf.h 22 Sep 2000 15:33:37 -0000 1.1.1.1
+++ openoffice.org/dmake/winnt/microsft/sysintf.h 17 Apr 2005 16:47:05 -0000 1.1.1.1.132.1
-@@ -50,9 +50,9 @@
+@@ -50,9 +50,9 @@ extern char * getcwd();
#ifdef _POSIX_NAME_MAX
#undef _POSIX_NAME_MAX
#endif
@@ -9562,10 +10418,10 @@
RCS file: /cvs/tools/dmake/winnt/mingw/sysintf.h,v
retrieving revision 1.2
retrieving revision 1.2.80.1
-diff -u -r1.2 -r1.2.80.1
+diff -u -p -r1.2 -r1.2.80.1
--- openoffice.org.orig/dmake/winnt/mingw/sysintf.h 25 Mar 2003 14:02:56 -0000 1.2
+++ openoffice.org/dmake/winnt/mingw/sysintf.h 17 Apr 2005 16:47:05 -0000 1.2.80.1
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ extern char * getcwd();
#ifdef _POSIX_NAME_MAX
#undef _POSIX_NAME_MAX
#endif
@@ -9574,11 +10430,3 @@
#ifdef _POSIX_PATH_MAX
#undef _POSIX_PATH_MAX
---- /dev/null 2004-06-24 14:04:38.000000000 -0400
-+++ openoffice.org/dmake/startup/config.mk.in 2005-04-16 18:29:17.000000000 -0400
-@@ -0,0 +1,5 @@
-+# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-+
-+OS := @OS_TYPE@
-+OSRELEASE := @OS_VERSION@
-+#OSENVIRONMENT := ???
More information about the fedora-cvs-commits
mailing list