[61716] trunk/dports/devel/indent

[toby at macports.org]

Revision: 61716
          http://trac.macports.org/changeset/61716
Author:   toby at macports.org
Date:     2009-12-19 14:14:59 -0800 (Sat, 19 Dec 2009)
Log Message:
-----------
Fix parallel build and a 64-bit related crash. See #22949

Modified Paths:
--------------
    trunk/dports/devel/indent/Portfile

Added Paths:
-----------
    trunk/dports/devel/indent/files/patch-man__Makefile.in
    trunk/dports/devel/indent/files/patch-man__texinfo2man.c
    trunk/dports/devel/indent/files/patch-src__output.c

Removed Paths:
-------------
    trunk/dports/devel/indent/files/patch-texinfo2man.c

Modified: trunk/dports/devel/indent/Portfile
===================================================================
--- trunk/dports/devel/indent/Portfile	2009-12-19 21:54:24 UTC (rev 61715)
+++ trunk/dports/devel/indent/Portfile	2009-12-19 22:14:59 UTC (rev 61716)
@@ -17,12 +17,15 @@
 homepage        http://www.gnu.org/software/indent/
 platforms       darwin
 master_sites    gnu
-checksums      	md5 dcdbb163bef928306dee2a0cfc581c89
+checksums       md5 dcdbb163bef928306dee2a0cfc581c89
 configure.args  --mandir=${prefix}/share/man \
                 --infodir=${prefix}/share/info \
                 --program-prefix=gnu
 depends_lib     port:gettext port:libiconv
-patchfiles      patch-texinfo2man.c patch-src__indent.h
+patchfiles      patch-man__Makefile.in \
+                patch-man__texinfo2man.c \
+                patch-src__indent.h \
+                patch-src__output.c
 post-destroot {
     file rename ${destroot}${prefix}/doc ${destroot}${prefix}/share/doc
 }

Added: trunk/dports/devel/indent/files/patch-man__Makefile.in
===================================================================
--- trunk/dports/devel/indent/files/patch-man__Makefile.in	                        (rev 0)
+++ trunk/dports/devel/indent/files/patch-man__Makefile.in	2009-12-19 22:14:59 UTC (rev 61716)
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	2009-12-19 14:08:51.000000000 -0800
++++ man/Makefile.in	2009-12-19 14:09:00.000000000 -0800
+@@ -398,7 +398,7 @@
+ 	uninstall-man1
+ 
+ 
+- at PACKAGE@.1: ${srcdir}/@PACKAGE at .1.in  ${srcdir}/../doc/@PACKAGE at .texinfo texinfo2man.c  Makefile.am
++ at PACKAGE@.1: ${srcdir}/@PACKAGE at .1.in  ${srcdir}/../doc/@PACKAGE at .texinfo texinfo2man.c  Makefile.am texinfo2man
+ 	./texinfo2man ${srcdir}/@PACKAGE at .1.in ${srcdir}/../doc/@PACKAGE at .texinfo > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

Copied: trunk/dports/devel/indent/files/patch-man__texinfo2man.c (from rev 61715, trunk/dports/devel/indent/files/patch-texinfo2man.c)
===================================================================
--- trunk/dports/devel/indent/files/patch-man__texinfo2man.c	                        (rev 0)
+++ trunk/dports/devel/indent/files/patch-man__texinfo2man.c	2009-12-19 22:14:59 UTC (rev 61716)
@@ -0,0 +1,9 @@
+--- man/texinfo2man.c.orig	2009-12-19 14:10:34.000000000 -0800
++++ man/texinfo2man.c	2009-12-19 14:10:39.000000000 -0800
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+ 

Added: trunk/dports/devel/indent/files/patch-src__output.c
===================================================================
--- trunk/dports/devel/indent/files/patch-src__output.c	                        (rev 0)
+++ trunk/dports/devel/indent/files/patch-src__output.c	2009-12-19 22:14:59 UTC (rev 61716)
@@ -0,0 +1,24 @@
+--- src/output.c.orig	2009-12-19 14:11:52.000000000 -0800
++++ src/output.c	2009-12-19 14:12:43.000000000 -0800
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <utime.h>
+ #include <sys/stat.h>
+@@ -737,11 +738,11 @@
+                     
+                     if (s[0] == '/' && (s[1] == '*' || s[1] == '/'))
+                     {
+-                        fprintf (output, "%.*s", e_lab - s, s);
++                        fprintf (output, "%.*s", (int) (e_lab - s), s);
+                     }
+                     else
+                     {
+-                        fprintf (output, "/* %.*s */", e_lab - s, s);
++                        fprintf (output, "/* %.*s */", (int) (e_lab - s), s);
+                     }
+                     
+                     /* no need to update cur_col: the very next thing will

Deleted: trunk/dports/devel/indent/files/patch-texinfo2man.c
===================================================================
--- trunk/dports/devel/indent/files/patch-texinfo2man.c	2009-12-19 21:54:24 UTC (rev 61715)
+++ trunk/dports/devel/indent/files/patch-texinfo2man.c	2009-12-19 22:14:59 UTC (rev 61716)
@@ -1,8 +0,0 @@
---- man/texinfo2man.c.orig	Sun Dec  7 00:46:05 2003
-+++ man/texinfo2man.c	Sun Dec  7 00:46:09 2003
-@@ -1,5 +1,4 @@
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091219/6f8f135f/attachment-0001.html>