42eff200593eabfbef3a7e9157d76999

Changed files:
    gcvs-nocvsunix.patch -> 1.5

diff --git a/gcvs-nocvsunix.patch b/gcvs-nocvsunix.patch
index c3939eb193c93bd28e36f204d9474e62983a0b4f..0102c0956c673d61743ff369d7e5c903efbf1fe8 100644 (file)
--- a/gcvs-nocvsunix.patch
+++ b/gcvs-nocvsunix.patch
@@ -1,40 +1,19 @@
-diff -Naur gcvs-1.0a6.orig/Makefile.am gcvs-1.0a6/Makefile.am
---- gcvs-1.0a6.orig/Makefile.am        Wed Jul  5 07:17:42 2000
-+++ gcvs-1.0a6/Makefile.am     Mon Jul 15 11:23:03 2002
-@@ -1,5 +1,5 @@
- EXTRA_DIST = GCVS-VERSION .cvsignore PORTING README.SUN gcvs.spec
--SUBDIRS = common cvstree rf gcvs Macros cvsunix GuiDoc
-+SUBDIRS = common cvstree rf gcvs Macros GuiDoc
- 
- etags:
-       etags -C `find . -name \*.cpp`
-diff -Naur gcvs-1.0a6.orig/configure.in gcvs-1.0a6/configure.in
---- gcvs-1.0a6.orig/configure.in       Fri Aug 18 06:57:25 2000
-+++ gcvs-1.0a6/configure.in    Mon Jul 15 11:25:16 2002
-@@ -156,7 +156,6 @@
+--- ./configure.in.org Tue Jan 28 19:42:44 2003
++++ ./configure.in     Tue Jan 28 19:43:52 2003
+@@ -188,7 +188,6 @@
  packagesrcdir=`cd $srcdir && pwd`
  AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}/gcvs")
  
 -AC_CONFIG_SUBDIRS(cvsunix)
- AC_OUTPUT(
+ AC_OUTPUT([
        Makefile \
        common/Makefile \
---- gcvs-1.0a6/common/AppGlue.cpp~     Mon Jul 15 13:31:59 2002
-+++ gcvs-1.0a6/common/AppGlue.cpp      Mon Jul 15 13:31:59 2002
-@@ -879,16 +879,6 @@
-               cvscmd << kPathDelimiter;
-       cvscmd << "cvs";
-       UStr firstCmd = cvscmd;
--      if(stat(cvscmd, &sb) == -1 || !(S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode)))
--      {
--              cvscmd = PACKAGE_SOURCE_DIR;
--              CStr uppath, folder;
--              SplitPath(cvscmd, uppath, folder);
--              cvscmd = uppath;
--              if(!cvscmd.endsWith(kPathDelimiter))
--                      cvscmd << kPathDelimiter;
--              cvscmd << "cvsunix/src/cvs";
--      }
+--- ./Makefile.am.org  Tue Jan 28 19:42:43 2003
++++ ./Makefile.am      Tue Jan 28 19:44:23 2003
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = GCVS-VERSION .cvsignore PORTING README.SUN gcvs.spec make_configure
+-SUBDIRS = common cvstree rf gcvs Macros cvsunix GuiDoc
++SUBDIRS = common cvstree rf gcvs Macros GuiDoc
+ CONFIG_STATUS_DEPENDENCIES = GCVS-VERSION
  
-       if(stat(cvscmd, &sb) == -1 || !(S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode)))
-       {
+ etags: