diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-05 01:24:32 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-05 01:24:32 +0000 |
| commit | 07a9c07ce2e0660bb06ac5f98df861823237aca9 (patch) | |
| tree | b073219d722076b20a9a17769d67d0f94875a21b /databases/db4 | |
| parent | cdc7a7a67f45af701ac02283cfd1e33992c331b2 (diff) | |
| download | pkgsrc-07a9c07ce2e0660bb06ac5f98df861823237aca9.tar.gz | |
Fixed a "test ==" in the configure script. Fixed some pkglint warnings.
Diffstat (limited to 'databases/db4')
| -rw-r--r-- | databases/db4/Makefile | 9 | ||||
| -rw-r--r-- | databases/db4/distinfo | 4 | ||||
| -rw-r--r-- | databases/db4/patches/patch-ab | 15 |
3 files changed, 18 insertions, 10 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index d8d1c89aef1..126acb749a6 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -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 @@ DIST_SUBDIR= ${PKGNAME_NOREV} 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 @@ CONFIGURE_ENV+= F77=${FALSE:Q} # 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 @@ PTHREAD_OPTS+= native .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 --git a/databases/db4/distinfo b/databases/db4/distinfo index bf6fc5f7ed3..c90d3466faf 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -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 @@ SHA1 (db4-4.4.20/patch.4.4.20.2) = 75f0ae6ef06a23a690e5ebe6460552a11448ef32 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 --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab index 79eaaf88c86..609a42f1cf0 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.14 2006/01/06 15:08:47 wiz Exp $ 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 |