From owner-svn-ports-all@FreeBSD.ORG Wed May 7 23:45:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2641F254; Wed, 7 May 2014 23:45:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 08818E19; Wed, 7 May 2014 23:45:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47NjbdQ056656; Wed, 7 May 2014 23:45:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47Njb5R056653; Wed, 7 May 2014 23:45:37 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405072345.s47Njb5R056653@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 7 May 2014 23:45:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353229 - in head/databases/dbconnect: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 23:45:38 -0000 Author: bapt Date: Wed May 7 23:45:37 2014 New Revision: 353229 URL: http://svnweb.freebsd.org/changeset/ports/353229 QAT: https://qat.redports.org/buildarchive/r353229/ Log: Fix build Convert to USES=gmake pgsql Convert to unix file format Added: head/databases/dbconnect/files/patch-src_base_dbconnectTypes.h (contents, props changed) Modified: head/databases/dbconnect/Makefile head/databases/dbconnect/files/patch-src-base-baseValue.cpp Modified: head/databases/dbconnect/Makefile ============================================================================== --- head/databases/dbconnect/Makefile Wed May 7 23:38:02 2014 (r353228) +++ head/databases/dbconnect/Makefile Wed May 7 23:45:37 2014 (r353229) @@ -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 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 Modified: head/databases/dbconnect/files/patch-src-base-baseValue.cpp ============================================================================== --- head/databases/dbconnect/files/patch-src-base-baseValue.cpp Wed May 7 23:38:02 2014 (r353228) +++ head/databases/dbconnect/files/patch-src-base-baseValue.cpp Wed May 7 23:45:37 2014 (r353229) @@ -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 ++#include + + #include "dbconnectExceptions.h" +