diff options
Diffstat (limited to 'databases/db3/patches/patch-aa')
| -rw-r--r-- | databases/db3/patches/patch-aa | 231 |
1 files changed, 117 insertions, 114 deletions
diff --git a/databases/db3/patches/patch-aa b/databases/db3/patches/patch-aa index ad8ac8cdeb6..f66861bfd10 100644 --- a/databases/db3/patches/patch-aa +++ b/databases/db3/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ +$NetBSD: patch-aa,v 1.10 2008/02/21 19:32:24 jlam Exp $ ---- ../dist/Makefile.in.orig Sat Jul 7 05:53:16 2001 -+++ ../dist/Makefile.in Thu Nov 29 14:19:43 2001 -@@ -11,7 +11,7 @@ +--- ../dist/Makefile.in.orig 2001-07-06 16:53:16.000000000 -0400 ++++ ../dist/Makefile.in +@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ bindir= @bindir@ includedir=@includedir@ libdir= @libdir@ -docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/html/db3 ++docdir= $(prefix)/share/doc/db3 dmode= 755 emode= 555 -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ INSTALLER= @INSTALLER@ LIBTOOL= @LIBTOOL@ POSTLINK= @POSTLINK@ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ SOFLAGS= @SOFLAGS@ SOMAJOR= @DB_VERSION_MAJOR@ SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ -@@ -60,13 +60,13 @@ +@@ -60,13 +60,13 @@ LDFLAGS= @LDFLAGS@ LIBS= @LIBS@ LIBSO_LIBS= @LIBSO_LIBS@ @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ ################################################## # C++ API. -@@ -78,13 +78,13 @@ +@@ -78,13 +78,13 @@ CXX= @MAKEFILE_CXX@ CXXLINK= @MAKEFILE_CXXLINK@ LIBXSO_LIBS= @LIBXSO_LIBS@ @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ ################################################## # Java API. -@@ -104,13 +104,13 @@ +@@ -104,13 +104,13 @@ JAVA_DBREL= com/sleepycat/db JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL) JAVA_EXDIR= $(JAVA_SRCDIR)/com/sleepycat/examples @@ -80,7 +80,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ ################################################## # TCL API. -@@ -119,11 +119,11 @@ +@@ -119,11 +119,11 @@ libjso_g= $(libjso_base)-$(SOVERSION)_g. ################################################## TCFLAGS= @TCFLAGS@ LIBTSO_LIBS= @LIBTSO_LIBS@ @@ -96,18 +96,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ ################################################## # db_dump185 UTILITY -@@ -239,8 +239,8 @@ - perf_util@o@ - - UTIL_PROGS=\ -- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \ -- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify -+ @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \ -+ db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify - - ################################################## - # We're building a standard library or a RPM file hierarchy, potentially -@@ -255,14 +255,6 @@ +@@ -255,14 +255,6 @@ install: @INSTALL_TARGET@ ################################################## library_build: $(DEF_LIB) @ADDITIONAL_LIBS@ @ADDITIONAL_LANG@ $(UTIL_PROGS) @@ -122,78 +111,16 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ $(libso_target): $(C_OBJS) $(SOLINK) $(SOFLAGS) -o $@ $(C_OBJS) $(LDFLAGS) $(LIBSO_LIBS) -@@ -293,58 +285,58 @@ - ################################################## - # Utilities - ################################################## --berkeley_db_svc: $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) -+berkeley_db3_svc: $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) -+db3_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) -+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) -+db3_dump: db_dump@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ +@@ -358,19 +350,16 @@ library_install: install_include install + uninstall: uninstall_utilities uninstall_include uninstall_lib uninstall_docs --db_dump185: db_dump185@o@ @LIBOBJS@ -+db3_dump185: db_dump185@o@ @LIBOBJS@ - $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) - $(POSTLINK) $@ + install_setup: +- @test -d $(prefix) || \ +- ($(mkdir) -p $(prefix) && $(chmod) $(dmode) $(prefix)) ++ @test -d $(DESTDIR)$(prefix) || \ ++ ($(mkdir) -p $(DESTDIR)$(prefix) && $(chmod) $(dmode) $(DESTDIR)$(prefix)) --db_load: db_load@o@ util_sig@o@ $(DEF_LIB) -+db3_load: db_load@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) -+db3_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) -+db3_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) -+db3_stat: db_stat@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) -+db3_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) -+db3_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ -@@ -365,12 +357,9 @@ + INCDOT= db.h @ADDITIONAL_INCS@ INCINC= db_cxx.h cxx_common.h cxx_except.h install_include: @echo "Installing DB include files: $(includedir) ..." @@ -203,61 +130,137 @@ $NetBSD: patch-aa,v 1.9 2004/06/28 22:11:38 jlam Exp $ - @$(cp) -p $(INCDOT) $(includedir) - @cd $(srcdir)/include/ && $(cp) -p $(INCINC) $(includedir) - @cd $(includedir) && $(chmod) $(fmode) $(INCDOT) $(INCINC) -+ ${BSD_INSTALL_DATA_DIR} $(includedir) -+ ${BSD_INSTALL_DATA} $(INCDOT) $(includedir) -+ @cd $(srcdir)/include/ && ${BSD_INSTALL_DATA} $(INCINC) $(includedir) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(includedir) ++ ${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir) ++ @cd $(srcdir)/include/ && ${BSD_INSTALL_DATA} $(INCINC) $(DESTDIR)$(includedir) uninstall_include: -cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC) -@@ -401,10 +390,7 @@ - @cd $(libdir) && $(rm) -f \ +@@ -388,75 +377,65 @@ uninstall_lib: + + install_static: + @echo "Installing DB library: $(libdir) ..." +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f $(libdb) +- @$(INSTALLER) -fp $(libdb) $(libdir) +- @cd $(libdir) && $(chmod) $(fmode) $(libdb) ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f $(DESTDIR)$(libdb) ++ @$(INSTALLER) -fp $(libdb) $(DESTDIR)$(libdir) ++ @cd $(DESTDIR)$(libdir) && $(chmod) $(fmode) $(libdb) + + install_shared: + @echo "Installing DB library: $(libdir) ..." +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f \ ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f \ $(libso) $(libso_target) $(libso_default) $(libso_major) - @$(INSTALLER) $(libso_target) $(libdir) +- @$(INSTALLER) $(libso_target) $(libdir) - @cd $(libdir) && $(ln) -s $(libso) $(libso_default) - @cd $(libdir) && $(ln) -s $(libso) $(libso_major) - @$(LIBTOOL) --mode=finish $(libdir) +- @$(LIBTOOL) --mode=finish $(libdir) - @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target) ++ @$(INSTALLER) $(libso_target) $(DESTDIR)$(libdir) ++ @$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) install_static_cxx: @echo "Installing DB C++ static library: $(libdir) ..." -@@ -421,9 +407,6 @@ - @cd $(libdir) && $(rm) -f \ +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f $(libcxx) +- @$(INSTALLER) -fp $(libcxx) $(libdir) +- @cd $(libdir) && $(chmod) $(fmode) $(libcxx) ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f $(libcxx) ++ @$(INSTALLER) -fp $(libcxx) $(DESTDIR)$(libdir) ++ @cd $(DESTDIR)$(libdir) && $(chmod) $(fmode) $(libcxx) + + install_shared_cxx: + @echo "Installing DB C++ library: $(libdir) ..." +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f \ ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f \ $(libxso) $(libxso_target) $(libxso_default) $(libxso_major) - @$(INSTALLER) $(libxso_target) $(libdir) +- @$(INSTALLER) $(libxso_target) $(libdir) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) - @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target) ++ @$(INSTALLER) $(libxso_target) $(DESTDIR)$(libdir) install_tcl: @echo "Installing DB Tcl library: $(libdir) ..." -@@ -432,9 +415,6 @@ - @cd $(libdir) && $(rm) -f \ +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f \ ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f \ $(libtso) $(libtso_target) $(libtso_default) $(libtso_major) - @$(INSTALLER) $(libtso_target) $(libdir) +- @$(INSTALLER) $(libtso_target) $(libdir) - @cd $(libdir) && $(ln) -s $(libtso) $(libtso_default) - @cd $(libdir) && $(ln) -s $(libtso) $(libtso_major) - @cd $(libdir) && $(chmod) $(fmode) $(libtso) $(libtso_target) ++ @$(INSTALLER) $(libtso_target) $(DESTDIR)$(libdir) install_java: - @echo "Installing DB Java library: $(libdir) ..." -@@ -443,10 +423,6 @@ - @cd $(libdir) && $(rm) -f $(libjso_g) \ +- @echo "Installing DB Java library: $(libdir) ..." +- @test -d $(libdir) || \ +- ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) +- @cd $(libdir) && $(rm) -f $(libjso_g) \ ++ @echo "Installing DB Java library: $(DESTDIR)$(libdir) ..." ++ @test -d $(DESTDIR)$(libdir) || \ ++ ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) ++ @cd $(DESTDIR)$(libdir) && $(rm) -f $(libjso_g) \ $(libjso) $(libjso_target) $(libjso_default) $(libjso_major) - @$(INSTALLER) $(libjso_target) $(libdir) +- @$(INSTALLER) $(libjso_target) $(libdir) - @cd $(libdir) && $(ln) -s $(libjso) $(libjso_default) - @cd $(libdir) && $(ln) -s $(libjso) $(libjso_major) - @cd $(libdir) && $(ln) -s $(libjso) $(libjso_g) - @cd $(libdir) && $(chmod) $(fmode) $(libjso) $(libjso_target) - @$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(libdir) +- @$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(libdir) ++ @$(INSTALLER) $(libjso_target) $(DESTDIR)$(libdir) ++ @$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(DESTDIR)$(libdir) install_utilities: -@@ -466,8 +442,7 @@ + @echo "Installing DB utilities: $(bindir) ..." +- @test -d $(bindir) || \ +- ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir)) +- @cd $(bindir) && $(rm) -f $(UTIL_PROGS) +- @$(INSTALLER) -fp $(UTIL_PROGS) $(bindir) +- @cd $(bindir) && (test ! -f $(strip) || $(strip) $(UTIL_PROGS)) +- @cd $(bindir) && $(chmod) $(emode) $(UTIL_PROGS) ++ @test -d $(DESTDIR)$(bindir) || \ ++ ($(mkdir) -p $(DESTDIR)$(bindir) && $(chmod) $(dmode) $(DESTDIR)$(bindir)) ++ @for prog in $(UTIL_PROGS); do \ ++ db3prog=`echo $$prog | sed @program_transform_name@`; \ ++ ( cd $(DESTDIR)$(bindir) && $(rm) -f $$db3prog ) && \ ++ $(INSTALLER) -fp $$prog $(DESTDIR)$(bindir)/$$db3prog && \ ++ ( cd $(DESTDIR)$(bindir) && (test ! -f $(strip) || $(strip) $$db3prog ) ) && \ ++ ( cd $(DESTDIR)$(bindir) && $(chmod) $(emode) $$db3prog ); \ ++ done + + uninstall_utilities: + -cd $(bindir) && $(rm) -f $(UTIL_PROGS) +@@ -466,10 +445,9 @@ DOCLIST=\ sleepycat utility install_docs: @echo "Installing documentation: $(docdir) ..." - @test -d $(docdir) || \ - ($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir)) -+ ${BSD_INSTALL_DATA_DIR} $(docdir) - @cd $(docdir) && $(rm) -rf $(DOCLIST) - @cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(docdir)/ +- @cd $(docdir) && $(rm) -rf $(DOCLIST) +- @cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(docdir)/ ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir) ++ @cd $(DESTDIR)$(docdir) && $(rm) -rf $(DOCLIST) ++ @cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ + uninstall_docs: + -cd $(docdir) && $(rm) -rf $(DOCLIST) |