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.

12 files changed, 45 insertions, 77 deletions

diff --git a/devel/florist-gpl/Makefile b/devel/florist-gpl/Makefile
index 22b001bb174e..69f6718fded1 100644
--- a/devel/florist-gpl/Makefile
+++ b/devel/florist-gpl/Makefile
@@ -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 Standards 1003.5(b,c)
 
 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>
diff --git a/devel/florist-gpl/distinfo b/devel/florist-gpl/distinfo
index 05aa8c1fb9af..f0640bceebf0 100644
--- a/devel/florist-gpl/distinfo
+++ b/devel/florist-gpl/distinfo
@@ -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
diff --git a/devel/florist-gpl/files/florist.gpr.in b/devel/florist-gpl/files/florist.gpr.in
new file mode 100644
index 000000000000..4cf9f9a62bb6
--- /dev/null
+++ b/devel/florist-gpl/files/florist.gpr.in
@@ -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;
diff --git a/devel/florist-gpl/files/patch-Makefile.in b/devel/florist-gpl/files/patch-Makefile.in
index b0ba5f57305c..3ca80209d4f2 100644
--- a/devel/florist-gpl/files/patch-Makefile.in
+++ b/devel/florist-gpl/files/patch-Makefile.in
@@ -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
diff --git a/devel/florist-gpl/files/patch-c-posix-signals.c b/devel/florist-gpl/files/patch-c-posix-signals.c
index 74c364c54753..c9c0e8dce4fd 100644
--- a/devel/florist-gpl/files/patch-c-posix-signals.c
+++ b/devel/florist-gpl/files/patch-c-posix-signals.c
@@ -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;
diff --git a/devel/florist-gpl/files/patch-c-posix.c b/devel/florist-gpl/files/patch-c-posix.c
index c0dbf339aaf0..83c02a26e6eb 100644
--- a/devel/florist-gpl/files/patch-c-posix.c
+++ b/devel/florist-gpl/files/patch-c-posix.c
@@ -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 {
  
diff --git a/devel/florist-gpl/files/patch-configure b/devel/florist-gpl/files/patch-configure
index 36eaa76d3a52..c7f1f2c545d6 100644
--- a/devel/florist-gpl/files/patch-configure
+++ b/devel/florist-gpl/files/patch-configure
@@ -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;
      ;;
diff --git a/devel/florist-gpl/files/patch-configure.in b/devel/florist-gpl/files/patch-configure.in
deleted file mode 100644
index 2a35916f93ff..000000000000
--- a/devel/florist-gpl/files/patch-configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.in.orig	2014-02-21 17:12:41.000000000 +0000
-+++ configure.in
-@@ -114,10 +114,18 @@ case ${UNAME_SYSTEM} in
-     echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-     cp ./configs/pconfig.LynxOS ./pconfig.h.in;
-     ;;
-+ DragonFly)
-+    echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-+    cp ./configs/pconfig.DragonFly ./pconfig.h.in;
-+    ;;
-  FreeBSD)
-     echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-     cp ./configs/pconfig.FreeBSD ./pconfig.h.in;
-     ;;
-+ NetBSD)
-+    echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-+    cp ./configs/pconfig.NetBSD ./pconfig.h.in;
-+    ;;
-  Darwin)
-     echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-     cp ./configs/pconfig.Darwin ./pconfig.h.in;
diff --git a/devel/florist-gpl/files/patch-florist.gpr b/devel/florist-gpl/files/patch-florist.gpr
deleted file mode 100644
index 1712f3375f62..000000000000
--- a/devel/florist-gpl/files/patch-florist.gpr
+++ /dev/null
@@ -1,20 +0,0 @@
---- florist.gpr.orig	2014-04-06 18:13:12.000000000 +0000
-+++ florist.gpr
-@@ -1,12 +1,9 @@
- project Florist is
- 
--   for Source_Dirs use ("../../floristlib");
--   for Object_Dir use "../../floristlib";
--
--   for Externally_Built use "True";
--
--   package Linker is
--     for Linker_Options use ("-lflorist");
--   end Linker;
-+   for Languages use ("ada");
-+   for Source_Dirs use ("../../include/florist");
-+   for Library_Name use "florist";
-+   for Library_Dir use  "../../lib/florist";
-+   for Externally_Built use "true";
- 
- end Florist;
diff --git a/devel/florist-gpl/files/pconfig.DragonFly b/devel/florist-gpl/files/pconfig.DragonFly
deleted file mode 100644
index c47cae4ff151..000000000000
--- a/devel/florist-gpl/files/pconfig.DragonFly
+++ /dev/null
@@ -1,4 +0,0 @@
-#define _XOPEN_SOURCE
-#define _XOPEN_SOURCE_EXTENDED 1
-#define _REENTRANT
-#define _P1003_1B_VISIBLE
diff --git a/devel/florist-gpl/files/pconfig.NetBSD b/devel/florist-gpl/files/pconfig.NetBSD
deleted file mode 100644
index 453ae50d7403..000000000000
--- a/devel/florist-gpl/files/pconfig.NetBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-#define _POSIX_SOURCE
-#define _POSIX_C_SOURCE 199506L
-#define _XOPEN_SOURCE
-#define _XOPEN_SOURCE_EXTENDED 1
-#define _REENTRANT
-#define _P1003_1B_VISIBLE
diff --git a/devel/florist-gpl/pkg-plist b/devel/florist-gpl/pkg-plist
index d3c4dfb104cc..f72b4edf5de6 100644
--- a/devel/florist-gpl/pkg-plist
+++ b/devel/florist-gpl/pkg-plist
@@ -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_primitives.ali
 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