7 files changed, 89 insertions, 45 deletions

diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 4aaaa85a4e82..d8ce695345c0 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -7,22 +7,33 @@
 #
 
 PORTNAME=	dbconnect
-PORTVERSION=	0.2.4
+PORTVERSION=	0.3.4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sem@ciam.ru
 COMMENT=	Use C++ object API to allow applications to connect to databases
 
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_AUTOCONF_VER=	257
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+INSTALLS_SHLIB=	yes
 
-.if defined(WITH_MYSQL)
+CXXFLAGS+=	${PTHREAD_CFLAGS} -fPIC -DFREEBSD
+LDFLAG+=	${PTHREAD_LIBS}
+
+OPTIONS=	MYSQL "With MySQL driver" on \
+		PGSQL "With PostgreSQL driver" off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_MYSQL)
 USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql=yes \
-			--with-mysqlinclude=${LOCALBASE}/include/mysql \
-			--with-mysqllib=${LOCALBASE}/lib/mysql
+CONFIGURE_ARGS+=	--enable-mysql=yes \
+			--with-mysql_include=${LOCALBASE}/include/mysql \
+			--with-mysql_lib=${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
 .else
 PLIST_SUB+=	MYSQL="@comment "
@@ -30,28 +41,27 @@ PLIST_SUB+=	MYSQL="@comment "
 
 .if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql7
-CONFIGURE_ARGS+=	--with-pgsql=yes \
-			--with-pgsqlinclude=${LOCALBASE}/include \
-			--with-pgsqllib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--enable-pgsql=yes \
+			--with-pgsql_include=${LOCALBASE}/include \
+			--with-pgsql_lib=${LOCALBASE}/lib
 PLIST_SUB+=	PGSQL=""
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_UNIXODBC)
-LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-unixodbc=yes \
-			--with-unixodbcinclude=${LOCALBASE}/include \
-			--with-unixodbclib=${LOCALBASE}/lib
-PLIST_SUB+=	UNIXODBC=""
-.else
-PLIST_SUB+=	UNIXODBC="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|g++|${CXX}|g ; \
-		 s|@CFLAGS@|${CXXFLAGS} -fPIC|g ; \
-		 s|gcc|${CXX}|g ; \
-		 s|cp -f \.|${INSTALL_DATA} .|g' ${WRKSRC}/Makefile.in
+	@${RM} -f ${WRKSRC}/include/dbconn/README
+
+do-install:
+	@cd ${WRKSRC}; \
+	${CP} -r include/dbconn ${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); \
+	done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/dbconnect/distinfo b/databases/dbconnect/distinfo
index e37b75f02338..fb9a201afb13 100644
--- a/databases/dbconnect/distinfo
+++ b/databases/dbconnect/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbconnect-0.2.4.tar.gz) = ba1d6612146519e4335a41965b80d811
-SIZE (dbconnect-0.2.4.tar.gz) = 208817
+MD5 (dbconnect-0.3.4.tar.gz) = d287404feb99d912a5a1bd3b42d427a0
+SIZE (dbconnect-0.3.4.tar.gz) = 118477
diff --git a/databases/dbconnect/files/patch-configure b/databases/dbconnect/files/patch-configure
deleted file mode 100644
index 753a714e9f1e..000000000000
--- a/databases/dbconnect/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Nov  8 02:31:32 2001
-+++ configure	Tue Nov  5 08:44:51 2002
-@@ -640,7 +640,7 @@
- 
- 
- 
--prefix="/usr/local/dbconnect"
-+#prefix="/usr/local/dbconnect"
- 
- 
- 
diff --git a/databases/dbconnect/files/patch-configure.in b/databases/dbconnect/files/patch-configure.in
new file mode 100644
index 000000000000..0ee3660b6be3
--- /dev/null
+++ b/databases/dbconnect/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Fri Mar  5 22:34:26 2004
++++ configure.in	Fri Mar  5 22:34:40 2004
+@@ -76,8 +76,6 @@
+                  [AC_MSG_ERROR([Unable to find required header file])])
+ 
+ AC_C_BIGENDIAN
+-FIND_DYN_LIB(pthread, pthread_create)
+-FIND_DYN_LIB(dl, dlopen)
+ 
+ 
+ dnl Checks for Programs.
diff --git a/databases/dbconnect/files/patch-src::driver_mysql::mysqlBindParam.cpp b/databases/dbconnect/files/patch-src::driver_mysql::mysqlBindParam.cpp
new file mode 100644
index 000000000000..35195fa95721
--- /dev/null
+++ b/databases/dbconnect/files/patch-src::driver_mysql::mysqlBindParam.cpp
@@ -0,0 +1,10 @@
+--- src/driver_mysql/mysqlBindParam.cpp.orig	Sat Mar  6 03:45:41 2004
++++ src/driver_mysql/mysqlBindParam.cpp	Sat Mar  6 03:45:59 2004
+@@ -18,7 +18,7 @@
+  *
+  */
+ 
+-
++#include <stdio.h>
+ #include "mysqlBindParam.h"
+ #include "dbconnectTypes.h"
diff --git a/databases/dbconnect/files/patch-src::driver_pgsql-7::pgsqlBindParam.cpp b/databases/dbconnect/files/patch-src::driver_pgsql-7::pgsqlBindParam.cpp
new file mode 100644
index 000000000000..ed5f967d7f86
--- /dev/null
+++ b/databases/dbconnect/files/patch-src::driver_pgsql-7::pgsqlBindParam.cpp
@@ -0,0 +1,10 @@
+--- src/driver_pgsql-7/pgsqlBindParam.cpp.orig	Sat Mar  6 03:47:23 2004
++++ src/driver_pgsql-7/pgsqlBindParam.cpp	Sat Mar  6 03:47:41 2004
+@@ -18,7 +18,7 @@
+  *
+  */
+ 
+-
++#include <stdio.h>
+ #include "pgsqlBindParam.h"
+ #include "dbconnectTypes.h"
diff --git a/databases/dbconnect/pkg-plist b/databases/dbconnect/pkg-plist
index ccf9515fa18a..67ffe523c139 100644
--- a/databases/dbconnect/pkg-plist
+++ b/databases/dbconnect/pkg-plist
@@ -1,7 +1,21 @@
-include/dbconn.h
-include/dbconnect_basedriver.h
-lib/libdbconn.a
-lib/libdyndbconn.so
-%%MYSQL%%include/dbconnect_MYSQL.h
-%%PGSQL%%include/dbconnect_PGSQL.h
-%%UNIXODBC%%include/dbconnect_ODBC.h
+include/dbconn/baseConnection.h
+include/dbconn/baseException.h
+include/dbconn/baseFieldDescription.h
+include/dbconn/baseQuery.h
+include/dbconn/baseValue.h
+include/dbconn/configFile.h
+include/dbconn/dbconnect.h
+include/dbconn/dbconnectExceptions.h
+include/dbconn/dbconnectTypes.h
+include/dbconn/dlLoader.h
+include/dbconn/hexDigest.h
+include/dbconn/jDate.h
+include/dbconn/simpleThreads.h
+include/dbconn/smartPointer.h
+%%MYSQL%%lib/dbconndrv-mysql-0.3.4.so
+%%MYSQL%%lib/dbconndrv-mysql.so
+%%PGSQL%%lib/dbconndrv-postgresql-0.3.4.so
+%%PGSQL%%lib/dbconndrv-postgresql.so
+lib/libdbconnect-0.3.4.so
+lib/libdbconnect.so
+@dirrm include/dbconn