[Midnightbsd-cvs] mports [17787] trunk/databases/db48: update build

[laffer1 at midnightbsd.org]

Revision: 17787
          http://svnweb.midnightbsd.org/mports/?rev=17787
Author:   laffer1
Date:     2014-10-30 19:50:25 -0400 (Thu, 30 Oct 2014)
Log Message:
-----------
update build

Modified Paths:
--------------
    trunk/databases/db48/Makefile
    trunk/databases/db48/pkg-descr

Added Paths:
-----------
    trunk/databases/db48/files/patch-dbinc_mutex_int.h
    trunk/databases/db48/files/patch-dist__configure

Removed Paths:
-------------
    trunk/databases/db48/files/patch-dist::configure

Modified: trunk/databases/db48/Makefile
===================================================================
--- trunk/databases/db48/Makefile	2014-10-30 12:09:57 UTC (rev 17786)
+++ trunk/databases/db48/Makefile	2014-10-30 23:50:25 UTC (rev 17787)
@@ -2,8 +2,9 @@
 
 PORTNAME=	db48
 PORTVERSION=	4.8.30.0
+PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
+MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
@@ -19,12 +20,15 @@
 		--libdir=${PREFIX}/lib/${PORTNAME} \
 		--bindir=${PREFIX}/bin/${PORTNAME}
 CONFIGURE_SCRIPT=	../dist/configure
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install_include install_lib install_utilities
-LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 USE_LDCONFIG=	yes
 
+post-patch:
+	${REINPLACE_CMD} -Ee 's|--mode=install cp -p|--mode=install ${INSTALL} -s|;' ${WRKSRC}/${CONFIGURE_SCRIPT}
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib

Added: trunk/databases/db48/files/patch-dbinc_mutex_int.h
===================================================================
--- trunk/databases/db48/files/patch-dbinc_mutex_int.h	                        (rev 0)
+++ trunk/databases/db48/files/patch-dbinc_mutex_int.h	2014-10-30 23:50:25 UTC (rev 17787)
@@ -0,0 +1,11 @@
+--- ../dbinc/mutex_int.h.orig	2010-04-12 13:25:22.000000000 -0700
++++ ../dbinc/mutex_int.h	2014-06-28 01:16:48.321255725 -0700
+@@ -596,7 +596,7 @@
+ 	 : "=&r" (__r), "+r" (tsl)
+ 	 :
+ 	 : "cr0", "memory");
+-	 return (int)tsl;
++	 return (tsl != 0);
+ }
+ 
+ static inline int


Property changes on: trunk/databases/db48/files/patch-dbinc_mutex_int.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/databases/db48/files/patch-dist::configure
===================================================================
--- trunk/databases/db48/files/patch-dist::configure	2014-10-30 12:09:57 UTC (rev 17786)
+++ trunk/databases/db48/files/patch-dist::configure	2014-10-30 23:50:25 UTC (rev 17787)
@@ -1,13 +0,0 @@
---- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
-+++ ../dist/configure	Wed Dec  5 13:24:01 2001
-@@ -20867,8 +20867,8 @@
- 
- MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
--MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
-+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
- MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
- MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
--MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
- MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
- 

Copied: trunk/databases/db48/files/patch-dist__configure (from rev 17786, trunk/databases/db48/files/patch-dist::configure)
===================================================================
--- trunk/databases/db48/files/patch-dist__configure	                        (rev 0)
+++ trunk/databases/db48/files/patch-dist__configure	2014-10-30 23:50:25 UTC (rev 17787)
@@ -0,0 +1,13 @@
+--- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
++++ ../dist/configure	Wed Dec  5 13:24:01 2001
+@@ -20867,8 +20867,8 @@
+ 
+ MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
+-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
++MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
+ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
+ MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
+-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
++MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
+ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
+ 

Modified: trunk/databases/db48/pkg-descr
===================================================================
--- trunk/databases/db48/pkg-descr	2014-10-30 12:09:57 UTC (rev 17786)
+++ trunk/databases/db48/pkg-descr	2014-10-30 23:50:25 UTC (rev 17787)
@@ -8,4 +8,4 @@
 be confident that Oracle Berkeley DB will manage your persistence
 needs.
 
-WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
+WWW: http://www.oracle.com/us/products/database/berkeley-db/db/