pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/db4 Fixed a "test ==" in the configure scrip...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/955cb61023cc
branches:  trunk
changeset: 519538:955cb61023cc
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Oct 05 01:24:32 2006 +0000

description:
Fixed a "test ==" in the configure script. Fixed some pkglint warnings.

diffstat:

 databases/db4/Makefile         |   9 ++++-----
 databases/db4/distinfo         |   4 ++--
 databases/db4/patches/patch-ab |  15 ++++++++++++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diffs (82 lines):

diff -r fb1e9b64f5df -r 955cb61023cc databases/db4/Makefile
--- a/databases/db4/Makefile    Thu Oct 05 01:13:00 2006 +0000
+++ b/databases/db4/Makefile    Thu Oct 05 01:24:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/10/05 01:24:32 rillig Exp $
 
 DISTNAME=              db-4.4.20
 PKGNAME=               ${DISTNAME:S/db/db4/}
@@ -19,8 +19,7 @@
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-CONFIGURE_DIRS=                ${WRKSRC}/build_unix
-BUILD_DIRS=            ${CONFIGURE_DIRS}
+CONFIGURE_DIRS=                build_unix
 CONFIGURE_SCRIPT=      ../dist/configure
 
 CONFIGURE_ARGS+=       --enable-cxx
@@ -35,7 +34,7 @@
 
 # Along with a hack in patch-ab, this forces shlib detection via
 # the pkgsrc-supplied libtool only.
-CONFIGURE_ENV+=                LIBTOOL_PROG="${LIBTOOL} ${LIBTOOL_FLAGS}"
+CONFIGURE_ENV+=                LIBTOOL_PROG=${LIBTOOL:Q}\ ${LIBTOOL_FLAGS:Q}
 
 OPSYSVARS+=            LIBSO_LIBS
 LIBSO_LIBS.Interix+=   -lrpclib
@@ -58,6 +57,6 @@
 .endif
 
 post-install:
-       ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/db4
+       chown -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/db4
 
 .include "../../mk/bsd.pkg.mk"
diff -r fb1e9b64f5df -r 955cb61023cc databases/db4/distinfo
--- a/databases/db4/distinfo    Thu Oct 05 01:13:00 2006 +0000
+++ b/databases/db4/distinfo    Thu Oct 05 01:24:32 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2006/02/09 22:07:12 minskim Exp $
+$NetBSD: distinfo,v 1.24 2006/10/05 01:24:32 rillig Exp $
 
 SHA1 (db4-4.4.20/db-4.4.20.tar.gz) = bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b
 RMD160 (db4-4.4.20/db-4.4.20.tar.gz) = 5940d9244b4df4897f66f1b67d3c967081c18b85
@@ -10,5 +10,5 @@
 RMD160 (db4-4.4.20/patch.4.4.20.2) = e560b07cc20dbd6865d8aad91941515f8fb031c1
 Size (db4-4.4.20/patch.4.4.20.2) = 721 bytes
 SHA1 (patch-aa) = dea422ca0265dc43a5cc9d342be6d2edd6ceeaf3
-SHA1 (patch-ab) = 1da34e325931b2de3646c03562289dd28b9b7eb5
+SHA1 (patch-ab) = 2c0db053fb5e27ce45becdb5ec3c498ecda96348
 SHA1 (patch-ac) = 9ca09880abf95f415d5dc8b2595d3da755af18d9
diff -r fb1e9b64f5df -r 955cb61023cc databases/db4/patches/patch-ab
--- a/databases/db4/patches/patch-ab    Thu Oct 05 01:13:00 2006 +0000
+++ b/databases/db4/patches/patch-ab    Thu Oct 05 01:24:32 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.14 2006/01/06 15:08:47 wiz Exp $
+$NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
 
---- dist/configure.orig        2005-11-12 18:42:56.000000000 +0100
-+++ dist/configure
+--- dist/configure.orig        2006-01-10 17:19:32.000000000 +0100
++++ dist/configure     2006-10-05 03:21:44.000000000 +0200
 @@ -5498,6 +5498,7 @@ db_cv_gxx_except=no;
  if test "$GXX" = "yes"; then
        GXX_VERSION=`${MAKEFILE_CXX} --version`
@@ -10,6 +10,15 @@
        1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
                db_cv_gxx_except=yes;;
        esac
+@@ -5514,7 +5515,7 @@ fi
+ # we're using.
+ case "$host_os" in
+ sysv5UnixWare*|sysv5OpenUNIX8*)
+-      if test "$GCC" == "yes"; then
++      if test "$GCC" = "yes"; then
+               CPPFLAGS="$CPPFLAGS -pthread"
+               LDFLAGS="$LDFLAGS -pthread"
+       else
 @@ -21564,7 +21565,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  



Home | Main Index | Thread Index | Old Index