[61717] trunk/dports/devel/indent

[toby at macports.org]

Revision: 61717
          http://trac.macports.org/changeset/61717
Author:   toby at macports.org
Date:     2009-12-19 14:24:32 -0800 (Sat, 19 Dec 2009)
Log Message:
-----------
update to 2.2.10

Modified Paths:
--------------
    trunk/dports/devel/indent/Portfile
    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-src__indent.h

Modified: trunk/dports/devel/indent/Portfile
===================================================================
--- trunk/dports/devel/indent/Portfile	2009-12-19 22:14:59 UTC (rev 61716)
+++ trunk/dports/devel/indent/Portfile	2009-12-19 22:24:32 UTC (rev 61717)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            indent
-version         2.2.9
-revision        2
+version         2.2.10
 categories      devel
 maintainers     nomaintainer
 description     C language source code formatting program
@@ -17,14 +16,15 @@
 homepage        http://www.gnu.org/software/indent/
 platforms       darwin
 master_sites    gnu
-checksums       md5 dcdbb163bef928306dee2a0cfc581c89
+checksums       md5 be35ea62705733859fbf8caf816d8959 \
+                sha1 20fa8a7a4af6670c3254c8b87020291c3db37ed1 \
+                rmd160 66164db3f28ddc9726a56fb184795a335aac34b0
 configure.args  --mandir=${prefix}/share/man \
                 --infodir=${prefix}/share/info \
                 --program-prefix=gnu
 depends_lib     port:gettext port:libiconv
 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

Modified: trunk/dports/devel/indent/files/patch-man__Makefile.in
===================================================================
--- trunk/dports/devel/indent/files/patch-man__Makefile.in	2009-12-19 22:14:59 UTC (rev 61716)
+++ trunk/dports/devel/indent/files/patch-man__Makefile.in	2009-12-19 22:24:32 UTC (rev 61717)
@@ -1,7 +1,7 @@
 --- 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
+@@ -507,7 +507,7 @@
+ 	uninstall-man uninstall-man1
  
  
 - at PACKAGE@.1: ${srcdir}/@PACKAGE at .1.in  ${srcdir}/../doc/@PACKAGE at .texinfo texinfo2man.c  Makefile.am

Modified: trunk/dports/devel/indent/files/patch-man__texinfo2man.c
===================================================================
--- trunk/dports/devel/indent/files/patch-man__texinfo2man.c	2009-12-19 22:14:59 UTC (rev 61716)
+++ trunk/dports/devel/indent/files/patch-man__texinfo2man.c	2009-12-19 22:24:32 UTC (rev 61717)
@@ -1,9 +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 @@
+--- man/texinfo2man.c.orig	2009-12-19 14:18:43.000000000 -0800
++++ man/texinfo2man.c	2009-12-19 14:18:47.000000000 -0800
+@@ -1,6 +1,5 @@
  #include <stdio.h>
+ #include <stdlib.h>
 -#include <malloc.h>
-+#include <stdlib.h>
  #include <string.h>
  #include <ctype.h>
  

Deleted: trunk/dports/devel/indent/files/patch-src__indent.h
===================================================================
--- trunk/dports/devel/indent/files/patch-src__indent.h	2009-12-19 22:14:59 UTC (rev 61716)
+++ trunk/dports/devel/indent/files/patch-src__indent.h	2009-12-19 22:24:32 UTC (rev 61717)
@@ -1,11 +0,0 @@
---- src/indent.h.orig	2005-04-18 09:14:30.000000000 -0400
-+++ src/indent.h	2005-04-18 09:14:32.000000000 -0400
-@@ -97,7 +97,7 @@
- extern unsigned long in_prog_size;
- 
- /* The output file. */
--extern FILE *output;
-+//extern FILE *output;
- 
- 
- 

Modified: trunk/dports/devel/indent/files/patch-src__output.c
===================================================================
--- trunk/dports/devel/indent/files/patch-src__output.c	2009-12-19 22:14:59 UTC (rev 61716)
+++ trunk/dports/devel/indent/files/patch-src__output.c	2009-12-19 22:24:32 UTC (rev 61717)
@@ -1,24 +1,16 @@
---- 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 @@
-  */
+--- src/output.c.orig	2008-03-11 11:50:42.000000000 -0700
++++ src/output.c	2009-12-19 14:22:32.000000000 -0800
+@@ -749,11 +749,11 @@
  
- #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
+          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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091219/a4638c24/attachment.html>