[109154] trunk/dports/science/maniview

[ryandesign at macports.org]

Revision: 109154
          https://trac.macports.org/changeset/109154
Author:   ryandesign at macports.org
Date:     2013-08-08 11:48:04 -0700 (Thu, 08 Aug 2013)
Log Message:
-----------
maniview: use a patchfile instead of reinplace, for the usual reasons

Modified Paths:
--------------
    trunk/dports/science/maniview/Portfile

Added Paths:
-----------
    trunk/dports/science/maniview/files/
    trunk/dports/science/maniview/files/patch-maniview.c.diff

Modified: trunk/dports/science/maniview/Portfile
===================================================================
--- trunk/dports/science/maniview/Portfile	2013-08-08 18:43:55 UTC (rev 109153)
+++ trunk/dports/science/maniview/Portfile	2013-08-08 18:48:04 UTC (rev 109154)
@@ -26,10 +26,8 @@
 depends_lib                 port:geomview \
                             port:xforms
 
-post-patch {
-    # Conflicts with POSIX getline
-    reinplace "s:getline:maniview_getline:g" ${worksrcpath}/maniview.c
-}
+# Conflicts with POSIX getline
+patchfiles-append           patch-maniview.c.diff
 
 configure.cflags-append -std=gnu89
 

Added: trunk/dports/science/maniview/files/patch-maniview.c.diff
===================================================================
--- trunk/dports/science/maniview/files/patch-maniview.c.diff	                        (rev 0)
+++ trunk/dports/science/maniview/files/patch-maniview.c.diff	2013-08-08 18:48:04 UTC (rev 109154)
@@ -0,0 +1,50 @@
+--- maniview.c.orig	2007-03-21 06:51:51.000000000 -0500
++++ maniview.c	2013-08-08 13:05:10.000000000 -0500
+@@ -47,7 +47,7 @@
+ #include "maniviewhelp.h"
+   ;
+ 
+-char *getline(char *s);
++char *maniview_getline(char *s);
+ 
+ /* globals */
+ DiscGrp *dg = NULL;
+@@ -154,10 +154,10 @@
+ 
+     if (hf == NULL) {
+       char *line;
+-      line = getline(maniviewhelpstr);
++      line = maniview_getline(maniviewhelpstr);
+       while (line) {
+         fl_add_browser_line( HelpBrowser, line );
+-        line = getline(NULL);
++        line = maniview_getline(NULL);
+       }
+       fl_set_browser_topline( HelpBrowser, 1 );
+     } else {
+@@ -189,7 +189,7 @@
+   }
+ }
+ 
+-char *getline(char *s)
++char *maniview_getline(char *s)
+ {
+   static char *p;
+   char *first;
+@@ -213,13 +213,13 @@
+ void
+ gvinit()
+ {
+-  extern char *getline();
++  extern char *maniview_getline();
+   FILE *outf = stdout;
+   char *line;
+-  line = getline(gvinitstr);
++  line = maniview_getline(gvinitstr);
+   while (line) {
+     fprintf(outf,"%s",line);
+-    line = getline(NULL);
++    line = maniview_getline(NULL);
+   }
+   fflush(outf);
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130808/5072c272/attachment.html>