CVS commit: pkgsrc/devel/florist

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Thu Nov 24 22:53:13 UTC 2016

Modified Files:
        pkgsrc/devel/florist: distinfo
        pkgsrc/devel/florist/patches: patch-c-posix.c

Log Message:
devel/florist: Fix style issues on generated specification file

This allows build with gcc5-aux compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/florist/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/florist/patches/patch-c-posix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/florist/distinfo
diff -u pkgsrc/devel/florist/distinfo:1.9 pkgsrc/devel/florist/distinfo:1.10
--- pkgsrc/devel/florist/distinfo:1.9   Thu Dec 24 23:54:07 2015
+++ pkgsrc/devel/florist/distinfo       Thu Nov 24 22:53:13 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/12/24 23:54:07 dholland Exp $
+$NetBSD: distinfo,v 1.10 2016/11/24 22:53:13 marino Exp $
 
 SHA1 (florist-gpl-2012-src.tgz) = 9d0c2dfbb565a92830cb5ea5894bd64d67993061
 RMD160 (florist-gpl-2012-src.tgz) = 53e759e65647c87f0d1b691dd0830e56d77c1fab
@@ -6,7 +6,7 @@ SHA512 (florist-gpl-2012-src.tgz) = 1742
 Size (florist-gpl-2012-src.tgz) = 224141 bytes
 SHA1 (patch-Makefile.in) = f34fad0bb90d39f35aca8af6a44cf472addea4ee
 SHA1 (patch-c-posix-signals.c) = 151ccbad3f18e6a1333291db3d32499075dc141a
-SHA1 (patch-c-posix.c) = c6da2f4614af5ae0b96a70a93b5d308a3238c9c2
+SHA1 (patch-c-posix.c) = 09927a449697f0eac689c2a8bf409c5618a4fed0
 SHA1 (patch-configure) = 72e1add2e6c2af1ff8b2686e5e5f92511e4dcbfa
 SHA1 (patch-configure.in) = 236e602504172c0b4ea97dbe0194c142ab923d46
 SHA1 (patch-florist.gpr) = e31bbd78266ae8bd71cbf82378f714fc92c7e6e6

Index: pkgsrc/devel/florist/patches/patch-c-posix.c
diff -u pkgsrc/devel/florist/patches/patch-c-posix.c:1.6 pkgsrc/devel/florist/patches/patch-c-posix.c:1.7
--- pkgsrc/devel/florist/patches/patch-c-posix.c:1.6    Wed Apr 30 16:27:04 2014
+++ pkgsrc/devel/florist/patches/patch-c-posix.c        Thu Nov 24 22:53:13 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-c-posix.c,v 1.6 2014/04/30 16:27:04 marino Exp $
+$NetBSD: patch-c-posix.c,v 1.7 2016/11/24 22:53:13 marino Exp $
 
   Add DragonFly support and resolve BADSIG ambiguity
 
---- c-posix.c.orig     2012-05-10 13:32:15.000000000 +0000
+--- c-posix.c.orig     2012-05-10 13:32:15 UTC
 +++ c-posix.c
 @@ -689,6 +689,25 @@ typedef struct siginfo {
  
@@ -38,6 +38,24 @@ $NetBSD: patch-c-posix.c,v 1.6 2014/04/3
  
  #ifdef HAVE_struct_aiocb
    GT1(aiocb, 1)
+@@ -1669,7 +1689,7 @@ void print_type_declaration(char const n
+   }
+   switch (type->typekind) {
+   case SIGNED_INTEGER_TYPE:
+-    ifprintf(fp,"   type %s is range -2**%d .. (2**%d)-1;\n",
++    ifprintf(fp,"   type %s is range -2**%d .. (2**%d) - 1;\n",
+       type->typename,
+       type->typesize*bits_per_byte-1,
+       type->typesize*bits_per_byte-1);
+@@ -3142,7 +3162,7 @@ void create_posix() {
+ 
+   ifprintf(fp,"   Byte_Size : constant :=  %d;\n\n",bits_per_byte);
+ 
+-  ifprintf(fp,"   type IO_Count is range -2**%d .. (2**%d)-1;\n\n",
++  ifprintf(fp,"   type IO_Count is range -2**%d .. (2**%d) - 1;\n\n",
+     sizeof(ssize_t)*bits_per_byte-1,
+     sizeof(ssize_t)*bits_per_byte-1);
+   ifprintf(fp,"   for IO_Count'Size use %d;\n", sizeof(ssize_t)*bits_per_byte);
 @@ -5130,9 +5150,9 @@ void create_c() {
   */