openbsd-ports
[Top] [All Lists]

databases/db modification

To: ports@openbsd.org
Subject: databases/db modification
From: Nils Nordman <nino@nforced.com>
Date: Sun, 26 Aug 2001 18:03:11 +0200
Mail-followup-to: ports@openbsd.org
Sender: owner-ports@openbsd.org
User-agent: Mutt/1.3.20i
Hi,

I include modifications below for the db-3 port.
The problem?

Currently the port failes miserably in producing correct links in 
any way, producing links with the wrong names pointing to non-existent
files. Included below is updated files for patches/patch-dist_Makefile_in 
and pkg/PFRAG.shared. Considering the relative small size of these files 
I include the new files below in their entirety as well as attaching 
them.

Comment and/or commit.

/Nils


pkg/PFRAG.shared:
-----------------

@comment $OpenBSD: PFRAG.shared,v 1.2 2000/12/28 17:14:10 matt Exp $
lib/libdb-3.1.la
lib/libdb-3.so.3.1
lib/libdb.so.3.1
lib/libdb_cxx-3.1.la
lib/libdb_cxx-3.so.3.1
lib/libdb_cxx.so.3.1
lib/libdb-3.1.so.0.0
lib/libdb_cxx-3.1.so.0.0
DYNLIBDIR(%D/lib)


patches/patch-dist_Makefile_in:
-------------------------------

$OpenBSD: patch-dist_Makefile_in,v 1.2 2001/07/28 02:56:56 brad Exp $
--- dist/Makefile.in.orig       Tue Jul 18 17:37:57 2000
+++ dist/Makefile.in    Sun Aug 26 16:56:50 2001
@@ -35,10 +35,11 @@ libdb=              libdb.a
 
 libso_base=    libdb
 libso_linkname=        $(libso_base)-$(SOVERSION).la
-libso=         $(libso_base)-$(SOVERSION).@SOSUFFIX@
+libso=         $(libso_base)-$(SOVERSION).@SOSUFFIX@.0.0
 libso_target=  $(libso_base)-$(SOVERSION).la
-libso_default= $(libso_base).@SOSUFFIX@
-libso_major=   $(libso_base)-$(SOMAJOR).@SOSUFFIX@
+libso_default= $(libso_base).@SOSUFFIX@.$(SOVERSION)
+libso_major=   $(libso_base)-$(SOMAJOR).@SOSUFFIX@.$(SOVERSION)
+
 
 ##################################################
 # C++
@@ -49,10 +50,10 @@ libso_major=        $(libso_base)-$(SOMAJOR).@S
 ##################################################
 libcxx=                libdb_cxx.a
 libxso_base=   libdb_cxx
-libxso=                $(libxso_base)-$(SOVERSION).@SOSUFFIX@
+libxso=                $(libxso_base)-$(SOVERSION).@SOSUFFIX@.0.0
 libxso_target= $(libxso_base)-$(SOVERSION).la
-libxso_default=        $(libxso_base).@SOSUFFIX@
-libxso_major=  $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
+libxso_default=        $(libxso_base).@SOSUFFIX@.$(SOVERSION)
+libxso_major=  $(libxso_base)-$(SOMAJOR).@SOSUFFIX@.$(SOVERSION)
 
 ##################################################
 # JAVA
@@ -71,10 +72,10 @@ JAVA_DBDIR= $(JAVA_SRCDIR)/com/sleepycat
 JAVA_EXDIR=    $(JAVA_SRCDIR)/com/sleepycat/examples
 
 libjso_base=   libdb_java
-libjso=                $(libjso_base)-$(SOVERSION).@SOSUFFIX@
+libjso=                $(libjso_base)-$(SOVERSION).@SOSUFFIX@.0.0
 libjso_target= $(libjso_base)-$(SOVERSION).la
-libjso_default=        $(libjso_base).@SOSUFFIX@
-libjso_major=  $(libjso_base)-$(SOMAJOR).@SOSUFFIX@
+libjso_default=        $(libjso_base).@SOSUFFIX@.$(SOVERSION)
+libjso_major=  $(libjso_base)-$(SOMAJOR).@SOSUFFIX@.$(SOVERSION)
 libjso_g=      $(libjso_base)-$(SOVERSION)_g.@SOSUFFIX@
 
 ##################################################
@@ -86,10 +87,10 @@ libjso_g=   $(libjso_base)-$(SOVERSION)_g.
 ##################################################
 TCFLAGS=       @TCFLAGS@
 libtso_base=   libdb_tcl
-libtso=                $(libtso_base)-$(SOVERSION).@SOSUFFIX@
+libtso=                $(libtso_base)-$(SOVERSION).@SOSUFFIX@.0.0
 libtso_target= $(libtso_base)-$(SOVERSION).la
-libtso_default=        $(libtso_base).@SOSUFFIX@
-libtso_major=  $(libtso_base)-$(SOMAJOR).@SOSUFFIX@
+libtso_default=        $(libtso_base).@SOSUFFIX@.$(SOVERSION)
+libtso_major=  $(libtso_base)-$(SOMAJOR).@SOSUFFIX@.$(SOVERSION)
 
 ##################################################
 # DB_DUMP185 UTILITY
@@ -112,7 +113,7 @@ exec_prefix=@exec_prefix@
 bindir=        @bindir@
 includedir=@includedir@
 libdir=        @libdir@
-docdir=        $(prefix)/docs
+docdir=        $(prefix)/share/doc/db
 
 dmode= 755
 emode= 555
@@ -426,7 +427,6 @@ install_dynamic: install_setup
        @$(INSTALLER) $(libso_target) $(libdir)
        @cd $(libdir) && $(ln) -s $(libso) $(libso_default)
        @cd $(libdir) && $(ln) -s $(libso) $(libso_major)
-       @$(LIBTOOL) --mode=finish $(libdir)
 
 install_dynamic_cxx: install_setup
        @echo "Installing DB C++ library: $(libdir) ..."

Attachment: PFRAG.shared
Description: Text document

Attachment: patch-dist_Makefile_in
Description: Text document

<Prev in Thread] Current Thread [Next in Thread>