[89235] trunk/dports/devel/mcpp

blair at macports.org blair at macports.org
Sat Jan 21 14:29:29 PST 2012


Revision: 89235
          http://trac.macports.org/changeset/89235
Author:   blair at macports.org
Date:     2012-01-21 14:29:24 -0800 (Sat, 21 Jan 2012)
Log Message:
-----------
mcpp: rename a patch file to use standard naming convention.

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

Added Paths:
-----------
    trunk/dports/devel/mcpp/files/patch-fix-core-dumps

Removed Paths:
-------------
    trunk/dports/devel/mcpp/files/fix-core-dumps.patch

Modified: trunk/dports/devel/mcpp/Portfile
===================================================================
--- trunk/dports/devel/mcpp/Portfile	2012-01-21 21:35:37 UTC (rev 89234)
+++ trunk/dports/devel/mcpp/Portfile	2012-01-21 22:29:24 UTC (rev 89235)
@@ -28,7 +28,7 @@
                     sha1 703356b7c2cd30d7fb6000625bf3ccc2eb977ecb
 patchfiles          patch-src__internal.H \
                     patch-src__system.H \
-                    fix-core-dumps.patch
+                    patch-fix-core-dumps
 configure.args-append --enable-mcpplib --mandir=${prefix}/share/man
 # +universal: Install universal binary of mcpp.
 # Do not append these options to configure, but append to make.

Deleted: trunk/dports/devel/mcpp/files/fix-core-dumps.patch
===================================================================
--- trunk/dports/devel/mcpp/files/fix-core-dumps.patch	2012-01-21 21:35:37 UTC (rev 89234)
+++ trunk/dports/devel/mcpp/files/fix-core-dumps.patch	2012-01-21 22:29:24 UTC (rev 89235)
@@ -1,59 +0,0 @@
-#
-# This patch was downloaded from
-# http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html .
-#
-
-diff -c -r -N ../mcpp-2.7.2-old/src/internal.H ./src/internal.H
-*** ../mcpp-2.7.2-old/src/internal.H	2008-08-27 10:31:16.000000000 -0230
---- ./src/internal.H	2009-05-21 09:49:31.000000000 -0230
-***************
-*** 390,395 ****
---- 390,397 ----
-  extern char     identifier[];       /* Lastly scanned name          */
-  extern IFINFO   ifstack[];          /* Information of #if nesting   */
-  extern char     work_buf[];
-+ extern FILEINFO * sh_file;
-+ extern int      sh_line;
-          /* Temporary buffer for directive line and macro expansion  */
-  
-  /* main.c   */
-diff -c -r -N ../mcpp-2.7.2-old/src/main.c ./src/main.c
-*** ../mcpp-2.7.2-old/src/main.c	2008-11-05 05:04:46.000000000 -0330
---- ./src/main.c	2009-05-21 09:47:50.000000000 -0230
-***************
-*** 326,331 ****
---- 326,333 ----
-              = FALSE;
-      option_flags.trig = TRIGRAPHS_INIT;
-      option_flags.dig = DIGRAPHS_INIT;
-+     sh_file = NULL;
-+     sh_line = 0;
-  }
-  
-  int     mcpp_lib_main
-diff -c -r -N ../mcpp-2.7.2-old/src/system.c ./src/system.c
-*** ../mcpp-2.7.2-old/src/system.c	2008-11-26 06:23:51.000000000 -0330
---- ./src/system.c	2009-05-21 09:48:50.000000000 -0230
-***************
-*** 3858,3863 ****
---- 3858,3866 ----
-  }
-  #endif
-  
-+ FILEINFO*       sh_file;
-+ int             sh_line;
-+ 
-  void    sharp(
-      FILEINFO *  sharp_file,
-      int         flag        /* Flag to append to the line for GCC   */
-***************
-*** 3868,3875 ****
-   * else (i.e. 'sharp_file' is NULL) 'infile'.
-   */
-  {
--     static FILEINFO *   sh_file;
--     static int  sh_line;
-      FILEINFO *  file;
-      int         line;
-  
---- 3871,3876 ----

Copied: trunk/dports/devel/mcpp/files/patch-fix-core-dumps (from rev 89232, trunk/dports/devel/mcpp/files/fix-core-dumps.patch)
===================================================================
--- trunk/dports/devel/mcpp/files/patch-fix-core-dumps	                        (rev 0)
+++ trunk/dports/devel/mcpp/files/patch-fix-core-dumps	2012-01-21 22:29:24 UTC (rev 89235)
@@ -0,0 +1,59 @@
+#
+# This patch was downloaded from
+# http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html .
+#
+
+diff -c -r -N ../mcpp-2.7.2-old/src/internal.H ./src/internal.H
+*** ../mcpp-2.7.2-old/src/internal.H	2008-08-27 10:31:16.000000000 -0230
+--- ./src/internal.H	2009-05-21 09:49:31.000000000 -0230
+***************
+*** 390,395 ****
+--- 390,397 ----
+  extern char     identifier[];       /* Lastly scanned name          */
+  extern IFINFO   ifstack[];          /* Information of #if nesting   */
+  extern char     work_buf[];
++ extern FILEINFO * sh_file;
++ extern int      sh_line;
+          /* Temporary buffer for directive line and macro expansion  */
+  
+  /* main.c   */
+diff -c -r -N ../mcpp-2.7.2-old/src/main.c ./src/main.c
+*** ../mcpp-2.7.2-old/src/main.c	2008-11-05 05:04:46.000000000 -0330
+--- ./src/main.c	2009-05-21 09:47:50.000000000 -0230
+***************
+*** 326,331 ****
+--- 326,333 ----
+              = FALSE;
+      option_flags.trig = TRIGRAPHS_INIT;
+      option_flags.dig = DIGRAPHS_INIT;
++     sh_file = NULL;
++     sh_line = 0;
+  }
+  
+  int     mcpp_lib_main
+diff -c -r -N ../mcpp-2.7.2-old/src/system.c ./src/system.c
+*** ../mcpp-2.7.2-old/src/system.c	2008-11-26 06:23:51.000000000 -0330
+--- ./src/system.c	2009-05-21 09:48:50.000000000 -0230
+***************
+*** 3858,3863 ****
+--- 3858,3866 ----
+  }
+  #endif
+  
++ FILEINFO*       sh_file;
++ int             sh_line;
++ 
+  void    sharp(
+      FILEINFO *  sharp_file,
+      int         flag        /* Flag to append to the line for GCC   */
+***************
+*** 3868,3875 ****
+   * else (i.e. 'sharp_file' is NULL) 'infile'.
+   */
+  {
+-     static FILEINFO *   sh_file;
+-     static int  sh_line;
+      FILEINFO *  file;
+      int         line;
+  
+--- 3871,3876 ----
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120121/eb979db6/attachment-0001.html>


More information about the macports-changes mailing list