<!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>[138978] trunk/dports/textproc/glimpse</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/138978">138978</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-07-25 17:49:51 -0700 (Sat, 25 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>glimpse: fix build with clang (#42544)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocglimpsePortfile">trunk/dports/textproc/glimpse/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/textproc/glimpse/files/</li>
<li><a href="#trunkdportstextprocglimpsefilespatchclangdiff">trunk/dports/textproc/glimpse/files/patch-clang.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocglimpsePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/glimpse/Portfile (138977 => 138978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/glimpse/Portfile 2015-07-26 00:10:12 UTC (rev 138977)
+++ trunk/dports/textproc/glimpse/Portfile 2015-07-26 00:49:51 UTC (rev 138978)
</span><span class="lines">@@ -22,10 +22,7 @@
</span><span class="cx"> checksums rmd160 cd309a9b578b777fdb4336d89b01ab20f1771fc9 \
</span><span class="cx"> sha256 0c21d27d6a3fe37dacdc66ef9194623f5a94b2f5d221dff8f187f69f629beade
</span><span class="cx">
</span><del>-# error: non-void function should return a value
-# https://trac.macports.org/ticket/42544
-compiler.blacklist *clang*
-#configure.cflags-append -Wno-return-type
</del><ins>+patchfiles patch-clang.diff
</ins><span class="cx">
</span><span class="cx"> # Does not respect *FLAGS
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportstextprocglimpsefilespatchclangdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/glimpse/files/patch-clang.diff (0 => 138978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/glimpse/files/patch-clang.diff (rev 0)
+++ trunk/dports/textproc/glimpse/files/patch-clang.diff 2015-07-26 00:49:51 UTC (rev 138978)
</span><span class="lines">@@ -0,0 +1,173 @@
</span><ins>+Fix build with clang.
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=171268
+--- compress/main_tbuild.c.orig 2012-09-02 23:50:51.000000000 +0000
++++ compress/main_tbuild.c 2012-09-02 23:52:17.000000000 +0000
+@@ -25,7 +25,7 @@
+ int
+ main(argc, argv)
+ int argc;
+- unsigned char *argv[];
++ char *argv[];
+ {
+ char comp_dir[MAX_LINE_LEN];
+ int threshold, specialwords;
+--- compress/misc.c.orig 2012-09-02 23:45:51.000000000 +0000
++++ compress/misc.c 2012-09-02 23:46:13.000000000 +0000
+@@ -288,7 +288,7 @@
+ return 1;
+ }
+
+-uninitialize_common()
++void uninitialize_common()
+ {
+ initialize_common_done = 0;
+ return;
+--- get_filename.c.orig 2012-09-03 00:16:47.000000000 +0000
++++ get_filename.c 2012-09-03 00:16:59.000000000 +0000
+@@ -481,7 +481,7 @@
+ return 0;
+ }
+
+-get_filenames(index_vect, argc, argv, dummylen, dummypat, file_num)
++void get_filenames(index_vect, argc, argv, dummylen, dummypat, file_num)
+ int *index_vect;
+ int argc; /* the arguments to agrep for -F */
+ char *argv[];
+--- get_index.c.orig 2012-09-03 00:24:59.000000000 +0000
++++ get_index.c 2012-09-03 00:25:14.000000000 +0000
+@@ -52,7 +52,7 @@
+ }
+
+ /* Unions offset lists list2 with list1 sorted in increasing order (deletes elements from list2) => changes both list1 and list2: f += #elems added */
+-sorted_union(list1, list2, f, pf, cf)
++void sorted_union(list1, list2, f, pf, cf)
+ struct offsets **list1, **list2;
+ int *f, pf, cf;
+ {
+@@ -114,7 +114,7 @@
+ }
+
+ /* Intersects offset lists list2 with list1 sorted in increasing order (deletes elements from list2) => changes both list1 and list2 */
+-sorted_intersection(filenum, list1, list2, f)
++void sorted_intersection(filenum, list1, list2, f)
+ struct offsets **list1, **list2;
+ int *f;
+ {
+--- index/build_in.c.orig 2012-09-03 00:03:28.000000000 +0000
++++ index/build_in.c 2012-09-03 00:15:01.000000000 +0000
+@@ -44,8 +44,12 @@
+ extern struct stat excstbuf;
+ extern struct stat incstbuf;
+
++void build_hash();
++void init_hash_table();
+ void insert_h();
+ void insert_index();
++void merge_in(FILE *, FILE *, FILE *);
++void remove_filename(int, int);
+
+ extern int ICurrentFileOffset;
+ extern int NextICurrentFileOffset;
+@@ -124,7 +128,7 @@
+ extern int HashTableSize;
+ struct token **hash_table; /*[MAX_64K_HASH];*/
+
+-build_index()
++void build_index()
+ {
+ int i;
+
+@@ -598,7 +602,7 @@
+ #endif
+ }
+
+-traverse1()
++void traverse1()
+ {
+ FILE *i1, *i2, *i3;
+ int ret;
+@@ -780,7 +784,7 @@
+ input: a set of filenames in name_list[], a partition table p_table[]
+ output: a hash table hash_table[].
+ -----------------------------------------------------------------------*/
+-build_hash()
++void build_hash()
+ {
+ int fd; /* opened file number */
+ int i, pn; /* pn: current partition */
+@@ -1229,7 +1233,7 @@
+ my_free(buffer_begin, BLOCK_SIZE + 10);
+ }
+
+-init_hash_table()
++void init_hash_table()
+ {
+ int i;
+
+@@ -1480,7 +1484,7 @@
+ extern unsigned char *merge_index_buf;
+
+ /* merge index file f1 and f2, then put the result in index file f3 */
+-merge_in(f1, f2, f3)
++void merge_in(f1, f2, f3)
+ FILE *f1, *f2, *f3;
+ {
+ int src_mark, dest_mark;
+@@ -1858,7 +1862,7 @@
+ return;
+ }
+
+-remove_filename(fileindex, new_partition)
++void remove_filename(fileindex, new_partition)
+ int fileindex, new_partition;
+ {
+ if ((fileindex < 0) || (fileindex >= MaxNum24bPartition)) return;
+--- index/io.c.orig 2012-09-02 23:58:26.000000000 +0000
++++ index/io.c 2012-09-03 00:00:56.000000000 +0000
+@@ -360,7 +360,7 @@
+
+
+
+-read_filters(index_dir, dofilter)
++void read_filters(index_dir, dofilter)
+ char *index_dir;
+ int dofilter;
+ {
+@@ -1450,7 +1450,7 @@
+ return e->index;
+ }
+
+-insert_filename(name, name_index)
++void insert_filename(name, name_index)
+ char *name;
+ int name_index;
+ {
+@@ -1502,7 +1502,7 @@
+ (*pe)->index = name_index;
+ }
+
+-change_filename(name, len, index, newname)
++void change_filename(name, len, index, newname)
+ char *name;
+ int len;
+ int index;
+@@ -1524,7 +1524,7 @@
+ return;
+ }
+
+-delete_filename(name, name_index)
++void delete_filename(name, name_index)
+ char *name;
+ int name_index;
+ {
+--- index/region.c.orig 2012-09-02 23:55:48.000000000 +0000
++++ index/region.c 2012-09-02 23:56:40.000000000 +0000
+@@ -168,7 +168,7 @@
+ }
+
+ /* Looks for embedded attributes and copies the real attribute into dest */
+-attr_extract(dest, src)
++void attr_extract(dest, src)
+ char *dest, *src;
+ {
+ char *oldsrc = src;
</ins></span></pre>
</div>
</div>
</body>
</html>