Date: Wed, 12 Feb 2014 19:20:24 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343957 - in head/devel/matreshka: . files Message-ID: <201402121920.s1CJKOCg042682@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Feb 12 19:20:24 2014 New Revision: 343957 URL: http://svnweb.freebsd.org/changeset/ports/343957 QAT: https://qat.redports.org/buildarchive/r343957/ Log: devel/matreshka: Upgrade from version 0.5.0 to 0.6.0 One caveat: Firebird driver has been disabled. It doesn't build using GNAT 4.7. It will be reenabled by either a patch from the developer or when GNAT is rebased on GCC 4.9 Deleted: head/devel/matreshka/files/patch-Makefile.build Modified: head/devel/matreshka/Makefile head/devel/matreshka/distinfo head/devel/matreshka/files/patch-Makefile.install Modified: head/devel/matreshka/Makefile ============================================================================== --- head/devel/matreshka/Makefile Wed Feb 12 19:15:41 2014 (r343956) +++ head/devel/matreshka/Makefile Wed Feb 12 19:20:24 2014 (r343957) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= matreshka -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.6.0 CATEGORIES= devel MASTER_SITES= http://forge.ada-ru.org/matreshka/downloads/ @@ -14,14 +13,27 @@ LICENSE= BSD BUILD_DEPENDS= gprbuild>=20120510:${PORTSDIR}/devel/gprbuild -USES= ada gmake +USES= ada gmake pkgconfig +HAS_CONFIGURE= yes NO_MTREE= yes OPTIONS_DEFINE= SQLITE3 FIREBIRD PGSQL MYSQL ORACLE AMF OPTIONS_DEFAULT=SQLITE3 FIREBIRD PGSQL MYSQL +#FIREBIRD option requires Ada-2012; disable until new compiler arrives +#Excluding option breaks X_CONFIGURE_ENABLE, so manually set that too +OPTIONS_EXCLUDE=FIREBIRD +CONFIGURE_ARGS+= --disable-firebird + AMF_DESC= Build Ada Modeling Framework +SQLITE3_CONFIGURE_ENABLE= sqlite3 +FIREBIRD_CONFIGURE_ENABLE= firebird +PGSQL_CONFIGURE_ENABLE= postgresql +MYSQL_CONFIGURE_ENABLE= mysql +ORACLE_CONFIGURE_ENABLE= oracle +AMF_CONFIGURE_ENABLE= amf + MAKE_JOBS_UNSAFE= yes NO_LICENSES_INSTALL= yes @@ -30,28 +42,24 @@ MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMB .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFIREBIRD} -MAKE_ENV+= HAS_FIREBIRD=yes +CONFIGURE_ARGS+= --with-firebird-libdir=${LOCALBASE}/lib +USE_FIREBIRD= yes .endif .if ${PORT_OPTIONS:MMYSQL} -MAKE_ENV+= HAS_MYSQL=yes -.endif - -.if ${PORT_OPTIONS:MORACLE} -MAKE_ENV+= HAS_OCI=yes +USE_MYSQL= yes .endif .if ${PORT_OPTIONS:MPGSQL} -MAKE_ENV+= HAS_POSTGRESQL=yes +USE_PGSQL= yes .endif .if ${PORT_OPTIONS:MSQLITE3} -MAKE_ENV+= HAS_SQLITE3=yes +USE_SQLITE= yes .endif -.if ${PORT_OPTIONS:MAMF} -MAKE_ENV+= WANT_AMF=yes -.endif +pre-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config post-install: @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ Modified: head/devel/matreshka/distinfo ============================================================================== --- head/devel/matreshka/distinfo Wed Feb 12 19:15:41 2014 (r343956) +++ head/devel/matreshka/distinfo Wed Feb 12 19:20:24 2014 (r343957) @@ -1,2 +1,2 @@ -SHA256 (matreshka-0.5.0.tar.gz) = 09b7fd82f47d0e64ceaa1b538ed7f4e96351759ca10c0f307d0d20fec3bafe98 -SIZE (matreshka-0.5.0.tar.gz) = 32055197 +SHA256 (matreshka-0.6.0.tar.gz) = 0a84b7292c08f824c516fa4f7810dad5b0c585849c8993708a7cd3a44889e351 +SIZE (matreshka-0.6.0.tar.gz) = 32573172 Modified: head/devel/matreshka/files/patch-Makefile.install ============================================================================== --- head/devel/matreshka/files/patch-Makefile.install Wed Feb 12 19:15:41 2014 (r343956) +++ head/devel/matreshka/files/patch-Makefile.install Wed Feb 12 19:20:24 2014 (r343957) @@ -1,13 +1,13 @@ ---- Makefile.install.orig 2012-12-05 19:49:10.977713000 +0000 +--- Makefile.install.orig 2013-12-20 08:40:13.447414000 -0500 +++ Makefile.install -@@ -22,7 +22,11 @@ LIBEXT = dll +@@ -24,7 +24,11 @@ LIBEXT = dll EXEEXT = .exe endif -INSTALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql amf dd uml mofext ocl utp -+INSTALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql ++INSTALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql + -+ifdef WANT_AMF ++ifdef ENABLE_AMF +INSTALL_TARGETS += amf dd uml mofext ocl utp +endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121920.s1CJKOCg042682>