Index: head/ports-mgmt/synth/Makefile
===================================================================
--- head/ports-mgmt/synth/Makefile	(revision 414333)
+++ head/ports-mgmt/synth/Makefile	(revision 414334)
@@ -1,66 +1,51 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	synth
 PORTVERSION=	1.34
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Custom package repository builder for FreeBSD and DragonFly
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-#BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/${IFM}.gpr:misc/${IFM} \
-#		${LOCALBASE}/lib/gnat/${AC}.gpr:devel/${AC}
+BUILD_DEPENDS=	${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
+		${GPR}/adacurses.gpr:devel/adacurses
 
 USES=		ada:6 ncurses:port
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
-GH_PROJECT=	synth_external:bundle
-GH_TAGNAME=	v1.3:bundle
 
-# When framework is moved to Ada6, the ada-util and ini-file-manager
-# libraries can be used as prebuilt (switch default.gpr url)
-# ncurses:port is required for FreeBSD 11 and DragonFly (base ncurses
-# malfunctions in that it won't restore TTY mode correctly)
+GPR=		${LOCALBASE}/lib/gnat
 
-COBJFILES=	ncurses_compat.o c_varargs_to_ada.o c_threaded_variables.o
-
 post-extract:
-	@${MV} ${WRKSRC_bundle}/external ${WRKSRC}
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
-		${WRKSRC}/external/lib/gnat/adacurses.gpr \
 		${WRKSRC}/src/definitions.ads
 
 do-build:
-	# To avoid requiring gprbuild as a dependency, compile C manually
-.for csrc in ${COBJFILES:R}
-	(cd ${WRKSRC}/external/include/adacurses && \
-		${SETENV} ${MAKE_ENV} gcc -I. ${CFLAGS} -c ${csrc}.c \
-		-o ../../build/adacurses/${csrc}.o)
-.endfor
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
 		gcc -c unix_core.c -o ../build/unix_core.o)
 	(cd ${WRKSRC}/synthexec && ${SETENV} ${MAKE_ENV} \
 		gcc synthexec.c -o ../build/synthexec)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P default \
 		-largs build/unix_core.o)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions \
 		${STAGEDIR}/var/log/synth \
 		${STAGEDIR}/var/synth/live_packages
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synth \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synthexec \
 		${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/synth.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/shell-completers/_synth.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/shell-completers/_synth \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/synth/distinfo
===================================================================
--- head/ports-mgmt/synth/distinfo	(revision 414333)
+++ head/ports-mgmt/synth/distinfo	(revision 414334)
@@ -1,4 +1,2 @@
 SHA256 (jrmarino-synth-v1.34_GH0.tar.gz) = c7f0150ff1ee12cb6006797bc2c7b0c4a2b1478f689b7d0f73b02a420d57bcb2
 SIZE (jrmarino-synth-v1.34_GH0.tar.gz) = 101000
-SHA256 (jrmarino-synth_external-v1.3_GH0.tar.gz) = 2afc03e494d2394446eabdb5244967c202a79b449c7cad7ea67a87807cc25f44
-SIZE (jrmarino-synth_external-v1.3_GH0.tar.gz) = 209283
Index: head/ports-mgmt/synth/files/patch-default.gpr
===================================================================
--- head/ports-mgmt/synth/files/patch-default.gpr	(nonexistent)
+++ head/ports-mgmt/synth/files/patch-default.gpr	(revision 414334)
@@ -0,0 +1,13 @@
+--- default.gpr.orig	2016-04-19 08:59:22 UTC
++++ default.gpr
+@@ -1,8 +1,5 @@
+-with "external/lib/gnat/ini_file_manager.gpr";
+-with "external/lib/gnat/adacurses.gpr";
+-
+---  with "ini_file_manager.gpr";
+---  with "adacurses.gpr";
++with "ini_file_manager.gpr";
++with "adacurses.gpr";
+ 
+ project Default is
+ 

Property changes on: head/ports-mgmt/synth/files/patch-default.gpr
___________________________________________________________________
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