SOURCES: qdbm-am_ac.patch - kill hunks of .orig files

Mon Oct 30 21:18:11 CET 2006

Author: twittner                     Date: Mon Oct 30 20:18:11 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- kill hunks of .orig files

---- Files affected:
SOURCES:
   qdbm-am_ac.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/qdbm-am_ac.patch
diff -u SOURCES/qdbm-am_ac.patch:1.11 SOURCES/qdbm-am_ac.patch:1.12

--- SOURCES/qdbm-am_ac.patch:1.11	Mon Oct 30 21:07:50 2006
+++ SOURCES/qdbm-am_ac.patch	Mon Oct 30 21:18:05 2006
@@ -1,4 +1,4 @@
-diff -Nur qdbm-1.8.73/Makefile.am n.qdbm-1.8.73/Makefile.am
+diff -Nur -x '*.orig' qdbm-1.8.73/Makefile.am n.qdbm-1.8.73/Makefile.am
 --- qdbm-1.8.73/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ n.qdbm-1.8.73/Makefile.am	2006-10-30 20:45:08.000000000 +0100
 @@ -0,0 +1,103 @@
@@ -105,7 +105,7 @@
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = qdbm.pc
 +
-diff -Nur qdbm-1.8.73/cgi/Makefile.am n.qdbm-1.8.73/cgi/Makefile.am
+diff -Nur -x '*.orig' qdbm-1.8.73/cgi/Makefile.am n.qdbm-1.8.73/cgi/Makefile.am
 --- qdbm-1.8.73/cgi/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ n.qdbm-1.8.73/cgi/Makefile.am	2006-10-30 20:45:08.000000000 +0100
 @@ -0,0 +1,19 @@
@@ -128,7 +128,7 @@
 +conf_templatesdir = $(datadir)/qdbm/cgi
 +conf_templates_DATA = qadm.conf qupl.conf qfts.conf
 +
-diff -Nur qdbm-1.8.73/cgi/configure.in n.qdbm-1.8.73/cgi/configure.in
+diff -Nur -x '*.orig' qdbm-1.8.73/cgi/configure.in n.qdbm-1.8.73/cgi/configure.in
 --- qdbm-1.8.73/cgi/configure.in	2006-01-25 07:20:03.000000000 +0100
 +++ n.qdbm-1.8.73/cgi/configure.in	2006-10-30 20:45:08.000000000 +0100
 @@ -1,54 +1,12 @@
@@ -235,7 +235,7 @@
 -
 -
  # END OF FILE
-diff -Nur qdbm-1.8.73/configure.in n.qdbm-1.8.73/configure.in
+diff -Nur -x '*.orig' qdbm-1.8.73/configure.in n.qdbm-1.8.73/configure.in
 --- qdbm-1.8.73/configure.in	2006-10-26 07:57:08.000000000 +0200
 +++ n.qdbm-1.8.73/configure.in	2006-10-30 20:45:08.000000000 +0100
 @@ -9,27 +9,18 @@
@@ -380,312 +380,7 @@
 -
 -
  # END OF FILE
