Index: branches/2014Q4/devel/matreshka/Makefile
===================================================================
--- branches/2014Q4/devel/matreshka/Makefile	(revision 370971)
+++ branches/2014Q4/devel/matreshka/Makefile	(revision 370972)
@@ -1,66 +1,57 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	matreshka
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ada-ru.org/matreshka/downloads/
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Ada framework for information systems development
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
 
 USES=		ada gmake pkgconfig
 HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 
 OPTIONS_DEFINE=	SQLITE3 FIREBIRD PGSQL MYSQL ORACLE AMF
 OPTIONS_DEFAULT=SQLITE3 PGSQL
 
 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
 
+MYSQL_USE=			MYSQL=yes
+PGSQL_USES=			pgsql
+SQLITE3_USE=			SQLITE=yes
+FIREBIRD_USE=			FIREBIRD=yes
+
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_ENV+=	SMP_MFLAGS=-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFIREBIRD}
 CONFIGURE_ARGS+= --with-firebird-libdir=${LOCALBASE}/lib
-USE_FIREBIRD= yes
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL= yes
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE3}
-USE_SQLITE= yes
-.endif
-
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} config
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so \
+		${STAGEDIR}${PREFIX}/bin/wsdl2ada
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
 	   ${SORT} >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
-	   ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: branches/2014Q4/devel/matreshka/files/patch-Makefile.build
===================================================================
--- branches/2014Q4/devel/matreshka/files/patch-Makefile.build	(nonexistent)
+++ branches/2014Q4/devel/matreshka/files/patch-Makefile.build	(revision 370972)
@@ -0,0 +1,29 @@
+--- Makefile.build.orig	2013-09-18 07:12:40.852703000 +0000
++++ Makefile.build
+@@ -1,5 +1,6 @@
+ include Makefile.config
+ 
++GNATMAKE = gnatmake
+ GPRBUILD_FLAGS = -p $(SMP_MFLAGS)
+ 
+ ALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql
+@@ -31,6 +32,19 @@ endif
+ all: $(ALL_TARGETS)
+ 
+ league:
++ifneq (, $(findstring x86,$(ARCHITECTURE)))
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_utilities.adb
++ifeq ($(ARCHITECTURE), x86)
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse.adb
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse2.ads
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-generic_x86_sse2.adb
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2.ads
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2_popcnt.ads
++endif
++ifeq ($(ARCHITECTURE), x86_64)
++	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_64_popcnt.ads
++endif
++endif
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_league.gpr
+ 
+ xml: league

Property changes on: branches/2014Q4/devel/matreshka/files/patch-Makefile.build
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in
===================================================================
--- branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in	(nonexistent)
+++ branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in	(revision 370972)
@@ -0,0 +1,10 @@
+--- Makefile.config.in.orig	2013-12-22 22:34:01.201864000 +0000
++++ Makefile.config.in
+@@ -1,6 +1,7 @@
+ 
+ VERSION = @VERSION@
+ RTL_VERSION = @RTL_VERSION_SUFFIX@
++ARCHITECTURE = @ARCHITECTURE@
+ OPERATING_SYSTEM = @OPERATING_SYSTEM@
+ 
+ PREFIX = @PREFIX@

Property changes on: branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 370971)
+++ branches/2014Q4	(revision 370972)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r370966