[92320] trunk/dports/textproc/par

[ryandesign at macports.org]

Revision: 92320
          https://trac.macports.org/changeset/92320
Author:   ryandesign at macports.org
Date:     2012-04-24 19:17:27 -0700 (Tue, 24 Apr 2012)
Log Message:
-----------
par: fix mangled UTF-8 with non-breaking space; use the right -arch flags and add a universal variant; remove an unnecessary reinplace

Modified Paths:
--------------
    trunk/dports/textproc/par/Portfile

Added Paths:
-----------
    trunk/dports/textproc/par/files/
    trunk/dports/textproc/par/files/patch-nbspace.diff
    trunk/dports/textproc/par/files/patch-ptrdiffwarn.diff

Modified: trunk/dports/textproc/par/Portfile
===================================================================
--- trunk/dports/textproc/par/Portfile	2012-04-25 02:14:42 UTC (rev 92319)
+++ trunk/dports/textproc/par/Portfile	2012-04-25 02:17:27 UTC (rev 92320)
@@ -5,6 +5,7 @@
 
 name			par
 version			1.52
+revision		1
 categories		textproc
 platforms		darwin
 maintainers		gmail.com:qbarnes
@@ -15,11 +16,16 @@
 distname		[string totitle $name][string map {. {}} $version]
 checksums		md5 4ccacd824171ba2c2f14fb8aba78b9bf
 
-configure {
-	file copy ${worksrcpath}/protoMakefile ${worksrcpath}/Makefile
-	reinplace "s|\$(CC) \$<|\$(CC) \$(CFLAGS) \$<|" ${worksrcpath}/Makefile
-}
+patchfiles		patch-nbspace.diff \
+			patch-ptrdiffwarn.diff
 
+use_configure		no
+
+variant universal {}
+
+build.args		-f protoMakefile \
+			CC="${configure.cc} -c ${configure.optflags} [get_canonical_archflags cc]" \
+			LINK1="${configure.cc} [get_canonical_archflags ld]"
 build.target
 
 destroot {

Added: trunk/dports/textproc/par/files/patch-nbspace.diff
===================================================================
--- trunk/dports/textproc/par/files/patch-nbspace.diff	                        (rev 0)
+++ trunk/dports/textproc/par/files/patch-nbspace.diff	2012-04-25 02:17:27 UTC (rev 92320)
@@ -0,0 +1,12 @@
+--- ./par.c.orig	2001-04-01 23:25:57.000000000 -0500
++++ ./par.c	2012-04-15 13:56:42.000000000 -0500
+@@ -403,7 +403,8 @@
+         }
+         continue;
+       }
+-      if (isspace(c)) ch = ' ';
++      // Exclude non-breaking space from the class of space chars
++      if (isspace(c) && isascii(c)) ch = ' ';
+       else blank = 0;
+       additem(cbuf, &ch, errmsg);
+       if (*errmsg) goto rlcleanup;

Added: trunk/dports/textproc/par/files/patch-ptrdiffwarn.diff
===================================================================
--- trunk/dports/textproc/par/files/patch-ptrdiffwarn.diff	                        (rev 0)
+++ trunk/dports/textproc/par/files/patch-ptrdiffwarn.diff	2012-04-25 02:17:27 UTC (rev 92320)
@@ -0,0 +1,11 @@
+--- reformat.c.orig	2001-03-21 22:17:15.000000000 -0600
++++ reformat.c	2012-04-15 14:42:24.000000000 -0500
+@@ -336,7 +336,7 @@
+     if (end - *line < affix) {
+       sprintf(errmsg,
+               "Line %d shorter than <prefix> + <suffix> = %d + %d = %d\n",
+-              line - inlines + 1, prefix, suffix, affix);
++              (int)(line - inlines + 1), prefix, suffix, affix);
+       goto rfcleanup;
+     }
+     end -= suffix;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120424/32a25573/attachment-0001.html>