Date: Tue, 16 Jun 2015 23:17:42 +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: r389875 - in head/devel/florist-gpl: . files Message-ID: <201506162317.t5GNHg7j066157@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Jun 16 23:17:41 2015 New Revision: 389875 URL: https://svnweb.freebsd.org/changeset/ports/389875 Log: devel/florist-gpl: Upgrade version 2014 => 2015 This port now requires gprbuild. It's been simplified by removing NetBSD-specific file and unnecessary patch to configure.in. Since pconfig.DragonFly is the same as FreeBSD version, this patch was removed and FreeBSD version copied. The makefile is no longer BSD-make compatible, so gmake is also needed. Added: head/devel/florist-gpl/files/florist.gpr.in (contents, props changed) Deleted: head/devel/florist-gpl/files/patch-configure.in head/devel/florist-gpl/files/patch-florist.gpr head/devel/florist-gpl/files/pconfig.DragonFly head/devel/florist-gpl/files/pconfig.NetBSD Modified: head/devel/florist-gpl/Makefile head/devel/florist-gpl/distinfo head/devel/florist-gpl/files/patch-Makefile.in head/devel/florist-gpl/files/patch-c-posix-signals.c head/devel/florist-gpl/files/patch-c-posix.c head/devel/florist-gpl/files/patch-configure head/devel/florist-gpl/pkg-plist Modified: head/devel/florist-gpl/Makefile ============================================================================== --- head/devel/florist-gpl/Makefile Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/Makefile Tue Jun 16 23:17:41 2015 (r389875) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= florist-gpl -PORTVERSION= 2014 +PORTVERSION= 2015 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -12,11 +12,13 @@ COMMENT= POSIX Ada binding, IEEE Standar LICENSE= GPLv3 -USES= ada +BUILD_DEPENDS= gprbuild:${PORTSDIR}/devel/gprbuild + +USES= ada gmake GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/florist-src +SUB_FILES= florist.gpr post-extract: - ${CP} ${FILESDIR}/pconfig.* ${WRKSRC}/configs + (cd ${WRKSRC}/configs && ${CP} pconfig.FreeBSD pconfig.DragonFly) .include <bsd.port.mk> Modified: head/devel/florist-gpl/distinfo ============================================================================== --- head/devel/florist-gpl/distinfo Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/distinfo Tue Jun 16 23:17:41 2015 (r389875) @@ -1,2 +1,2 @@ -SHA256 (florist-gpl-2014-src.tar.gz) = 921dd400ce400b2a5e2e7337de0efd5d6bdd459b3f4deca8b17819b21cfd7070 -SIZE (florist-gpl-2014-src.tar.gz) = 273765 +SHA256 (florist-gpl-2015-src.tar.gz) = 5db1704450c379eb4c247f66a4605630bc2677f36fe385eeea115d5e283563e8 +SIZE (florist-gpl-2015-src.tar.gz) = 291558 Added: head/devel/florist-gpl/files/florist.gpr.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/florist-gpl/files/florist.gpr.in Tue Jun 16 23:17:41 2015 (r389875) @@ -0,0 +1,15 @@ +library project Florist is + + for Languages use ("Ada"); + + for Source_Dirs use ("../../include/florist"); + for Library_Dir use "../../lib/florist"; + for Library_Name use "florist"; + for Library_Kind use "static"; + for Externally_Built use "True"; + + package Linker is + for Linker_Options use ("-L%%PREFIX%%/lib", "-Wl,-R,%%PREFIX%%/lib"); + end Linker; + +end Florist; Modified: head/devel/florist-gpl/files/patch-Makefile.in ============================================================================== --- head/devel/florist-gpl/files/patch-Makefile.in Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/files/patch-Makefile.in Tue Jun 16 23:17:41 2015 (r389875) @@ -1,18 +1,19 @@ ---- Makefile.in.orig 2014-04-06 18:13:12.000000000 +0000 +--- Makefile.in.orig 2015-04-30 10:20:42 UTC +++ Makefile.in -@@ -187,8 +187,12 @@ distclean: - +@@ -171,7 +171,14 @@ distclean: clean # install floristlib + # make all files read-only to prevent recompilation install: -- mkdir -p $(PREFIX)/lib/gnat -- cp -pr floristlib $(PREFIX)/floristlib -- cp -p florist.gpr $(PREFIX)/lib/gnat +- gprinstall -Pflorist $(PROJECT_FLAGS) -a -p --prefix=$(PREFIX) --sources-subdir=floristlib --lib-subdir=floristlib --link-lib-subdir=floristlib +- chmod a-w $(PREFIX)/floristlib/* + mkdir -p $(DESTDIR)$(PREFIX)/lib/gnat \ + $(DESTDIR)$(PREFIX)/lib/florist \ + $(DESTDIR)$(PREFIX)/include/florist -+ $(BSD_INSTALL_DATA) floristlib/*.ad[bs] $(DESTDIR)$(PREFIX)/include/florist -+ $(BSD_INSTALL_DATA) floristlib/*.ali $(DESTDIR)$(PREFIX)/lib/florist -+ $(BSD_INSTALL_DATA) floristlib/*.a $(DESTDIR)$(PREFIX)/lib/florist -+ $(BSD_INSTALL_DATA) florist.gpr $(DESTDIR)$(PREFIX)/lib/gnat ++ $(BSD_INSTALL_DATA) gensrc/*.ad[bs] gensrc/threads/*.ad[bs] \ ++ libsrc/*.ad[bs] libsrc/threads/*.ad[bs] \ ++ $(DESTDIR)$(PREFIX)/include/florist ++ $(BSD_INSTALL_DATA) lib/*.ali $(DESTDIR)$(PREFIX)/lib/florist ++ $(BSD_INSTALL_DATA) lib/*.a $(DESTDIR)$(PREFIX)/lib/florist ++ $(BSD_INSTALL_DATA) ../florist.gpr $(DESTDIR)$(PREFIX)/lib/gnat - .PHONY: install clean distclean regen + .PHONY: all install clean distclean regen floristlib force Modified: head/devel/florist-gpl/files/patch-c-posix-signals.c ============================================================================== --- head/devel/florist-gpl/files/patch-c-posix-signals.c Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/files/patch-c-posix-signals.c Tue Jun 16 23:17:41 2015 (r389875) @@ -1,6 +1,6 @@ ---- c-posix-signals.c.orig 2014-04-06 18:13:12.000000000 +0000 +--- c-posix-signals.c.orig 2015-04-30 10:20:43 UTC +++ c-posix-signals.c -@@ -467,9 +467,9 @@ int guess_nsigs () { +@@ -468,9 +468,9 @@ int guess_nsigs () { */ #if defined(__APPLE__) @@ -12,7 +12,7 @@ #endif sigset_t set; -@@ -483,7 +483,7 @@ int guess_nsigs () { +@@ -484,7 +484,7 @@ int guess_nsigs () { result = sigismember (&set, sig); if (result == 1) { last_good = sig; Modified: head/devel/florist-gpl/files/patch-c-posix.c ============================================================================== --- head/devel/florist-gpl/files/patch-c-posix.c Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/files/patch-c-posix.c Tue Jun 16 23:17:41 2015 (r389875) @@ -1,4 +1,4 @@ ---- c-posix.c.orig 2014-04-06 18:13:12.000000000 +0000 +--- c-posix.c.orig 2015-04-30 10:20:43 UTC +++ c-posix.c @@ -721,6 +721,25 @@ typedef struct siginfo { Modified: head/devel/florist-gpl/files/patch-configure ============================================================================== --- head/devel/florist-gpl/files/patch-configure Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/files/patch-configure Tue Jun 16 23:17:41 2015 (r389875) @@ -1,6 +1,6 @@ ---- configure.orig 2014-02-21 17:12:41.000000000 +0000 +--- configure.orig 2014-12-12 09:05:56 UTC +++ configure -@@ -2757,10 +2757,18 @@ case ${UNAME_SYSTEM} in +@@ -2849,10 +2849,18 @@ case ${UNAME_SYSTEM} in echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE}; cp ./configs/pconfig.LynxOS ./pconfig.h.in; ;; Modified: head/devel/florist-gpl/pkg-plist ============================================================================== --- head/devel/florist-gpl/pkg-plist Tue Jun 16 23:02:53 2015 (r389874) +++ head/devel/florist-gpl/pkg-plist Tue Jun 16 23:17:41 2015 (r389875) @@ -1,8 +1,5 @@ include/florist/ada_streams.ads include/florist/ada_task_identification.ads -include/florist/deps.adb -include/florist/deps.ads -include/florist/deps_no_thread.adb include/florist/posix-asynchronous_io.adb include/florist/posix-asynchronous_io.ads include/florist/posix-c.adb @@ -126,6 +123,7 @@ lib/florist/posix-calendar.ali lib/florist/posix-condition_variables.ali lib/florist/posix-configurable_file_limits.ali lib/florist/posix-configurable_system_limits.ali +lib/florist/posix-error_codes.ali lib/florist/posix-file_locking.ali lib/florist/posix-file_status-extensions.ali lib/florist/posix-file_status.ali @@ -161,10 +159,12 @@ lib/florist/posix-unsafe_process_primiti lib/florist/posix-user_database.ali lib/florist/posix.ali lib/florist/posix_asynchronous_io.ali +lib/florist/posix_c.ali lib/florist/posix_calendar.ali lib/florist/posix_condition_variables.ali lib/florist/posix_configurable_file_limits.ali lib/florist/posix_configurable_system_limits.ali +lib/florist/posix_error_codes.ali lib/florist/posix_file_locking.ali lib/florist/posix_file_status.ali lib/florist/posix_files.ali @@ -193,4 +193,5 @@ lib/florist/posix_terminal_functions.ali lib/florist/posix_timers.ali lib/florist/posix_unsafe_process_primitives.ali lib/florist/posix_user_database.ali +lib/florist/system_storage_elements.ali lib/gnat/florist.gpr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506162317.t5GNHg7j066157>