devel/florist: Upgrade from version 3.15p to GPL 2012

From its beginning, Florist required a gcc 3.x series Ada compiler to build,
and this compiler hasn't been building for most platforms for quite some
time.  With the recent import of lang/gcc-aux which accepts
USE_LANGUAGES+= ada, it's possible to build Florist again.

1) Update to Adacore-maintained version, GPL 2012
2) Update the license (GPLv3)

The time elapsed between versions is approximately 12 years, but no
Changelog exists to show what has been updated.

26 files changed, 190 insertions, 357 deletions

diff --git a/devel/florist/DESCR b/devel/florist/DESCR
index f089865646b..fb6c559374d 100644
--- a/devel/florist/DESCR
+++ b/devel/florist/DESCR
@@ -1,9 +1,12 @@
-Florist is the FSU open-source implementaton
-of IEEE Standard 1003.5b-1996, the POSIX Ada
-binding, including real-time extensions. This
-software provides access to the UNIX operating
-system services for application programs
-written in the Ada programming language.
+Florist was produced by students and faculty of the Florida State University
+Department of Computer Science, under contract to the US Department of
+Defense, Defense Information Systems Agency, as a product of the POSIX Ada
+Real-Time (PART) Project. When the contract was completed, in 1999, FSU turned
+maintenance of Florist over to Ada Core Technologies, Inc.). The latest and
+most complete free version is available from <http://libre.adacore.com>.
 
-Florist is written in Ada and requires an
-installed Ada compiler.
+FLORIST is an implementation of the IEEE Standards 1003.5: 1992,
+IEEE STD 1003.5b: 1996, and parts of IEEE STD 1003.5c: 1998, also known as
+the POSIX Ada Bindings.
+
+Florist is written in Ada and requires an installed Ada compiler.
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index f1a6acf63cf..97e1728280e 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,56 +1,23 @@
-# $NetBSD: Makefile,v 1.13 2011/04/22 13:43:18 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/09 05:52:14 marino Exp $
 #
 
-DISTNAME=		florist-3.15p-src
-PKGNAME=		florist-3.15p
-PKGREVISION=		3
+DISTNAME=		florist-gpl-2012-src
+PKGNAME=		florist-gpl-2012
 CATEGORIES=		devel
-MASTER_SITES=		http://www.cs.fsu.edu/~baker/ftp/
+MASTER_SITES=		http://downloads.dragonlace.net/src/ \
+			http://dragonlace.mirrors.ada.cx/src/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		shannonjr@NetBSD.org
-HOMEPAGE=		http://www.cs.fsu.edu/~baker/florist.html
-COMMENT=		FSU implementation of POSIX.5 (Ada binding)
+MAINTAINER=		draco@marino.st
+HOMEPAGE=		http://libre.adacore.com
+COMMENT=		POSIX Ada Binding, IEEE Standards 1003.5(b,c)
+LICENCE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_AUTOCONF=		yes
-USE_TOOLS+=		autoconf213 gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-# This package requires an Ada compiler. Two are available:
-# 1) lang/gcc34-ada and 2) lang/gcc34 built with Ada option
-# If USE_GCC_34=YES this package will use gcc34. Otherwise,
-# it will use gcc34-ada
-BUILD_DEFS+=	USE_GCC_34
-USE_GCC_34?=	NO
+USE_LANGUAGES=		c ada
 
 post-extract:
