diff -urN /usr/ports/databases/dbconnect/Makefile databases/dbconnect/Makefile --- /usr/ports/databases/dbconnect/Makefile Mon Jul 23 16:51:29 2001 +++ databases/dbconnect/Makefile Tue Nov 5 19:51:08 2002 @@ -7,22 +7,50 @@ # PORTNAME= dbconnect -PORTVERSION= 0.2.0 +PORTVERSION= 0.2.4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -WRKSRC= ${WRKDIR}/${PORTNAME} +USE_REINPLACE= yes GNU_CONFIGURE= yes .if defined(WITH_MYSQL) -LIB_DEPENDS= mysqlclient:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --with-mysql=yes --with-mysqldir=${LOCALBASE} +LIB_DEPENDS+= mysqlclient:${PORTSDIR}/databases/mysql323-client +CONFIGURE_ARGS+= --with-mysql=yes \ + --with-mysqlinclude=${LOCALBASE}/include/mysql \ + --with-mysqllib=${LOCALBASE}/lib/mysql PLIST_SUB+= MYSQL="" .else PLIST_SUB+= MYSQL="@comment " .endif + +.if defined(WITH_PGSQL) +LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +CONFIGURE_ARGS+= --with-pgsql=yes \ + --with-pgsqlinclude=${LOCALBASE}/include \ + --with-pgsqllib=${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}|g ; \ + s|gcc|${CXX}|g ; \ + s|cp -f \.|${INSTALL_DATA} .|g' ${WRKSRC}/Makefile.in .include diff -urN /usr/ports/databases/dbconnect/distinfo databases/dbconnect/distinfo --- /usr/ports/databases/dbconnect/distinfo Mon Jul 23 16:51:29 2001 +++ databases/dbconnect/distinfo Sat Nov 2 13:29:46 2002 @@ -1 +1 @@ -MD5 (dbconnect-0.2.0.tar.gz) = c782a100ae10aeb7de16970986db66c8 +MD5 (dbconnect-0.2.4.tar.gz) = ba1d6612146519e4335a41965b80d811 diff -urN /usr/ports/databases/dbconnect/files/patch-configure databases/dbconnect/files/patch-configure --- /usr/ports/databases/dbconnect/files/patch-configure Thu Jan 1 09:00:00 1970 +++ databases/dbconnect/files/patch-configure Tue Nov 5 08:45:01 2002 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/databases/dbconnect/pkg-plist databases/dbconnect/pkg-plist --- /usr/ports/databases/dbconnect/pkg-plist Mon Jul 23 16:51:29 2001 +++ databases/dbconnect/pkg-plist Tue Nov 5 19:46:29 2002 @@ -3,6 +3,5 @@ lib/libdbconn.a lib/libdyndbconn.so %%MYSQL%%include/dbconnect_MYSQL.h -%%MYSQL%%include/mysql.h -%%MYSQL%%include/mysql_com.h -%%MYSQL%%include/mysql_version.h +%%PGSQL%%include/dbconnect_PGSQL.h +%%UNIXODBC%%include/dbconnect_ODBC.h