[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [102329] trunk/dports/sysutils/natsort
From: ryandesign () macports ! org
Date: 2013-01-31 11:09:04
Message-ID: 20130131110904.B2076140F7B () svn ! macports ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 102329
https://trac.macports.org/changeset/102329
Author: ryandesign@macports.org
Date: 2013-01-31 03:09:04 -0800 (Thu, 31 Jan 2013)
Log Message:
-----------
natsort: rename natsort.c patch and fix it to actually use the project's getline \
function instead of the OS's, and therefore increase the port's revision; ensure \
we're UsingTheRightCompiler and -arch flags and add a universal variant
Modified Paths:
--------------
trunk/dports/sysutils/natsort/Portfile
Added Paths:
-----------
trunk/dports/sysutils/natsort/files/patch-Makefile.diff
trunk/dports/sysutils/natsort/files/patch-natsort.c.diff
Removed Paths:
-------------
trunk/dports/sysutils/natsort/files/natsort.c.diff
Modified: trunk/dports/sysutils/natsort/Portfile
===================================================================
--- trunk/dports/sysutils/natsort/Portfile 2013-01-31 10:35:45 UTC (rev 102328)
+++ trunk/dports/sysutils/natsort/Portfile 2013-01-31 11:09:04 UTC (rev 102329)
@@ -5,6 +5,7 @@
name natsort
version 1.0.5
+revision 1
categories sysutils
maintainers nomaintainer
@@ -14,10 +15,16 @@
platforms darwin
master_sites sourceforge
-patchfiles natsort.c.diff
-
checksums md5 1bc2d32c9c95595f3b67165ee370dade \
sha1 3843dd1dbb0c7f1c593f99c6706907d3d363b655
+patchfiles patch-Makefile.diff \
+ patch-natsort.c.diff
+
use_configure no
+
+variant universal {}
+
+build.args CC="${configure.cc} [get_canonical_archflags cc]"
+
destroot.args BINDIR=${destroot}${prefix}/bin
Deleted: trunk/dports/sysutils/natsort/files/natsort.c.diff
===================================================================
--- trunk/dports/sysutils/natsort/files/natsort.c.diff 2013-01-31 10:35:45 UTC (rev \
102328)
+++ trunk/dports/sysutils/natsort/files/natsort.c.diff 2013-01-31 11:09:04 UTC (rev \
102329) @@ -1,20 +0,0 @@
---- natsort.c.orig 2013-01-29 17:23:19.000000000 -0800
-+++ natsort.c 2013-01-29 17:24:23.000000000 -0800
-@@ -40,7 +40,7 @@
- #endif
-
- static int fold_case = 0, verbose = 0, reverse = 0;
--size_t getline(char **lineptr, int *n, FILE *stream);
-+size_t redundant_getline(char **lineptr, int *n, FILE *stream);
-
- static void trace_result(char const *a, char const *b, int ret)
- {
-@@ -170,7 +170,7 @@
- }
-
- /* This code is public domain -- Will Hartung 4/9/09 */
--size_t getline(char **lineptr, int *n, FILE *stream) {
-+size_t redundant_getline(char **lineptr, int *n, FILE *stream) {
- char *bufptr = NULL;
- char *p = bufptr;
- size_t size;
Added: trunk/dports/sysutils/natsort/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/natsort/files/patch-Makefile.diff \
(rev 0)
+++ trunk/dports/sysutils/natsort/files/patch-Makefile.diff 2013-01-31 11:09:04 UTC \
(rev 102329) @@ -0,0 +1,17 @@
+--- Makefile.orig 2009-10-02 14:44:56.000000000 -0500
++++ Makefile 2013-01-31 04:39:34.000000000 -0600
+@@ -9,11 +9,11 @@
+
+ all: natsort
+ natsort: bin strnatcmp.o natsort.o
+- gcc -o $(NATSORT_DEST) strnatcmp.o natsort.o
++ $(CC) -o $(NATSORT_DEST) strnatcmp.o natsort.o
+ natsort.o: natsort.c
+- gcc -Wall -c -o natsort.o natsort.c
++ $(CC) -Wall -c -o natsort.o natsort.c
+ strnatcmp.o: strnatcmp.c
+- gcc -Wall -c -o strnatcmp.o strnatcmp.c
++ $(CC) -Wall -c -o strnatcmp.o strnatcmp.c
+ clean:
+ rm -rf $(NATSORT_DEST) *.o bin/* ./releases/*
+ releases:
Copied: trunk/dports/sysutils/natsort/files/patch-natsort.c.diff (from rev 102328, \
trunk/dports/sysutils/natsort/files/natsort.c.diff) \
===================================================================
--- trunk/dports/sysutils/natsort/files/patch-natsort.c.diff \
(rev 0)
+++ trunk/dports/sysutils/natsort/files/patch-natsort.c.diff 2013-01-31 11:09:04 UTC \
(rev 102329) @@ -0,0 +1,29 @@
+--- natsort.c.orig 2009-10-02 14:44:56.000000000 -0500
++++ natsort.c 2013-01-31 04:59:06.000000000 -0600
+@@ -40,7 +40,7 @@
+ #endif
+
+ static int fold_case = 0, verbose = 0, reverse = 0;
+-size_t getline(char **lineptr, int *n, FILE *stream);
++size_t redundant_getline(char **lineptr, int *n, FILE *stream);
+
+ static void trace_result(char const *a, char const *b, int ret)
+ {
+@@ -135,7 +135,7 @@
+ while (1) {
+ line = NULL;
+ bufsize = 0;
+- if ((linelen = getline(&line, &bufsize, stdin)) <= 0)
++ if ((linelen = redundant_getline(&line, &bufsize, stdin)) <= 0)
+ break;
+ if (line[linelen-1] == '\n')
+ line[--linelen] = 0;
+@@ -170,7 +170,7 @@
+ }
+
+ /* This code is public domain -- Will Hartung 4/9/09 */
+-size_t getline(char **lineptr, int *n, FILE *stream) {
++size_t redundant_getline(char **lineptr, int *n, FILE *stream) {
+ char *bufptr = NULL;
+ char *p = bufptr;
+ size_t size;
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[102329] trunk/dports/sysutils/natsort</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="https://trac.macports.org/changeset/102329">102329</a></dd> <dt>Author</dt> \
<dd>ryandesign@macports.org</dd> <dt>Date</dt> <dd>2013-01-31 03:09:04 -0800 (Thu, 31 \
Jan 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>natsort: rename natsort.c patch and fix it to actually use the project's getline \
function instead of the OS's, and therefore increase the port's revision; ensure \
we're UsingTheRightCompiler and -arch flags and add a universal variant</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsnatsortPortfile">trunk/dports/sysutils/natsort/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsnatsortfilespatchMakefilediff">trunk/dports/sysutils/natsort/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportssysutilsnatsortfilespatchnatsortcdiff">trunk/dports/sysutils/natsort/files/patch-natsort.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsnatsortfilesnatsortcdiff">trunk/dports/sysutils/natsort/files/natsort.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsnatsortPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/natsort/Portfile (102328 => \
102329)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/natsort/Portfile 2013-01-31 10:35:45 UTC \
(rev 102328)
+++ trunk/dports/sysutils/natsort/Portfile 2013-01-31 11:09:04 UTC (rev 102329)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name natsort
</span><span class="cx"> version 1.0.5
</span><ins>+revision 1
</ins><span class="cx"> categories sysutils
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx">
</span><span class="lines">@@ -14,10 +15,16 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><del>-patchfiles natsort.c.diff
-
</del><span class="cx"> checksums md5 1bc2d32c9c95595f3b67165ee370dade \
</span><span class="cx"> sha1 \
3843dd1dbb0c7f1c593f99c6706907d3d363b655 </span><span class="cx">
</span><ins>+patchfiles patch-Makefile.diff \
+ patch-natsort.c.diff
+
</ins><span class="cx"> use_configure no
</span><ins>+
+variant universal {}
+
+build.args CC="${configure.cc} [get_canonical_archflags cc]"
+
</ins><span class="cx"> destroot.args BINDIR=${destroot}${prefix}/bin
</span></span></pre></div>
<a id="trunkdportssysutilsnatsortfilesnatsortcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/natsort/files/natsort.c.diff \
(102328 => 102329)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/natsort/files/natsort.c.diff 2013-01-31 \
10:35:45 UTC (rev 102328)
+++ trunk/dports/sysutils/natsort/files/natsort.c.diff 2013-01-31 11:09:04 UTC (rev \
102329) </span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- natsort.c.orig 2013-01-29 17:23:19.000000000 -0800
-+++ natsort.c 2013-01-29 17:24:23.000000000 -0800
-@@ -40,7 +40,7 @@
- #endif
-
- static int fold_case = 0, verbose = 0, reverse = 0;
--size_t getline(char **lineptr, int *n, FILE *stream);
-+size_t redundant_getline(char **lineptr, int *n, FILE *stream);
-
- static void trace_result(char const *a, char const *b, int ret)
- {
-@@ -170,7 +170,7 @@
- }
-
- /* This code is public domain -- Will Hartung 4/9/09 */
--size_t getline(char **lineptr, int *n, FILE *stream) {
-+size_t redundant_getline(char **lineptr, int *n, FILE *stream) {
- char *bufptr = NULL;
- char *p = bufptr;
- size_t size;
</del></span></pre></div>
<a id="trunkdportssysutilsnatsortfilespatchMakefilediff"></a>
<div class="addfile"><h4>Added: \
trunk/dports/sysutils/natsort/files/patch-Makefile.diff (0 => 102329)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/dports/sysutils/natsort/files/patch-Makefile.diff (rev \
0)
+++ trunk/dports/sysutils/natsort/files/patch-Makefile.diff 2013-01-31 11:09:04 UTC \
(rev 102329) </span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- Makefile.orig 2009-10-02 14:44:56.000000000 -0500
++++ Makefile 2013-01-31 04:39:34.000000000 -0600
+@@ -9,11 +9,11 @@
+
+ all: natsort
+ natsort: bin strnatcmp.o natsort.o
+- gcc -o $(NATSORT_DEST) strnatcmp.o natsort.o
++ $(CC) -o $(NATSORT_DEST) strnatcmp.o natsort.o
+ natsort.o: natsort.c
+- gcc -Wall -c -o natsort.o natsort.c
++ $(CC) -Wall -c -o natsort.o natsort.c
+ strnatcmp.o: strnatcmp.c
+- gcc -Wall -c -o strnatcmp.o strnatcmp.c
++ $(CC) -Wall -c -o strnatcmp.o strnatcmp.c
+ clean:
+ rm -rf $(NATSORT_DEST) *.o bin/* ./releases/*
+ releases:
</ins></span></pre></div>
<a id="trunkdportssysutilsnatsortfilespatchnatsortcdifffromrev102328trunkdportssysutilsnatsortfilesnatsortcdiff"></a>
<div class="copfile"><h4>Copied: \
trunk/dports/sysutils/natsort/files/patch-natsort.c.diff (from rev 102328, \
trunk/dports/sysutils/natsort/files/natsort.c.diff) (0 => 102329)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/dports/sysutils/natsort/files/patch-natsort.c.diff (rev \
0)
+++ trunk/dports/sysutils/natsort/files/patch-natsort.c.diff 2013-01-31 11:09:04 UTC \
(rev 102329) </span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- natsort.c.orig 2009-10-02 14:44:56.000000000 -0500
++++ natsort.c 2013-01-31 04:59:06.000000000 -0600
+@@ -40,7 +40,7 @@
+ #endif
+
+ static int fold_case = 0, verbose = 0, reverse = 0;
+-size_t getline(char **lineptr, int *n, FILE *stream);
++size_t redundant_getline(char **lineptr, int *n, FILE *stream);
+
+ static void trace_result(char const *a, char const *b, int ret)
+ {
+@@ -135,7 +135,7 @@
+ while (1) {
+ line = NULL;
+ bufsize = 0;
+- if ((linelen = getline(&line, &bufsize, stdin)) <= 0)
++ if ((linelen = redundant_getline(&line, &bufsize, stdin)) <= 0)
+ break;
+ if (line[linelen-1] == '\n')
+ line[--linelen] = 0;
+@@ -170,7 +170,7 @@
+ }
+
+ /* This code is public domain -- Will Hartung 4/9/09 */
+-size_t getline(char **lineptr, int *n, FILE *stream) {
++size_t redundant_getline(char **lineptr, int *n, FILE *stream) {
+ char *bufptr = NULL;
+ char *p = bufptr;
+ size_t size;
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic