Index: head/devel/mcpp/Makefile =================================================================== --- head/devel/mcpp/Makefile (revision 272020) +++ head/devel/mcpp/Makefile (revision 272021) @@ -1,34 +1,35 @@ # New ports collection makefile for: mcpp # Date created: 06 April 2007 # Whom: Kiyoshi Matsui # # $FreeBSD$ # PORTNAME= mcpp PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V.${PORTVERSION} MAINTAINER= kmatsui@t3.rim.or.jp COMMENT= Alternative C/C++ preprocessor GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-mcpplib MAN1= mcpp.1 PLIST_FILES= bin/mcpp \ lib/libmcpp.so \ lib/libmcpp.so.3 \ lib/libmcpp.a \ lib/libmcpp.la \ include/mcpp_lib.h \ include/mcpp_out.h \ share/doc/mcpp/LICENSE \ share/doc/mcpp/NEWS \ share/doc/mcpp/README \ share/doc/mcpp/mcpp-manual.html \ share/doc/mcpp/mcpp-manual-jp.html PLIST_DIRS= share/doc/mcpp .include Property changes on: head/devel/mcpp/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/devel/mcpp/files/patch-src__internal.H =================================================================== --- head/devel/mcpp/files/patch-src__internal.H (nonexistent) +++ head/devel/mcpp/files/patch-src__internal.H (revision 272021) @@ -0,0 +1,19 @@ +--- ./src/internal.H.orig 2008-08-27 15:01:16.000000000 +0200 ++++ ./src/internal.H 2011-03-30 19:57:37.000000000 +0200 +@@ -390,6 +390,8 @@ + 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 */ +@@ -557,6 +559,6 @@ + #endif + #endif + +-#if HOST_HAVE_STPCPY ++#if HOST_HAVE_STPCPY && !defined(stpcpy) + extern char * stpcpy( char * dest, const char * src); + #endif Property changes on: head/devel/mcpp/files/patch-src__internal.H ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/mcpp/files/patch-src__main.c =================================================================== --- head/devel/mcpp/files/patch-src__main.c (nonexistent) +++ head/devel/mcpp/files/patch-src__main.c (revision 272021) @@ -0,0 +1,11 @@ +--- ./src/main.c.orig 2008-11-05 09:34:46.000000000 +0100 ++++ ./src/main.c 2011-03-30 19:57:37.000000000 +0200 +@@ -326,6 +326,8 @@ + = FALSE; + option_flags.trig = TRIGRAPHS_INIT; + option_flags.dig = DIGRAPHS_INIT; ++ sh_file = NULL; ++ sh_line = 0; + } + + int mcpp_lib_main Property changes on: head/devel/mcpp/files/patch-src__main.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/mcpp/files/patch-src__support.c =================================================================== --- head/devel/mcpp/files/patch-src__support.c (nonexistent) +++ head/devel/mcpp/files/patch-src__support.c (revision 272021) @@ -0,0 +1,20 @@ +--- ./src/support.c.orig 2008-06-10 10:32:33.000000000 +0200 ++++ ./src/support.c 2011-03-30 19:57:37.000000000 +0200 +@@ -188,7 +188,7 @@ + size_t length + ) + { +- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ ++ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ + size_t size = MAX( BUF_INCR_SIZE, length); + + if (mem_buf_p->buffer == NULL) { /* 1st append */ +@@ -1722,6 +1722,8 @@ + sp -= 2; + while (*sp != '\n') /* Until end of line */ + mcpp_fputc( *sp++, OUT); ++ mcpp_fputc( '\n', OUT); ++ wrong_line = TRUE; + } + goto end_line; + default: /* Not a comment */ Property changes on: head/devel/mcpp/files/patch-src__support.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/mcpp/files/patch-src__system.c =================================================================== --- head/devel/mcpp/files/patch-src__system.c (nonexistent) +++ head/devel/mcpp/files/patch-src__system.c (revision 272021) @@ -0,0 +1,21 @@ +--- ./src/system.c.orig 2008-11-26 10:53:51.000000000 +0100 ++++ ./src/system.c 2011-03-30 19:57:37.000000000 +0200 +@@ -3858,6 +3858,9 @@ + } + #endif + ++FILEINFO* sh_file; ++int sh_line; ++ + void sharp( + FILEINFO * sharp_file, + int flag /* Flag to append to the line for GCC */ +@@ -3868,8 +3871,6 @@ + * else (i.e. 'sharp_file' is NULL) 'infile'. + */ + { +- static FILEINFO * sh_file; +- static int sh_line; + FILEINFO * file; + int line; + Property changes on: head/devel/mcpp/files/patch-src__system.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property