1fc8cec516
with the "db4" package without problems. This is the first half of the fix for PR pkg/39500.
103 lines
3.5 KiB
Text
103 lines
3.5 KiB
Text
$NetBSD: patch-aa,v 1.1 2008/09/09 22:23:33 tron Exp $
|
|
|
|
--- dist/Makefile.in.orig 2007-07-05 19:35:02.000000000 +0100
|
|
+++ dist/Makefile.in 2008-09-09 22:33:08.000000000 +0100
|
|
@@ -11,7 +11,7 @@
|
|
bindir= @bindir@
|
|
includedir=@includedir@
|
|
libdir= @libdir@
|
|
-docdir= $(prefix)/docs
|
|
+docdir= $(prefix)/share/doc/db46
|
|
|
|
dmode= 755
|
|
emode= 555
|
|
@@ -41,7 +41,7 @@
|
|
LIBTOOL= @LIBTOOL@
|
|
|
|
POSTLINK= @POSTLINK@
|
|
-SOLINK= @MAKEFILE_SOLINK@
|
|
+SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@
|
|
SOFLAGS= @SOFLAGS@
|
|
LIBMAJOR= @DB_VERSION_MAJOR@
|
|
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
|
|
@@ -60,7 +60,7 @@
|
|
TEST_LIBS= @TEST_LIBS@
|
|
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
|
|
|
|
-libdb_base= libdb
|
|
+libdb_base= libdb46
|
|
libdb= $(libdb_base).a
|
|
libdb_version= $(libdb_base)-$(LIBVERSION).a
|
|
libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
|
|
@@ -79,7 +79,7 @@
|
|
XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
|
|
LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@
|
|
|
|
-libcxx_base= libdb_cxx
|
|
+libcxx_base= libdb46_cxx
|
|
libcxx= $(libcxx_base).a
|
|
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
|
|
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
|
|
@@ -105,9 +105,9 @@
|
|
JAVA_EXDIR= $(srcdir)/examples_java/src
|
|
JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat
|
|
|
|
-libj_jarfile= db.jar
|
|
+libj_jarfile= db4.jar
|
|
libj_exjarfile= dbexamples.jar
|
|
-libjso_base= libdb_java
|
|
+libjso_base= libdb46_java
|
|
libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
|
|
libjso_static= $(libjso_base)-$(LIBVERSION).a
|
|
libjso_target= $(libjso_base)-$(LIBVERSION).la
|
|
@@ -122,7 +122,7 @@
|
|
##################################################
|
|
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
|
|
LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
|
|
-libtso_base= libdb_tcl
|
|
+libtso_base= libdb46_tcl
|
|
libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
|
|
libtso_static= $(libtso_base)-$(LIBVERSION).a
|
|
libtso_target= $(libtso_base)-$(LIBVERSION).la
|
|
@@ -738,8 +738,7 @@
|
|
($(MKDIR) -p $(DESTDIR)$(includedir) && \
|
|
$(CHMOD) $(dmode) $(DESTDIR)$(includedir))
|
|
@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
|
|
- @$(CP) -p $(INCDOT) $(DESTDIR)$(includedir)
|
|
- @cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
|
|
+ ${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir)
|
|
|
|
uninstall_include:
|
|
@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
|
|
@@ -750,7 +749,7 @@
|
|
($(MKDIR) -p $(DESTDIR)$(libdir) && \
|
|
$(CHMOD) $(dmode) $(DESTDIR)$(libdir))
|
|
@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
|
|
- @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
|
|
+ @libtool --mode=install ${BSD_INSTALL_LIB} @INSTALL_LIBS@ $(DESTDIR)$(libdir)
|
|
@(cd $(DESTDIR)$(libdir) && \
|
|
test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
|
|
test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
|
|
@@ -774,11 +773,8 @@
|
|
($(MKDIR) -p $(DESTDIR)$(bindir) && \
|
|
$(CHMOD) $(dmode) $(DESTDIR)$(bindir))
|
|
@for i in $(UTIL_PROGS); do \
|
|
- test -f $$i.exe && i=$$i.exe || i=$$i; \
|
|
- $(RM) -f $(DESTDIR)$(bindir)/$$i; \
|
|
- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
|
|
- $(STRIP) $(DESTDIR)$(bindir)/$$i; \
|
|
- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \
|
|
+ target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
|
|
+ libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \
|
|
done
|
|
|
|
uninstall_utilities:
|
|
@@ -795,7 +791,7 @@
|
|
($(MKDIR) -p $(DESTDIR)$(docdir) && \
|
|
$(CHMOD) $(dmode) $(DESTDIR)$(docdir))
|
|
@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
|
|
- @cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
|
|
+ @cd $(srcdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/
|
|
|
|
uninstall_docs:
|
|
@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
|