diff options
| author | minskim <minskim@pkgsrc.org> | 2004-03-31 17:15:56 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-03-31 17:15:56 +0000 |
| commit | e16cb04e4f3b902551be81d70436537631a0ad80 (patch) | |
| tree | 6f41c43a18da597fd68b74c2c794a78bd43f8981 /databases/bdb-xml/patches | |
| parent | 0b307b14821a36a4a6438ad9211aebb0bfecb658 (diff) | |
| download | pkgsrc-e16cb04e4f3b902551be81d70436537631a0ad80.tar.gz | |
Reimport dbxml as bdb-xml so as to avoid confusion with dbXML, which
is not in pkgsrc (yet) but available in the FreeBSD ports as dbxml.
Requested by the author in PR pkg/24996.
Diffstat (limited to 'databases/bdb-xml/patches')
| -rw-r--r-- | databases/bdb-xml/patches/patch-aa | 32 | ||||
| -rw-r--r-- | databases/bdb-xml/patches/patch-ab | 22 |
2 files changed, 54 insertions, 0 deletions
diff --git a/databases/bdb-xml/patches/patch-aa b/databases/bdb-xml/patches/patch-aa new file mode 100644 index 00000000000..e998ea6c75b --- /dev/null +++ b/databases/bdb-xml/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $ + +--- ../dist/configure.orig 2003-12-21 17:51:52.000000000 -0600 ++++ ../dist/configure +@@ -3443,14 +3443,14 @@ echo "${ECHO_T}$with_berkeleydb" >&6 + if test "$with_berkeleydb" = "no"; then + with_berkeleydb="/usr/local/BerkeleyDB.4.2" + fi +-if test `ls "$with_berkeleydb"/lib/libdb_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then ++if test `ls "$with_berkeleydb"/lib/libdb4_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then + echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5 + echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6 +- db_version=`ls "$with_berkeleydb"/lib/libdb_cxx-*.la | sed 's/.*db_cxx-\(.*\).la/\1/'` ++ db_version=`ls "$with_berkeleydb"/lib/libdb4_cxx-*.la | sed 's/.*db4_cxx-\(.*\).la/\1/'` + echo "$as_me:$LINENO: result: $db_version" >&5 + echo "${ECHO_T}$db_version" >&6 +- echo "$CPPFLAGS" | grep "$with_berkeleydb/include" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include" +- LIBS="$LIBS $with_berkeleydb/lib/libdb_cxx-$db_version.la" ++ echo "$CPPFLAGS" | grep "$with_berkeleydb/include/db4" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include/db4" ++ LIBS="$LIBS $with_berkeleydb/lib/libdb4_cxx-$db_version.la" + + # find test lib locations, if specified, and possible + # it could be safer to require that --with-berkelydb point to a build +@@ -19369,7 +19369,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6 + INSTALLER="\$(LIBTOOL) --mode=install cp -p" + + MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" +-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" ++MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" + MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" + MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" + MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" diff --git a/databases/bdb-xml/patches/patch-ab b/databases/bdb-xml/patches/patch-ab new file mode 100644 index 00000000000..fd73b9d1e53 --- /dev/null +++ b/databases/bdb-xml/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $ + +--- ../dist/Makefile.in.orig 2003-12-16 20:38:24.000000000 -0600 ++++ ../dist/Makefile.in +@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ + bindir= @bindir@ + includedir=@includedir@/dbxml + libdir= @libdir@ +-docdir= $(prefix)/docs ++docdir= $(prefix)/share/doc/dbxml + + dmode= 755 + emode= 555 +@@ -41,7 +41,7 @@ INSTALLER= @INSTALLER@ + LIBTOOL= @LIBTOOL@ + + POSTLINK= @POSTLINK@ +-SOLINK= @MAKEFILE_SOLINK@ ++SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@ + SOFLAGS= @SOFLAGS@ + SOMAJOR= @DBXML_VERSION_MAJOR@ + SOVERSION= @DBXML_VERSION_MAJOR@.@DBXML_VERSION_MINOR@ |