-diff -Nur qdbm-1.8.73/configure.in.orig n.qdbm-1.8.73/configure.in.orig
---- qdbm-1.8.73/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.73/configure.in.orig	2006-10-26 07:57:08.000000000 +0200
-@@ -0,0 +1,301 @@
-+# Source of configuration for QDBM
-+
-+
-+
-+#================================================================
-+# Generic Settings
-+#================================================================
-+
-+
-+# Targets
-+AC_INIT(qdbm, 1.8.73)
-+
-+# Export variables
-+LIBVER=14
-+LIBREV=9
-+TARGETS="all"
-+MYDEFS=""
-+MYOPTS=""
-+MGWLIBS=""
-+LD="ld"
-+AR="ar"
-+
-+# Building paths
-+pathtmp="$PATH"
-+PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-+PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-+LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-+LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-+CPATH="$HOME/include:/usr/local/include:$CPATH"
-+export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
-+
-+
-+
-+#================================================================
-+# Options
-+#================================================================
-+
-+
-+# Internal variables
-+enables=""
-+ispthread=""
-+iszlib=""
-+isiconv=""
-+isnowarn=""
-+
-+# Debug mode
-+AC_ARG_ENABLE(debug,
-+  AC_HELP_STRING([--enable-debug], [build for debugging]))
-+if test "$enable_debug" = "yes"
-+then
-+  TARGETS="debug"
-+  enables="$enables (debug)"
-+fi
-+
-+# Developping mode
-+AC_ARG_ENABLE(devel,
-+  AC_HELP_STRING([--enable-devel], [build for development]))
-+if test "$enable_devel" = "yes"
-+then
-+  TARGETS="devel"
-+  enables="$enables (devel)"
-+fi
-+
-+# Enable POSIX thread
-+AC_ARG_ENABLE(pthread,
-+  AC_HELP_STRING([--enable-pthread], [use POSIX thread and make APIs thread-safe]))
-+if test "$enable_pthread" = "yes"
-+then
-+  MYDEFS="$MYDEFS -DMYPTHREAD"
-+  enables="$enables (pthread)"
-+  ispthread="yes"
-+fi
-+
-+# Disable file locking
-+AC_ARG_ENABLE(lock,
-+  AC_HELP_STRING([--disable-lock], [build for environments without file locking]))
-+if test "$enable_lock" = "no"
-+then
-+  MYDEFS="$MYDEFS -DMYNOLOCK"
-+  enables="$enables (no-lock)"
-+fi
-+
-+# Disable memory mapping
-+AC_ARG_ENABLE(mmap,
-+  AC_HELP_STRING([--disable-mmap], [build for environments without memory mapping]))
-+if test "$enable_mmap" = "no"
-+then
-+  MYDEFS="$MYDEFS -DMYNOMMAP"
-+  enables="$enables (no-mmap)"
-+fi
-+
-+# Enable ZLIB compression
-+AC_ARG_ENABLE(zlib,
-+  AC_HELP_STRING([--enable-zlib], [feature ZLIB for B+ tree and inverted index]))
-+if test "$enable_zlib" = "yes"
-+then
-+  MYDEFS="$MYDEFS -DMYZLIB"
-+  MGWLIBS="-lz $MGWLIBS"
-+  enables="$enables (zlib)"
-+  iszlib="yes"
-+fi
-+
-+# Enable LZO compression
-+AC_ARG_ENABLE(lzo,
-+  AC_HELP_STRING([--enable-lzo], [feature LZO for B+ tree and inverted index]))
-+if test "$enable_lzo" = "yes"
-+then
-+  MYDEFS="$MYDEFS -DMYLZO"
-+  MGWLIBS="-llzo2 $MGWLIBS"
-+  enables="$enables (lzo)"
-+  islzo="yes"
-+fi
-+
-+# Enable BZIP2 compression
-+AC_ARG_ENABLE(bzip,
-+  AC_HELP_STRING([--enable-bzip], [feature BZIP2 for B+ tree and inverted index]))
-+if test "$enable_bzip" = "yes"
-+then
-+  MYDEFS="$MYDEFS -DMYBZIP"
-+  MGWLIBS="-lbz2 $MGWLIBS"
-+  enables="$enables (bzip)"
-+  isbzip="yes"
-+fi
-+
-+# Enable ICONV utilities
-+AC_ARG_ENABLE(iconv,
-+  AC_HELP_STRING([--enable-iconv], [feature ICONV utilities]))
-+if test "$enable_iconv" = "yes"
-+then
-+  MYDEFS="$MYDEFS -DMYICONV"
-+  MGWLIBS="-liconv $MGWLIBS"
-+  enables="$enables (iconv)"
-+  isiconv="yes"
-+fi
-+
-+# No warning configuration
-+AC_ARG_ENABLE(warn,
-+  AC_HELP_STRING([--disable-warn], [hide warnings in the configuration]))
-+if test "$enable_warn" = "no"
-+then
-+  isnowarn="yes"
-+fi
-+
-+# Messages
-+printf '#================================================================\n'
-+printf '# Configuring QDBM version %s%s.\n' "$PACKAGE_VERSION" "$enables"
-+printf '#================================================================\n'
-+
-+
-+
-+#================================================================
-+# Checking Commands to Build with
-+#================================================================
-+
-+
-+# C compiler
-+AC_PROG_CC
-+if test "$GCC" != "yes"
-+then
-+  if test "$isnowarn" != "yes"
-+  then
-+    printf '#================================================================\n' 1>&2
-+    printf '# WARNING: GCC is required to build this package.\n' 1>&2
-+    printf '#================================================================\n' 1>&2
-+  fi
-+fi
-+if uname | egrep -i 'Linux' > /dev/null 2>&1 &&
-+  uname -m | egrep '(x|i)(3|4|5|6|7|8|9)?86' > /dev/null 2>&1
-+then
-+  MYOPTS="-minline-all-stringops"
-+fi
-+if uname | egrep -i 'SunOS' > /dev/null 2>&1
-+then
-+  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
-+fi
-+if uname | egrep -i 'BSD' > /dev/null 2>&1
-+then
-+  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
-+fi
-+if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
-+then
-+  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
-+fi
-+
-+# Linker
-+printf 'checking for ld... '
-+if which ld | grep '/ld$' > /dev/null 2>&1
-+then
-+  LD=`which ld`
-+  printf '%s\n' "$LD"
-+else
-+  printf 'no\n'
-+  if test "$isnowarn" != "yes"
-+  then
-+    printf '#================================================================\n' 1>&2
-+    printf '# WARNING: ld is not found in PATH.\n' 1>&2
-+    printf '#================================================================\n' 1>&2
-+  fi
-+fi
-+
-+# Archiver
-+printf 'checking for ar... '
-+if which ar | grep '/ar$' > /dev/null 2>&1
-+then
-+  AR=`which ar`
-+  printf '%s\n' "$AR"
-+else
-+  printf 'no\n'
-+  if test "$isnowarn" != "yes"
-+  then
-+    printf '#================================================================\n' 1>&2
-+    printf '# WARNING: ar is not found in PATH.\n' 1>&2
-+    printf '#================================================================\n' 1>&2
-+  fi
-+fi
-+
-+
-+
-+#================================================================
-+# Checking Libraries
-+#================================================================
-+
-+
-+# Underlying libraries
-+AC_CHECK_LIB(c, main)
-+
-+# for pthread
-+if test "$ispthread" = "yes"
-+then
-+  AC_CHECK_LIB(pthread, main)
-+fi
-+
-+# for zlib
-+if test "$iszlib" = "yes"
-+then
-+  AC_CHECK_LIB(z, main)
-+fi
-+
-+# for lzo
-+if test "$islzo" = "yes"
-+then
-+  AC_CHECK_LIB(lzo2, main)
-+fi
-+
-+# for bzip
-+if test "$isbzip" = "yes"
-+then
-+  AC_CHECK_LIB(bz2, main)
-+fi
-+
-+# for iconv
-+if test "$isiconv" = "yes"
-+then
-+  AC_CHECK_LIB(iconv, main)
-+fi
-+
-+# For old BSDs
-+if test "$ispthread" = "yes" && uname -a | grep BSD > /dev/null &&
-+  test -f /usr/lib/libc_r.a && test ! -f /usr/lib/libpthread.a
-+then
-+  LIBS=`printf '%s' "$LIBS" | sed 's/-lc/-lc_r/g'`
-+fi
-+
-+# Duplication of QDBM for C
-+AC_CHECK_LIB(qdbm, main,
-+  if test "$isnowarn" != "yes"
-+  then
-+    printf '#================================================================\n' 1>&2
-+    printf '# WARNING: The existing library was detected.\n' 1>&2
-+    printf '#================================================================\n' 1>&2
-+  fi
-+)
-+
-+
-+
-+#================================================================
-+# Generic Settings
-+#================================================================
-+
-+
-+# Export variables
-+AC_SUBST(LIBVER)
-+AC_SUBST(LIBREV)
-+AC_SUBST(TARGETS)
-+AC_SUBST(MYDEFS)
-+AC_SUBST(MYOPTS)
-+AC_SUBST(MGWLIBS)
-+AC_SUBST(LD)
-+AC_SUBST(AR)
-+
-+# Targets
-+AC_OUTPUT(Makefile LTmakefile qdbm.spec qdbm.pc)
-+
-+# Messages
-+printf '#================================================================\n'
-+printf '# Ready to make.\n'
-+printf '#================================================================\n'
-+
-+
-+
-+# END OF FILE
-diff -Nur qdbm-1.8.73/java/Makefile.am n.qdbm-1.8.73/java/Makefile.am
+diff -Nur -x '*.orig' qdbm-1.8.73/java/Makefile.am n.qdbm-1.8.73/java/Makefile.am
 --- qdbm-1.8.73/java/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ n.qdbm-1.8.73/java/Makefile.am	2006-10-30 20:45:08.000000000 +0100
 @@ -0,0 +1,34 @@
