diff options
Diffstat (limited to 'databases/db5/patches/patch-aa')
| -rw-r--r-- | databases/db5/patches/patch-aa | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/databases/db5/patches/patch-aa b/databases/db5/patches/patch-aa index 0e57afee774..4197cd38d96 100644 --- a/databases/db5/patches/patch-aa +++ b/databases/db5/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ +$NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $ ---- dist/Makefile.in.orig 2010-03-30 17:36:10.000000000 +0000 +--- dist/Makefile.in.orig 2010-08-27 15:08:03.000000000 +0000 +++ dist/Makefile.in -@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ +@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@ bindir= @bindir@ includedir=@includedir@ libdir= @libdir@ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ dmode= 755 emode= 555 -@@ -48,7 +48,7 @@ INSTALLER= @INSTALLER@ +@@ -54,7 +54,7 @@ INSTALLER= @INSTALLER@ LIBTOOL= @LIBTOOL@ POSTLINK= @POSTLINK@ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ SOFLAGS= @SOFLAGS@ LIBMAJOR= @DB_VERSION_MAJOR@ LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ -@@ -67,7 +67,7 @@ LIBS= @LIBSO_LIBS@ +@@ -73,7 +73,7 @@ LIBS= @LIBSO_LIBS@ TEST_LIBS= @TEST_LIBS@ LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ libdb= $(libdb_base).a libdb_version= $(libdb_base)-$(LIBVERSION).a libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@ -@@ -86,7 +86,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ +@@ -92,7 +92,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@ @@ -38,9 +38,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ libcxx= $(libcxx_base).a libcxx_version= $(libcxx_base)-$(LIBVERSION).a libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@ -@@ -151,9 +151,9 @@ JAVA_EXDIR= $(srcdir)/examples_java/src - JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat - JAVA_MANIFEST= $(srcdir)/java/jarManifestEntries +@@ -157,9 +157,9 @@ JAVA_EXDIR= $(exampledir)/java/src + JAVA_SLEEPYCAT= $(langdir)/java/src/com/sleepycat + JAVA_MANIFEST= $(langdir)/java/jarManifestEntries -libj_jarfile= db.jar +libj_jarfile= db5.jar @@ -50,18 +50,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ libjso_static= $(libjso_base)-$(LIBVERSION).a libjso_target= $(libjso_base)-$(LIBVERSION).la -@@ -168,7 +168,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g - ################################################## +@@ -175,7 +175,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@ LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@ + TCL_SRCDIR= $(langdir)/tcl -libtcl_base= libdb_tcl +libtcl_base= libdb5_tcl libtcl= $(libtcl_base).a libtcl_version= $(libtcl_base)-$(LIBVERSION).a libtso= $(libtcl_base)-$(LIBVERSION)@LIBTSO_MODSUFFIX@ -@@ -1050,8 +1050,7 @@ install_include: $(INCDOT) +@@ -1051,8 +1051,7 @@ install_include: $(INCDOT) @for f in $(INCDOT); do \ - basef=`echo $$f | sed 's,.*/,,'` ; \ + basef=`echo $$f | $(SED) 's,.*/,,'` ; \ $(RM) $(DESTDIR)$(includedir)/$$basef ; \ - $(CP) -p $$f $(DESTDIR)$(includedir) ; \ - $(CHMOD) $(fmode) $(DESTDIR)$(includedir)/$$basef ; \ @@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ done uninstall_include: -@@ -1066,7 +1065,7 @@ install_lib: +@@ -1067,7 +1066,7 @@ install_lib: ($(MKDIR) -p $(DESTDIR)$(libdir) && \ $(CHMOD) $(dmode) $(DESTDIR)$(libdir)) @cd $(DESTDIR)$(libdir) && $(RM) $(LIB_INSTALL_FILE_LIST) @@ -78,26 +78,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $ @(cd $(DESTDIR)$(libdir) && \ test -f $(libso) && $(LN) -s $(libso) $(libso_default); \ test -f $(libso) && $(LN) -s $(libso) $(libso_major); \ -@@ -1094,11 +1093,8 @@ install_utilities: - ($(MKDIR) -p $(DESTDIR)$(bindir) && \ - $(CHMOD) $(dmode) $(DESTDIR)$(bindir)) +@@ -1098,10 +1097,8 @@ install_utilities: @for i in $(UTIL_PROGS); do \ -- test -f $$i.exe && i=$$i.exe || i=$$i; \ -- $(RM) $(DESTDIR)$(bindir)/$$i; \ -- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \ -- $(STRIP) $(DESTDIR)$(bindir)/$$i; \ -- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \ -+ target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \ + test -f $$i.exe && i=$$i.exe; \ + e=`echo $$i | $(SED) '$(transform)'`; \ +- $(RM) $(DESTDIR)$(bindir)/$$e; \ +- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$e; \ +- $(STRIP) $(DESTDIR)$(bindir)/$$e; \ +- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$e; \ ++ target="${DESTDIR}${bindir}/$$e"; \ + libtool --mode=install $(BSD_INSTALL_PROGRAM) $$i $$target; \ done uninstall_utilities: -@@ -1116,7 +1112,7 @@ install_docs: +@@ -1123,7 +1120,7 @@ install_docs: ($(MKDIR) -p $(DESTDIR)$(docdir) && \ $(CHMOD) $(dmode) $(DESTDIR)$(docdir)) @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST) -- @cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ -+ @cd $(srcdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/ +- @cd $(topdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/ ++ @cd $(topdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/ uninstall_docs: @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST) |