diff options
Diffstat (limited to 'databases/db3/files')
| -rw-r--r-- | databases/db3/files/patch-aa | 63 | ||||
| -rw-r--r-- | databases/db3/files/patch-dist::Makefile.in | 145 | ||||
| -rw-r--r-- | databases/db3/files/patch-dist::configure (renamed from databases/db3/files/patch-ab) | 17 |
3 files changed, 158 insertions, 67 deletions
diff --git a/databases/db3/files/patch-aa b/databases/db3/files/patch-aa deleted file mode 100644 index 6155cc9b8de3..000000000000 --- a/databases/db3/files/patch-aa +++ /dev/null @@ -1,63 +0,0 @@ ---- ../dist/Makefile.in.orig Thu Nov 30 17:07:33 2000 -+++ ../dist/Makefile.in Tue May 29 11:11:15 2001 -@@ -34,11 +34,11 @@ - libdb= libdb.a - - libso_base= libdb --libso_linkname= $(libso_base)-$(SOVERSION).la --libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ --libso_target= $(libso_base)-$(SOVERSION).la -+libso_linkname= $(libso_base)$(SOMAJOR).la -+libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@ -+libso_target= $(libso_base)$(SOMAJOR).la - libso_default= $(libso_base).@SOSUFFIX@ --libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ -+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.2 - - ################################################## - # C++ -@@ -49,10 +49,10 @@ - ################################################## - libcxx= libdb_cxx.a - libxso_base= libdb_cxx --libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ --libxso_target= $(libxso_base)-$(SOVERSION).la -+libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@ -+libxso_target= $(libxso_base)$(SOMAJOR).la - libxso_default= $(libxso_base).@SOSUFFIX@ --libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ -+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.2 - - ################################################## - # JAVA -@@ -115,7 +115,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db3 - - dmode= 755 - emode= 555 -@@ -452,8 +452,8 @@ - @cd $(libdir) && $(rm) -f \ - $(libso_target) $(libso) $(libso_default) $(libso_major) - @$(INSTALLER) $(libso_target) $(libdir) -- @cd $(libdir) && $(ln) -s $(libso) $(libso_default) -- @cd $(libdir) && $(ln) -s $(libso) $(libso_major) -+ @cd $(libdir) && $(chmod) $(fmode) $(libso_major) -+ @cd $(libdir) && $(ln) -s $(libso_major) $(libso_default) - @$(LIBTOOL) --mode=finish $(libdir) - - install_dynamic_cxx: -@@ -463,8 +463,8 @@ - @cd $(libdir) && $(rm) -f \ - $(libxso_target) $(libxso) $(libxso_default) $(libxso_major) - @$(INSTALLER) $(libxso_target) $(libdir) -- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) -- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) -+ @cd $(libdir) && $(chmod) $(fmode) $(libxso_major) -+ @cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default) - - install_tcl: - @echo "Installing DB Tcl library: $(libdir) ..." diff --git a/databases/db3/files/patch-dist::Makefile.in b/databases/db3/files/patch-dist::Makefile.in new file mode 100644 index 000000000000..5e0f454ea8c0 --- /dev/null +++ b/databases/db3/files/patch-dist::Makefile.in @@ -0,0 +1,145 @@ +--- ../dist/Makefile.in.orig Fri Dec 1 02:07:33 2000 ++++ ../dist/Makefile.in Tue Dec 25 13:10:15 2001 +@@ -33,12 +33,12 @@ + + libdb= libdb.a + +-libso_base= libdb +-libso_linkname= $(libso_base)-$(SOVERSION).la +-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ +-libso_target= $(libso_base)-$(SOVERSION).la ++libso_base= libdb$(SOMAJOR) ++libso_linkname= $(libso_base).la ++libso= $(libso_base).@SOSUFFIX@ ++libso_target= $(libso_base).la + libso_default= $(libso_base).@SOSUFFIX@ +-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ ++libso_major= $(libso_base).@SOSUFFIX@.2 + + ################################################## + # C++ +@@ -47,12 +47,12 @@ + # You must configure it using: + # --enable-cxx + ################################################## +-libcxx= libdb_cxx.a +-libxso_base= libdb_cxx +-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ +-libxso_target= $(libxso_base)-$(SOVERSION).la ++libcxx= libdb3_cxx.a ++libxso_base= libdb3_cxx ++libxso= $(libxso_base).@SOSUFFIX@ ++libxso_target= $(libxso_base).la + libxso_default= $(libxso_base).@SOSUFFIX@ +-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ ++libxso_major= $(libxso_base).@SOSUFFIX@.2 + + ################################################## + # JAVA +@@ -115,7 +115,7 @@ + bindir= @bindir@ + includedir=@includedir@ + libdir= @libdir@ +-docdir= $(prefix)/docs ++docdir= $(prefix)/share/doc/db3 + + dmode= 755 + emode= 555 +@@ -192,8 +192,8 @@ + db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@ \ + db_upgrade@o@ db_verify@o@ util_log@o@ util_sig@o@ + +-PROGS= @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ +- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify ++PROGS= @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \ ++ db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify + + JAVA_DBSRCS=\ + $(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \ +@@ -279,53 +279,53 @@ + $(CCLINK) -o $@ $(LDFLAGS) $(RPC_SRV) util_log@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_archive@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_checkpoint@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_deadlock@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_dump185: db_dump185@o@ @LIBOBJS@ ++db3_dump185: db_dump185@o@ @LIBOBJS@ + $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) + $(POSTLINK) $@ + +-db_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_printlog@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_recover@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_upgrade@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ + +-db_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@ ++db3_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@ + $(CCLINK) -o $@ $(LDFLAGS) \ + db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS) + $(POSTLINK) $@ +@@ -452,8 +452,8 @@ + @cd $(libdir) && $(rm) -f \ + $(libso_target) $(libso) $(libso_default) $(libso_major) + @$(INSTALLER) $(libso_target) $(libdir) +- @cd $(libdir) && $(ln) -s $(libso) $(libso_default) +- @cd $(libdir) && $(ln) -s $(libso) $(libso_major) ++ @cd $(libdir) && $(chmod) $(fmode) $(libso_major) ++# @cd $(libdir) && $(ln) -s $(libso_major) $(libso_default) + @$(LIBTOOL) --mode=finish $(libdir) + + install_dynamic_cxx: +@@ -463,8 +463,8 @@ + @cd $(libdir) && $(rm) -f \ + $(libxso_target) $(libxso) $(libxso_default) $(libxso_major) + @$(INSTALLER) $(libxso_target) $(libdir) +- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) +- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) ++ @cd $(libdir) && $(chmod) $(fmode) $(libxso_major) ++# @cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default) + + install_tcl: + @echo "Installing DB Tcl library: $(libdir) ..." diff --git a/databases/db3/files/patch-ab b/databases/db3/files/patch-dist::configure index 50bab3b542f2..9e43a30565f8 100644 --- a/databases/db3/files/patch-ab +++ b/databases/db3/files/patch-dist::configure @@ -1,5 +1,5 @@ ---- ../dist/configure.orig Tue May 29 10:55:53 2001 -+++ ../dist/configure Tue May 29 11:07:37 2001 +--- ../dist/configure.orig Tue Dec 25 12:41:16 2001 ++++ ../dist/configure Tue Dec 25 12:50:29 2001 @@ -1626,9 +1626,9 @@ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6 echo "configure:1628: checking libtool configuration" >&5 @@ -7,8 +7,8 @@ - ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \ - --no-verify $srcdir/ltmain.sh \ - --output=./libtool $host_os \ -+ ${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig \ -+ --no-verify --disable-ltlibs %%LOCALBASE%%/share/libtool/ltmain.sh $target \ ++ ${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig \ ++ --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $target \ + --output=./libtool \ --disable-static \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } @@ -22,3 +22,12 @@ SOFLAGS="-rpath \$(libdir)" o=".lo" fi +@@ -2093,7 +2093,7 @@ + fi + + if test "$db_cv_dump185" = "yes"; then +- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" ++ ADDITIONAL_PROGS="db3_dump185 $ADDITIONAL_PROGS" + fi + + echo $ac_n "checking for pthread_create in "-pthread"""... $ac_c" 1>&6 |