@@ -723,7 +418,7 @@
 +	echo " $(INSTALL_DATA) 'qdbm.jar' '$(DESTDIR)$(qdbmdir)/'"; \
 +	$(INSTALL_DATA) "qdbm.jar" "$(DESTDIR)$(qdbmdir)/";
 +
-diff -Nur qdbm-1.8.73/java/configure.in n.qdbm-1.8.73/java/configure.in
+diff -Nur -x '*.orig' qdbm-1.8.73/java/configure.in n.qdbm-1.8.73/java/configure.in
 --- qdbm-1.8.73/java/configure.in	2006-08-24 08:43:49.000000000 +0200
 +++ n.qdbm-1.8.73/java/configure.in	2006-10-30 20:45:08.000000000 +0100
 @@ -1,19 +1,12 @@
@@ -882,254 +577,7 @@
 -
 -
  # END OF FILE
-diff -Nur qdbm-1.8.73/java/configure.in.orig n.qdbm-1.8.73/java/configure.in.orig
---- qdbm-1.8.73/java/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.73/java/configure.in.orig	2006-10-30 20:45:08.000000000 +0100
-@@ -0,0 +1,243 @@
-+# Source of configuration for Java interface of QDBM
-+
-+
-+
-+#================================================================
-+# Generic Settings
-+#================================================================
-+
-+
-+# Targets
-+AC_INIT(qdbm-java, 1.0.0)
-+
-+# Export variables
-+LIBVER=1
-+LIBREV=0
-+TARGETS="all"
-+MYJAVAHOME="/usr/java"
-+JVMPLATFORM="linux"
-+JAVAC="javac"
-+JAR="jar"
-+JAVAH="javah"
-+JAVADOC="javadoc"
-+JAVARUN="java"
-+MYDEFS=""
-+MYOPTS=""
-+LD="ld"
-+
-+# Building paths
-+pathtmp="$PATH"
-+PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-+PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-+LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-+LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-+CPATH="$HOME/include:/usr/local/include:$CPATH"
-+export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
-+
-+
-+
-+#================================================================
-+# Options
-+#================================================================
-+
-+
-+# Debug mode
-+AC_ARG_ENABLE(debug,
-+  AC_HELP_STRING([--enable-debug], [build for debugging]))
-+if test "$enable_debug" = "yes"
-+then
-+  TARGETS="debug"
-+fi
-+
-+# Developping mode
-+AC_ARG_ENABLE(devel,
-+  AC_HELP_STRING([--enable-devel], [build for development]))
-+if test "$enable_devel" = "yes"
-+then
-+  TARGETS="devel"
-+fi
-+
-+# Enable gcj
-+AC_ARG_WITH(gcj,
-+  AC_HELP_STRING([--with-gcj], [build with gcj, gcc for Java]))
-+
-+
-+
-+#================================================================
-+# Checking Commands to Build with
-+#================================================================
-+
-+
-+# Home directory of Java
-+printf 'checking MYJAVAHOME... '
-+if test -d "$JAVA_HOME"
-+then
-+  MYJAVAHOME="$JAVA_HOME"
-+fi
-+printf '%s\n' "$MYJAVAHOME"
-+
-+# Platform of Java
-+printf 'checking JVMPLATFORM... '
-+if uname | grep Darwin > /dev/null
-+then
-+  JVMPLATFORM="mac"
-+else
-+  for file in `\ls $MYJAVAHOME/include`
-+  do
-+    if test -d "$MYJAVAHOME/include/$file"
-+    then
-+      JVMPLATFORM="$file"
-+    fi
-+  done
-+fi
-+printf '%s\n' "$JVMPLATFORM"
-+
-+# Java compiler
-+printf 'checking JAVAC... '
-+JAVAC="$MYJAVAHOME/bin/javac"
-+if uname | grep Darwin > /dev/null
-+then
-+  if test -x "$MYJAVAHOME/Commands/javac"
-+  then
-+    JAVAC="$MYJAVAHOME/Commands/javac"
-+  else
-+    JAVAC="$MYJAVAHOME/bin/javac"
-+  fi
-+fi
-+if test "$with_gcj" = "yes"
-+then
-+  JAVAC="gcj -C -Wall"
-+  printf 'gcj -C -Wall\n'
-+elif test -x "$JAVAC"
-+then
-+  printf '%s\n' "$JAVAC"
-+else
-+  printf 'no\n'
-+  printf '#================================================================\n' 1>&2
-+  printf '# WARNING: %s is not found.\n' "$JAVAC" 1>&2
-+  printf '#================================================================\n' 1>&2
-+fi
-+
-+# Other building tools
-+if test "$with_gcj" = "yes"
-+then
-+  JAR="jar"
-+  JAVAH="gcjh"
-+  JAVADOC="false"
-+  JAVARUN="gij"
-+elif uname | grep Darwin > /dev/null
-+then
-+  if test -x "$MYJAVAHOME/Commands/java"
-+  then
-+    JAR="$MYJAVAHOME/Commands/jar"
-+    JAVAH="$MYJAVAHOME/Commands/javah"
-+    JAVADOC="$MYJAVAHOME/Commands/javadoc"
-+    JAVARUN="$MYJAVAHOME/Commands/java"
-+  else
-+    JAR="$MYJAVAHOME/bin/jar"
-+    JAVAH="$MYJAVAHOME/bin/javah"
-+    JAVADOC="$MYJAVAHOME/bin/javadoc"
-+    JAVARUN="$MYJAVAHOME/bin/java"
-+  fi
-+else
-+  JAR="$MYJAVAHOME/bin/jar"
-+  JAVAH="$MYJAVAHOME/bin/javah"
-+  JAVADOC="$MYJAVAHOME/bin/javadoc"
-+  JAVARUN="$MYJAVAHOME/bin/java"
-+fi
-+
-+# C compiler
-+AC_PROG_CC
-+if test "$GCC" != "yes"
-+then
-+  printf '#================================================================\n' 1>&2
-+  printf '# WARNING: GCC is required to build this package.\n' 1>&2
-+  printf '#================================================================\n' 1>&2
-+fi
-+
-+# Linker
-+printf 'checking for ld... '
-+if which ld | grep '/ld$' > /dev/null 2>&1
-+then
-+  LD=`which ld`
-+  printf '%s\n' "$LD"
-+else
-+  printf 'no\n'
-+  printf '#================================================================\n' 1>&2
-+  printf '# WARNING: ld is not found in PATH.\n' 1>&2
-+  printf '#================================================================\n' 1>&2
-+fi
-+
-+
-+
-+#================================================================
-+# Checking Libraries
-+#================================================================
-+
-+
-+# Underlying libraries
-+AC_CHECK_LIB(c, main)
-+AC_CHECK_LIB(c_r, main)
-+AC_CHECK_LIB(pthread, main)
-+AC_CHECK_LIB(z, main)
-+AC_CHECK_LIB(lzo2, main)
-+AC_CHECK_LIB(bz2, main)
-+AC_CHECK_LIB(iconv, main)
-+
-+# Fundamental QDBM libraries
-+AC_CHECK_LIB(qdbm, main, true,
-+  printf 'checking whether /usr/local/lib/libqdbm.* is... '
-+  if ls /usr/local/lib/libqdbm.* > /dev/null 2>&1
-+  then
-+    printf 'yes\n'
-+  else
-+    printf 'no\n'
-+    printf '#================================================================\n' 1>&2
-+    printf '# WARNING: Install QDBM libraries before installation.\n' 1>&2
-+    printf '#================================================================\n' 1>&2
-+  fi
-+)
-+
-+# Duplication of QDBM for Java
-+AC_CHECK_LIB(jqdbm, main,
-+  printf '#================================================================\n' 1>&2
-+  printf '# WARNING: An old library was detected.\n' 1>&2
-+  printf '#================================================================\n' 1>&2
-+)
-+
-+
-+
-+#================================================================
-+# Generic Settings
-+#================================================================
-+
-+# Data types
-+if uname | grep '^SunOS' > /dev/null
-+then
-+  MYDEFS='-Dint64_t=long\ long'
-+elif uname | grep '^CYGWIN' > /dev/null
-+then
-+  MYDEFS='-D__int64=long\ long'
-+fi
-+
-+# Export variables
-+AC_SUBST(LIBVER)
-+AC_SUBST(LIBREV)
-+AC_SUBST(TARGETS)
-+AC_SUBST(MYJAVAHOME)
-+AC_SUBST(JVMPLATFORM)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qdbm-am_ac.patch?r1=1.11&r2=1.12&f=u

