3 files changed, 45 insertions, 35 deletions

diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index d1650098228b..3f5d8638a00c 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -3,15 +3,16 @@
 
 PORTNAME=	dbconnect
 PORTVERSION=	0.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/DBConnect%20API%200.3%20Source%20Code/DBConnect%20API%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Use C++ object API to allow applications to connect to databases
 
+USES=		gmake dos2unix
+
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 
@@ -21,7 +22,6 @@ LDFLAG+=	${PTHREAD_LIBS}
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
@@ -37,7 +37,7 @@ PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 CONFIGURE_ARGS+=	--enable-pgsql=yes \
 			--with-pgsql_include=${LOCALBASE}/include \
 			--with-pgsql_lib=${LOCALBASE}/lib
@@ -53,14 +53,14 @@ post-patch:
 
 do-install:
 	@cd ${WRKSRC}; \
-	${CP} -r include/dbconn ${PREFIX}/include/; \
+	${CP} -r include/dbconn ${STAGEDIR}${PREFIX}/include/; \
 	for lib in `find lib -type l -name *.so`; do \
 		libpath=`${DIRNAME} $${lib}`; \
 		libname=`${BASENAME} $${lib}|${SED} -e 's/\.so$$//'`; \
-		${INSTALL_DATA} $${libpath}/$${libname}-${PORTVERSION}.so \
-			${PREFIX}/lib; \
-		(cd ${PREFIX}/lib; ${LN} -fs $${libname}-${PORTVERSION}.so \
-			$${libname}.so); \
+		${INSTALL_LIB} $${libpath}/$${libname}-${PORTVERSION}.so \
+			${STAGEDIR}${PREFIX}/lib; \
+		${LN} -fs $${libname}-${PORTVERSION}.so \
+			${STAGEDIR}${PREFIX}/lib/$${libname}.so; \
 	done
 
 .include <bsd.port.mk>
diff --git a/databases/dbconnect/files/patch-src-base-baseValue.cpp b/databases/dbconnect/files/patch-src-base-baseValue.cpp
index 29d1a212fbb9..ed3e496197a4 100644
--- a/databases/dbconnect/files/patch-src-base-baseValue.cpp
+++ b/databases/dbconnect/files/patch-src-base-baseValue.cpp
@@ -1,30 +1,30 @@
 --- src/base/baseValue.cpp.orig	Sun Jan 28 14:13:03 2007
 +++ src/base/baseValue.cpp	Sun Jan 28 14:14:42 2007
 @@ -49,11 +49,11 @@
-       base = 10;

- 

-    // Only convert the first valid chars.

--   char *end = (char*)((int)nptr + strlen(nptr)-1);

-+   char *end = (char*)((long)nptr + strlen(nptr)-1);

-    for (i=0; i<strlen(nptr); i++)

-       if (!isdigit(nptr[i]) && nptr[i] != '+' && nptr[i] != '-')

-       {

--         end = (char*)((int)nptr + i -1);

-+         end = (char*)((long)nptr + i -1);

-          break;	

-       }

- 

+       base = 10;
+ 
+    // Only convert the first valid chars.
+-   char *end = (char*)((int)nptr + strlen(nptr)-1);
++   char *end = (char*)((long)nptr + strlen(nptr)-1);
+    for (i=0; i<strlen(nptr); i++)
+       if (!isdigit(nptr[i]) && nptr[i] != '+' && nptr[i] != '-')
+       {
+-         end = (char*)((int)nptr + i -1);
++         end = (char*)((long)nptr + i -1);
+          break;	
+       }
+ 
 @@ -91,11 +91,11 @@
-       base = 10;

- 

-    //Only convert the first valid chars.

--   char *end = (char*)((int)nptr + strlen(nptr)-1);

-+   char *end = (char*)((long)nptr + strlen(nptr)-1);

-    for (i=0; i<strlen(nptr); i++)

-       if (!isdigit(nptr[i]) && nptr[i] != '+')

-       {

--         end = (char*)((int)nptr + i -1);

-+         end = (char*)((long)nptr + i -1);

-          break;	

-       }

-             

+       base = 10;
+ 
+    //Only convert the first valid chars.
+-   char *end = (char*)((int)nptr + strlen(nptr)-1);
++   char *end = (char*)((long)nptr + strlen(nptr)-1);
+    for (i=0; i<strlen(nptr); i++)
+       if (!isdigit(nptr[i]) && nptr[i] != '+')
+       {
+-         end = (char*)((int)nptr + i -1);
++         end = (char*)((long)nptr + i -1);
+          break;	
+       }
+             
diff --git a/databases/dbconnect/files/patch-src_base_dbconnectTypes.h b/databases/dbconnect/files/patch-src_base_dbconnectTypes.h
new file mode 100644
index 000000000000..706796957ec5
--- /dev/null
+++ b/databases/dbconnect/files/patch-src_base_dbconnectTypes.h
@@ -0,0 +1,10 @@
+--- src/base/dbconnectTypes.h.orig	2003-08-18 19:17:35.000000000 +0200
++++ src/base/dbconnectTypes.h	2014-05-08 01:40:11.776003075 +0200
+@@ -23,6 +23,7 @@
+ #define __DBCONN_TYPES_H__
+ 
+ #include <string>
++#include <stdlib.h>
+ 
+ #include "dbconnectExceptions.h"
+