-	${CP} ${FILESDIR}/pconfig.NetBSD ${WRKSRC}/configs
-
-pre-configure:
-.if !empty(USE_GCC_34:M[Yy][Ee][Ss])
-.  include "../../lang/gcc34/preconfigure.mk"
-.else
-.  include "../../lang/gcc34-ada/preconfigure.mk"
-.endif
-	cd ${WRKSRC}; autoconf
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/florist
-	${INSTALL_DATA} ${WRKSRC}/floristlib/*.ad[sb] \
-		${WRKSRC}/floristlib/*.ali \
-		${DESTDIR}${PREFIX}/lib/florist
-	${INSTALL_DATA} ${WRKSRC}/floristlib/libflorist.a \
-		${DESTDIR}${PREFIX}/lib
+	${CP} ${FILESDIR}/pconfig.* ${WRKSRC}/configs
 
-.if !empty(USE_GCC_34:M[Yy][Ee][Ss])
-.  include "../../lang/gcc34/buildlink3.mk"
-.else
-.  include "../../lang/gcc34-ada/buildlink3.mk"
-.endif
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/florist/PLIST b/devel/florist/PLIST
index 662ac8c4eea..7fb894da5aa 100644
--- a/devel/florist/PLIST
+++ b/devel/florist/PLIST
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:48:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/07/09 05:52:14 marino Exp $
 lib/florist/ada_streams.ads
 lib/florist/ada_streams.ali
 lib/florist/ada_task_identification.ads
 lib/florist/ada_task_identification.ali
 lib/florist/deps.adb
 lib/florist/deps.ads
-lib/florist/deps5c.adb
-lib/florist/deps5c.ads
 lib/florist/deps_no_thread.adb
-lib/florist/gnatprep.adb
-lib/florist/gnatprep.ads
 lib/florist/posix-asynchronous_io.adb
 lib/florist/posix-asynchronous_io.ads
 lib/florist/posix-asynchronous_io.ali
@@ -29,8 +25,6 @@ lib/florist/posix-configurable_system_limits.adb
 lib/florist/posix-configurable_system_limits.ads
 lib/florist/posix-configurable_system_limits.ali
 lib/florist/posix-error_codes.ads
-lib/florist/posix-event_management.adb
-lib/florist/posix-event_management.ads
 lib/florist/posix-file_locking.adb
 lib/florist/posix-file_locking.ads
 lib/florist/posix-file_locking.ali
@@ -106,19 +100,15 @@ lib/florist/posix-shared_memory_objects.ali
 lib/florist/posix-signals.adb
 lib/florist/posix-signals.ads
 lib/florist/posix-signals.ali
-lib/florist/posix-sockets-internet.adb
-lib/florist/posix-sockets-internet.ads
-lib/florist/posix-sockets-iso.ads
-lib/florist/posix-sockets-local.adb
-lib/florist/posix-sockets-local.ads
-lib/florist/posix-sockets.adb
-lib/florist/posix-sockets.ads
 lib/florist/posix-supplement_to_ada_io.adb
 lib/florist/posix-supplement_to_ada_io.ads
 lib/florist/posix-supplement_to_ada_io.ali
 lib/florist/posix-terminal_functions.adb
 lib/florist/posix-terminal_functions.ads
 lib/florist/posix-terminal_functions.ali
+lib/florist/posix-timers-extensions.adb
+lib/florist/posix-timers-extensions.ads
+lib/florist/posix-timers-extensions.ali
 lib/florist/posix-timers.adb
 lib/florist/posix-timers.ads
 lib/florist/posix-timers.ali
@@ -128,12 +118,6 @@ lib/florist/posix-unsafe_process_primitives.ali
 lib/florist/posix-user_database.adb
 lib/florist/posix-user_database.ads
 lib/florist/posix-user_database.ali
-lib/florist/posix-xti-internet.adb
-lib/florist/posix-xti-internet.ads
-lib/florist/posix-xti-iso.ads
-lib/florist/posix-xti-mosi.ads
-lib/florist/posix-xti.adb
-lib/florist/posix-xti.ads
 lib/florist/posix.adb
 lib/florist/posix.ads
 lib/florist/posix.ali
@@ -206,4 +190,5 @@ lib/florist/posix_unsafe_process_primitives.ali
 lib/florist/posix_user_database.ads
 lib/florist/posix_user_database.ali
 lib/florist/system_storage_elements.ads
+lib/gnat/florist.gpr
 lib/libflorist.a
diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk
index b53c33ab1ab..8f6f2bbdfc9 100644
--- a/devel/florist/buildlink3.mk
+++ b/devel/florist/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:21 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2012/07/09 05:52:14 marino Exp $
 
 BUILDLINK_TREE+=	florist
 
 .if !defined(FLORIST_BUILDLINK3_MK)
 FLORIST_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.florist+=	florist>=3.15p
-BUILDLINK_ABI_DEPENDS.florist+=	florist>=3.15pnb2
+BUILDLINK_API_DEPENDS.florist+=	florist>=2012
+BUILDLINK_ABI_DEPENDS.florist+=	florist>=2012
 BUILDLINK_PKGSRCDIR.florist?=	../../devel/florist
 .endif # FLORIST_BUILDLINK3_MK
 
diff --git a/devel/florist/distinfo b/devel/florist/distinfo
index 1535847e522..a491533aaee 100644
--- a/devel/florist/distinfo
+++ b/devel/florist/distinfo
@@ -1,19 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/10/20 17:43:29 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/07/09 05:52:14 marino Exp $
 
-SHA1 (florist-3.15p-src.tgz) = 1f901f25e4d3d450fa75cd8b0a200e3690282cd7
-RMD160 (florist-3.15p-src.tgz) = 57ff4d445f46d4b5631aad43fa5d8e401de8e353
-Size (florist-3.15p-src.tgz) = 264898 bytes
-SHA1 (patch-aa) = 622d42742a78bad89f8367f92d4931450ec365e5
-SHA1 (patch-ab) = b6e182ae9db5960378c047bf84b3a3fe979027a7
-SHA1 (patch-ac) = 2b5c58039a2254e36aa450b9b1f69bd9f6d513b4
-SHA1 (patch-ad) = 7a9d761e139c0265239cd56bc97366f60b03c80f
-SHA1 (patch-ae) = 5ef23709667be534df25de79fee5d9e1f59b537f
-SHA1 (patch-af) = 962377e3d5eb17da9e08c5a5448bdc76ee8d4bb9
-SHA1 (patch-ag) = 6b0227ef192134adcb78360a15b9cf1a465576f9
-SHA1 (patch-ah) = c5f45e058e805ff576d8984f50e783dd77d9bd5b
-SHA1 (patch-ai) = 9bdba9b09b855c5a46ea3a2329a4c7a952314a18
-SHA1 (patch-aj) = 112cec272ebaf54d61547b13a421a59ac8130705
-SHA1 (patch-ak) = 5f8468ae9fa9c1384fa75a7d4f1f3f469ba9409a
-SHA1 (patch-al) = 1b6c29b51cbebb0970f9c0ee376d38fdf8dd4153
-SHA1 (patch-am) = accafdb30808b498dfbaf6128227daa1dc71db65
-SHA1 (patch-an) = 4da2f7f5738500d68a5510f6016f4cc17683e83e
+SHA1 (florist-gpl-2012-src.tgz) = 9d0c2dfbb565a92830cb5ea5894bd64d67993061
+RMD160 (florist-gpl-2012-src.tgz) = 53e759e65647c87f0d1b691dd0830e56d77c1fab
+Size (florist-gpl-2012-src.tgz) = 224141 bytes
+SHA1 (patch-Makefile.in) = ef32b8000c1732f42131219ca556025433a3f98d
+SHA1 (patch-c-posix-signals.c) = e7d3525e3410ef3798b93a94b4293643816f39df
+SHA1 (patch-c-posix.c) = efe55c8905f91fdc338a1829b06255c8a79a02a0
+SHA1 (patch-configure) = 79b3d8838c0891cef2db932e39e8cc031d442085
+SHA1 (patch-configure.in) = 4c8fd189bf1a25c1ba68652564a32c2b9d4a5e35
diff --git a/devel/florist/files/pconfig.DragonFly b/devel/florist/files/pconfig.DragonFly
new file mode 100644
index 00000000000..c47cae4ff15
--- /dev/null
+++ b/devel/florist/files/pconfig.DragonFly
@@ -0,0 +1,4 @@
+#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
+#define _REENTRANT
+#define _P1003_1B_VISIBLE
diff --git a/devel/florist/files/pconfig.NetBSD b/devel/florist/files/pconfig.NetBSD
index 60685c92499..453ae50d740 100644
--- a/devel/florist/files/pconfig.NetBSD
+++ b/devel/florist/files/pconfig.NetBSD
@@ -4,4 +4,3 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 #define _REENTRANT
 #define _P1003_1B_VISIBLE
-#include <sys/featuretest.h>
diff --git a/devel/florist/patches/patch-Makefile.in b/devel/florist/patches/patch-Makefile.in
new file mode 100644
index 00000000000..ed4c60e11b7
--- /dev/null
+++ b/devel/florist/patches/patch-Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/07/09 05:52:14 marino Exp $
+
+--- Makefile.in.orig	2012-05-10 13:32:06.000000000 +0000
++++ Makefile.in
+@@ -187,8 +187,9 @@ distclean:
+ 
+ # install floristlib
+ install:
+-	mkdir -p $(PREFIX)/lib/gnat
+-	cp -pr floristlib $(PREFIX)/floristlib
+-	cp -p florist.gpr $(PREFIX)/lib/gnat
++	mkdir -p $(DESTDIR)$(PREFIX)/lib/gnat $(DESTDIR)$(PREFIX)/lib/florist
++	cp -pr floristlib/* $(DESTDIR)$(PREFIX)/lib/florist
++	mv $(DESTDIR)$(PREFIX)/lib/florist/libflorist.a $(DESTDIR)$(PREFIX)/lib/
++	cp -p florist.gpr $(DESTDIR)$(PREFIX)/lib/gnat
+ 
+ .PHONY: install clean distclean regen
diff --git a/devel/florist/patches/patch-aa b/devel/florist/patches/patch-aa
deleted file mode 100644
index c56ed795b66..00000000000
--- a/devel/florist/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- c-posix.c.orig	2002-10-24 02:03:51.000000000 -0600
-+++ c-posix.c
-@@ -571,7 +571,7 @@ typedef struct siginfo {
- #endif
-   GT2(si_signo, int)
-   GT2(si_code, int)
--  GT2(si_value, union sigval)
-+  GT2(si_sigval, union sigval)
-   GT3
- 
- /* sigevent must precede aiocb
-@@ -2788,7 +2788,11 @@ void create_limits() {
- #endif
- 
- #ifdef SEM_VALUE_MAX
-+#if SEM_VALUE_MAX > INT_MAX
-+  gmaxnn("Semaphores_Value",INT_MAX);
-+#else
-   gmaxnn("Semaphores_Value",SEM_VALUE_MAX);
-+#endif
- #else
- #ifdef _POSIX_SEM_VALUE_MAX
-   gmaxn("Semaphores_Value",_POSIX_SEM_VALUE_MAX);
-@@ -6344,7 +6348,7 @@ void create_c() {
-   g_struct_msghdr();
-   gcmnt("local socket address");
-   { struct sockaddr_un DUMMY;
--    ifprintf(fp,"   subtype sun_path_string is
-+    ifprintf(fp,"   subtype sun_path_string is \
-       POSIX_String (1 .. %d);\n", sizeof (DUMMY.sun_path));
-   }
-   g_struct_sockaddr_un();
diff --git a/devel/florist/patches/patch-ab b/devel/florist/patches/patch-ab
deleted file mode 100644
index 1ee6ed983f2..00000000000
--- a/devel/florist/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- configure.in.orig	Tue Jun  3 03:55:13 2003
-+++ configure.in	Tue Jun  3 03:58:10 2003
-@@ -104,6 +104,10 @@
-     echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-     cp ./configs/pconfig.LynxOS ./pconfig.h.in;
-     ;;
-+ NetBSD)
-+    echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-+    cp ./configs/pconfig.NetBSD ./pconfig.h.in;
-+    ;;
-  *)
-    echo "No Configuration for ${UNAME_SYSTEM}. Using default.";
-    cp ./configs/pconfig.Default ./pconfig.h.in;
-@@ -177,7 +181,8 @@
-   AC_POSIX_LIB(pthreads, pthread_self,,
-   AC_POSIX_LIB(cma, pthread_self,,
-   AC_POSIX_LIB(:libcma.a, pthread_self,,
--  AC_POSIX_LIB(thread, pthread_self))))))
-+  AC_POSIX_LIB(thread, pthread_self,,
-+  AC_POSIX_LIB(c_r, pthread_self)))))))
- fi
- 
- AC_POSIX_LIB(aio, aio_read)
diff --git a/devel/florist/patches/patch-ac b/devel/florist/patches/patch-ac
deleted file mode 100644
index fe5172e8566..00000000000
--- a/devel/florist/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-implementation.gpb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-implementation.gpb
-@@ -50,6 +50,8 @@ with Ada.Exceptions,
-      Unchecked_Conversion;
- package body POSIX.Implementation is
- 
-+   pragma Warnings (Off);
-+
-    use POSIX.C;
- 
-    package SIM renames System.Interrupt_Management;
diff --git a/devel/florist/patches/patch-ad b/devel/florist/patches/patch-ad
deleted file mode 100644
index b07aa720ab9..00000000000
--- a/devel/florist/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-io.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-io.adb
-@@ -631,6 +631,7 @@ package body POSIX.IO is
-       To   : in Boolean := True) is
-       Flags : Bits;
-       Result : int;
-+      pragma Warnings (Off, Result);
-    begin
-       Begin_Critical_Section;
-       Flags := To_Bits (fcntl (int (File), F_GETFD));
diff --git a/devel/florist/patches/patch-ae b/devel/florist/patches/patch-ae
deleted file mode 100644
index 7ecf72a727c..00000000000
--- a/devel/florist/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-message_queues.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-message_queues.adb
-@@ -350,7 +350,7 @@ package body POSIX.Message_Queues is
-             size_t ((Message'Size + char'Size - 1) / char'Size),
-             unsigned (Priority));
-          Check_NNeg_And_Restore_Signals
--           (int (Result), Masked_Signals, Old_Mask'Unchecked_Access);
-+           (Result, Masked_Signals, Old_Mask'Unchecked_Access);
-       end Send;
- 
-       ---------------
diff --git a/devel/florist/patches/patch-af b/devel/florist/patches/patch-af
deleted file mode 100644
index e1e3961760e..00000000000
--- a/devel/florist/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-permissions.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-permissions.adb
-@@ -105,7 +105,7 @@ package body POSIX.Permissions is
-    procedure Set_Allowed_Process_Permissions
-      (Permissions : in Permission_Set;
-       Old_Perms   : out Permission_Set) is
--      Mask : mode_t :=
-+      Mask : constant mode_t :=
-         not (Form_C_Permission (Permissions) and File_Access_Permission_Bits);
-    begin
-       Cached_Umask := Mask;
diff --git a/devel/florist/patches/patch-ag b/devel/florist/patches/patch-ag
deleted file mode 100644
index 6ede1cae798..00000000000
--- a/devel/florist/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-process_environment.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-process_environment.adb
-@@ -443,7 +443,7 @@ package body POSIX.Process_Environment i
-    procedure Copy_Environment
-      (Source : in Environment;
-       Target : in out Environment) is
--      T_Source : POSIX_String_List := To_POSIX_String_List (Source);
-+      T_Source : constant POSIX_String_List := To_POSIX_String_List (Source);
-       T_Target : POSIX_String_List;
-       procedure Copy_One (Str : POSIX_String; Done : in out Boolean);
-       procedure Copy_One (Str : POSIX_String; Done : in out Boolean) is
-@@ -490,7 +490,8 @@ package body POSIX.Process_Environment i
-        Undefined : POSIX.POSIX_String := "")
-       return POSIX.POSIX_String is
-       c_name : POSIX_String := Name & NUL;
--      Result : char_ptr := Getenv (c_name (c_name'First)'Unchecked_Access);
-+      Result : constant char_ptr :=
-+         Getenv (c_name (c_name'First)'Unchecked_Access);
-    begin
-       Validate (Name);
-       if Result = null then return Undefined; end if;
-@@ -568,7 +569,7 @@ package body POSIX.Process_Environment i
-          while P.all /= null loop
-             --  .... concise but inefficient
-             declare
--               S : POSIX_String := Form_POSIX_String (P.all);
-+               S : constant POSIX_String := Form_POSIX_String (P.all);
-                J : constant Integer := Split_Point (S);
-             begin
-                Append (Strings, S (1 .. J - 1));
diff --git a/devel/florist/patches/patch-ah b/devel/florist/patches/patch-ah
deleted file mode 100644
index 30da8464b42..00000000000
--- a/devel/florist/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-process_identification.gpb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-process_identification.gpb
-@@ -213,7 +213,7 @@ package body POSIX.Process_Identificatio
-       Name_Ptr : char_ptr;
-    begin
-       Name_Ptr := getlogin;
--      if (Name_Ptr = null) then Raise_POSIX_Error; end if;
-+      if Name_Ptr = null then Raise_POSIX_Error; end if;
-       return Form_POSIX_String (Name_Ptr);
-    end Get_Login_Name;
- 
diff --git a/devel/florist/patches/patch-ai b/devel/florist/patches/patch-ai
deleted file mode 100644
index 64aaf365df7..00000000000
--- a/devel/florist/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-process_primitives.gpb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-process_primitives.gpb
-@@ -49,6 +49,8 @@ with POSIX,
-      Unchecked_Deallocation;
- package body POSIX.Process_Primitives is
- 
-+   pragma Warnings (Off);
-+
-    use POSIX.C,
-        POSIX.Implementation,
-        POSIX.Process_Identification,
diff --git a/devel/florist/patches/patch-aj b/devel/florist/patches/patch-aj
deleted file mode 100644
index b5c0699e1b3..00000000000
--- a/devel/florist/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-process_scheduling.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-process_scheduling.adb
-@@ -104,7 +104,7 @@ package body POSIX.Process_Scheduling is
-    begin
-       Check (sched_getparam
-         (To_pid_t (Process), Params.Param'Unchecked_Access));
--      return Scheduling_Parameters (Params);
-+      return Params;
-    end Get_Scheduling_Parameters;
- 
-    -----------------------------
diff --git a/devel/florist/patches/patch-ak b/devel/florist/patches/patch-ak
deleted file mode 100644
index bc45bf92b6c..00000000000
--- a/devel/florist/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-process_times.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-process_times.adb
-@@ -64,7 +64,7 @@ package body POSIX.Process_Times is
-       t : Process_Times;
-    begin
-       t.Elapsed_Real_Time := times (t.tms'Unchecked_Access);
--      return Process_Times (t);
-+      return t;
-    end Get_Process_Times;
- 
-    ----------------------------
diff --git a/devel/florist/patches/patch-al b/devel/florist/patches/patch-al
deleted file mode 100644
index af5b1a5c5cd..00000000000
--- a/devel/florist/patches/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-signals.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-signals.adb
-@@ -236,13 +236,6 @@ package body POSIX.Signals is
-    --  Global Data --
-    ------------------
- 
--   Last_Unblocker : array (Signal) of Task_ID :=
--     (others => Null_Task);
--   pragma Volatile_Components (Last_Unblocker);
--   --  Holds the ID of the last Task which Unblocked this Interrupt.
--   --  It contains Null_Task if no tasks have ever requested the
--   --  Unblocking operation or the Interrupt is currently Blocked.
--
-    type Signal_Bit_Vector is array (Signal) of Boolean;
- 
-    --  Reserved_Signal is the union of the following sets of
-@@ -941,7 +934,7 @@ package body POSIX.Signals is
- 
-    function Get_Data (Info : Signal_Info) return Signal_Data is
-    begin
--      return To_Signal_Data (Info.si_value);
-+      return To_Signal_Data (Info.si_sigval);
-    end Get_Data;
- 
-    ----------------
-@@ -952,7 +945,7 @@ package body POSIX.Signals is
-      (Info : in out Signal_Info;
-       Data : in Signal_Data) is
-    begin
--      Info.si_value := To_sigval (Data);
-+      Info.si_sigval := To_sigval (Data);
-    end Set_Data;
- 
-    -----------------------
diff --git a/devel/florist/patches/patch-am b/devel/florist/patches/patch-am
deleted file mode 100644
index 7a56f82dbc3..00000000000
--- a/devel/florist/patches/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-supplement_to_ada_io.adb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-supplement_to_ada_io.adb
-@@ -113,6 +113,7 @@ package body POSIX.Supplement_to_Ada_IO 
- 
-       F   : System_File_Type;
-       Ret : int;
-+      pragma Warnings (Off, Ret);
- 
-    begin
-       F := To_SFT (File);
-@@ -126,6 +127,7 @@ package body POSIX.Supplement_to_Ada_IO 
- 
-       F   : System_File_Type;
-       Ret : int;
-+      pragma Warnings (Off, Ret);
- 
-    begin
-       F := To_SFT (File);
diff --git a/devel/florist/patches/patch-an b/devel/florist/patches/patch-an
deleted file mode 100644
index 65347cfb08b..00000000000
--- a/devel/florist/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2005/10/20 17:43:29 wiz Exp $
-
---- posix-unsafe_process_primitives.gpb.orig	2002-10-24 02:03:52.000000000 -0600
-+++ posix-unsafe_process_primitives.gpb
-@@ -47,6 +47,8 @@ with POSIX.C,
-      Unchecked_Conversion;
- package body POSIX.Unsafe_Process_Primitives is
- 
-+   pragma Warnings (Off);
-+
-    use POSIX.C,
-        POSIX.Implementation;
- 
diff --git a/devel/florist/patches/patch-c-posix-signals.c b/devel/florist/patches/patch-c-posix-signals.c
new file mode 100644
index 00000000000..75d8bac2473
--- /dev/null
+++ b/devel/florist/patches/patch-c-posix-signals.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-c-posix-signals.c,v 1.1 2012/07/09 05:52:14 marino Exp $
+
+--- c-posix-signals.c.orig	2012-05-10 13:32:15.000000000 +0000
++++ c-posix-signals.c
+@@ -467,9 +467,9 @@ int guess_nsigs () {
+  */
+ 
+ #if defined(__APPLE__)
+-# define BADSIG (0)
++# define FLOR_BADSIG (0)
+ #else
+-# define BADSIG (-1)
++# define FLOR_BADSIG (-1)
+ #endif
+ 
+    sigset_t set;
+@@ -483,7 +483,7 @@ int guess_nsigs () {
+       result = sigismember (&set, sig);
+       if (result == 1) {
+          last_good = sig;
+-      } else if ((result == BADSIG) && (first_bad == -1)) {
++      } else if ((result == FLOR_BADSIG) && (first_bad == -1)) {
+          if (sig == 0) {
+             fprintf (stderr, "WARNING: C library problem? "
+              "sigfillset does not include zero\n");
diff --git a/devel/florist/patches/patch-c-posix.c b/devel/florist/patches/patch-c-posix.c
new file mode 100644
index 00000000000..3df486f243d
--- /dev/null
+++ b/devel/florist/patches/patch-c-posix.c
@@ -0,0 +1,59 @@
+$NetBSD: patch-c-posix.c,v 1.5 2012/07/09 05:52:14 marino Exp $
+
+--- c-posix.c.orig	2012-05-10 13:32:15.000000000 +0000
++++ c-posix.c
+@@ -689,6 +689,25 @@ typedef struct siginfo {
+ 
+ /* sigevent must precede aiocb
+  */
++#if defined(__DragonFly__)
++/*
++ * union _sigev_info {
++ *  int   sigev_signo;
++ *  int   sigev_notify_kqueue;
++ *  void *sigev_notify_attributes;
++ * };
++ * sizeof(union _sigev_info) = sizeof(int)
++ * Use "int" rather than fooling with union
++ * For simplicity, The Ada part is only going to list sigev_signo
++ * as the other two elements of the union are unused.
++ */
++  GT1(sigevent, 1)
++  GT2(sigev_notify, int)
++  GT2(sigev_signo, int)
++  GT2(sigev_value, union sigval)
++  GT2(sigev_notify_function, void (*)(union sigval))
++  GT3
++#else  /* __DragonFly__ */
+ #ifdef HAVE_struct_sigevent
+   GT1(sigevent, 1)
+ #else
+@@ -711,6 +730,7 @@ struct sigevent {
+   GT2(sigev_notify_attributes,pthread_attr_t *)
+ #endif
+   GT3
++#endif /* __DragonFly__ */
+ 
+ #ifdef HAVE_struct_aiocb
+   GT1(aiocb, 1)
+@@ -5130,9 +5150,9 @@ void create_c() {
+  */
+ 
+ #if defined(__APPLE__)
+-# define BADSIG 0
++# define FLOR_BADSIG 0
+ #else
+-# define BADSIG (-1)
++# define FLOR_BADSIG (-1)
+ #endif
+ {sigset_t set;
+   int sig;
+@@ -5143,7 +5163,7 @@ void create_c() {
+   for (sig = 0; sig < 1024; sig++) {
+     result = sigismember (&set, sig);
+     if (result == 1) last_good = sig;
+-    else if ((result == BADSIG) && (first_bad = -1)) first_bad = sig;
++    else if ((result == FLOR_BADSIG) && (first_bad = -1)) first_bad = sig;
+   }
+   if (last_good == 1023)
+     printf("c-posix: WARNING: signal range estimate probably too small\n");
diff --git a/devel/florist/patches/patch-configure b/devel/florist/patches/patch-configure
new file mode 100644
index 00000000000..853807934bc
--- /dev/null
+++ b/devel/florist/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2012/07/09 05:52:14 marino Exp $
+
+--- configure.orig	2009-02-17 19:18:05.000000000 +0000
++++ configure
+@@ -2278,10 +2278,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/patches/patch-configure.in b/devel/florist/patches/patch-configure.in
new file mode 100644
index 00000000000..2ee49a3d955
--- /dev/null
+++ b/devel/florist/patches/patch-configure.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure.in,v 1.5 2012/07/09 05:52:14 marino Exp $
+
+--- configure.in.orig	2009-02-17 19:15:53.000000000 +0000
++++ configure.in
+@@ -113,10 +113,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;