Date: Sun, 4 Nov 2012 11:18:14 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306962 - in head/databases/libodbc++: . files Message-ID: <201211041118.qA4BIEQE070815@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fjoe Date: Sun Nov 4 11:18:13 2012 New Revision: 306962 URL: http://svn.freebsd.org/changeset/ports/306962 Log: - Update to 0.2.5 - OPTIONS'ify - Build and install documentation - Specify LICENSE Feature safe: yes Deleted: head/databases/libodbc++/files/patch-include-odbc++-drivermanager.h head/databases/libodbc++/files/patch-src-datahandler.cpp head/databases/libodbc++/files/patch-src-datahandler.h head/databases/libodbc++/files/patch-src-datastream.cpp head/databases/libodbc++/files/patch-src-datastream.h head/databases/libodbc++/files/patch-src-preparedstatement.cpp head/databases/libodbc++/files/patch-src-resultset.cpp head/databases/libodbc++/files/patch-src-resultsetmetadata.cpp head/databases/libodbc++/files/patch-src-statement.cpp Modified: head/databases/libodbc++/Makefile head/databases/libodbc++/distinfo head/databases/libodbc++/files/patch-Makefile.in Modified: head/databases/libodbc++/Makefile ============================================================================== --- head/databases/libodbc++/Makefile Sun Nov 4 10:54:18 2012 (r306961) +++ head/databases/libodbc++/Makefile Sun Nov 4 11:18:13 2012 (r306962) @@ -6,14 +6,19 @@ # PORTNAME= libodbc++ -PORTVERSION= 0.2.3 -PORTREVISION= 8 +PORTVERSION= 0.2.5 +PORTREVISION= 0 CATEGORIES= databases devel MASTER_SITES= SF/libodbcxx/libodbc%2B%2B/${PORTVERSION} MAINTAINER= fjoe@FreeBSD.org COMMENT= A C++ class library and toolset for ODBC access to data sources +LICENSE= GPLv2 + +BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen + +USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= pkgconfig @@ -21,35 +26,33 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-isqlxx CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CXXFLAGS+= ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include -# libodbc++ needs an ODBC driver manager to be installed, and it supports -# both iODBC and unixODBC. +OPTIONS_SINGLE= ODBC +OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_DEFAULT= ODBC IODBC -.if defined(WITH_IODBC) && defined(WITH_UNIXODBC) -IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC -.endif +.include <bsd.port.options.mk> -.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC) -WITH_UNIXODBC?= yes -.endif - -.if defined(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} -.elif defined(WITH_UNIXODBC) +.endif + +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS= odbc.2:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} .endif DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= INSTALL progref +PORTDOCS= progref -.ifdef NOPORTDOCS +.if defined(NOPORTDOCS) post-patch: - ${REINPLACE_CMD} '/install-data-am:/s/install-data-local//' \ - ${WRKSRC}/doc/Makefile.in - ${REINPLACE_CMD} '/install-data-am:/s/install-data-local//' \ - ${WRKSRC}/doc/progref/Makefile.in + ${REINPLACE_CMD} '/^SUBDIRS/s/=.*/=/' ${WRKSRC}/doc/Makefile.in +.else +post-extract: + ${RM} -f ${WRKSRC}/doc/progref/progref-stamp .endif .include <bsd.port.mk> Modified: head/databases/libodbc++/distinfo ============================================================================== --- head/databases/libodbc++/distinfo Sun Nov 4 10:54:18 2012 (r306961) +++ head/databases/libodbc++/distinfo Sun Nov 4 11:18:13 2012 (r306962) @@ -1,2 +1,2 @@ -SHA256 (libodbc++-0.2.3.tar.gz) = 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758 -SIZE (libodbc++-0.2.3.tar.gz) = 450097 +SHA256 (libodbc++-0.2.5.tar.bz2) = ba3030a27b34e4aafbececa2ddbbf42a38815e9534f34c051620540531b5e23e +SIZE (libodbc++-0.2.5.tar.bz2) = 362310 Modified: head/databases/libodbc++/files/patch-Makefile.in ============================================================================== --- head/databases/libodbc++/files/patch-Makefile.in Sun Nov 4 10:54:18 2012 (r306961) +++ head/databases/libodbc++/files/patch-Makefile.in Sun Nov 4 11:18:13 2012 (r306962) @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu May 13 04:22:06 2004 -+++ Makefile.in Thu May 13 04:22:20 2004 -@@ -140,7 +140,7 @@ +--- Makefile.in.orig 2009-08-21 04:41:27.000000000 +0700 ++++ Makefile.in 2012-11-03 18:11:42.000000000 +0700 +@@ -244,7 +244,7 @@ + m4/ac_check_odbc.m4 ACLOCAL_AMFLAGS = -I m4 - -pkgconfdir = $(libdir)/pkgconfig +pkgconfdir = $(prefix)/libdata/pkgconfig pkgconf_DATA = libodbc++.pc - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211041118.qA4BIEQE070815>