Date: Sat, 30 Apr 2016 07:27:22 +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: r414334 - in head/ports-mgmt/synth: . files Message-ID: <201604300727.u3U7RMVD018235@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Apr 30 07:27:22 2016 New Revision: 414334 URL: https://svnweb.freebsd.org/changeset/ports/414334 Log: ports-mgmt/synth: Stop using bundled adacurses & IFM Now that the Ada Framework is based on GCC6 by default, it is no longer required for Synth to bundle and build a local version of devel/adacurses and misc/ini_file_manager. Switch the port to normal BUILD_DEPENDS and remove the bundle distfile information. No bump is required because these libraries are statically linked into Synth, so there's no practical difference between older and newer packages. Added: head/ports-mgmt/synth/files/ head/ports-mgmt/synth/files/patch-default.gpr (contents, props changed) Modified: head/ports-mgmt/synth/Makefile head/ports-mgmt/synth/distinfo Modified: head/ports-mgmt/synth/Makefile ============================================================================== --- head/ports-mgmt/synth/Makefile Sat Apr 30 07:16:46 2016 (r414333) +++ head/ports-mgmt/synth/Makefile Sat Apr 30 07:27:22 2016 (r414334) @@ -12,35 +12,20 @@ COMMENT= Custom package repository build 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) - -COBJFILES= ncurses_compat.o c_varargs_to_ada.o c_threaded_variables.o +GPR= ${LOCALBASE}/lib/gnat 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} \ Modified: head/ports-mgmt/synth/distinfo ============================================================================== --- head/ports-mgmt/synth/distinfo Sat Apr 30 07:16:46 2016 (r414333) +++ head/ports-mgmt/synth/distinfo Sat Apr 30 07:27:22 2016 (r414334) @@ -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 Added: head/ports-mgmt/synth/files/patch-default.gpr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/synth/files/patch-default.gpr Sat Apr 30 07:27:22 2016 (r414334) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604300727.u3U7RMVD018235>