<!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>[117652] trunk/dports/devel/capstone</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/117652">117652</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-03-06 21:09:28 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>capstone: update to 2.1 (#42724)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcapstonePortfile">trunk/dports/devel/capstone/Portfile</a></li>
<li><a href="#trunkdportsdevelcapstonefilespatchMakefilediff">trunk/dports/devel/capstone/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcapstonePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/capstone/Portfile (117651 => 117652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/capstone/Portfile 2014-03-07 02:53:56 UTC (rev 117651)
+++ trunk/dports/devel/capstone/Portfile 2014-03-07 05:09:28 UTC (rev 117652)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name capstone
</span><del>-version 2.0
-revision 1
</del><ins>+version 2.1
</ins><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:aquynh
</span><span class="lines">@@ -19,8 +18,8 @@
</span><span class="cx"> master_sites ${homepage}download/${version}/
</span><span class="cx"> extract.suffix .tgz
</span><span class="cx">
</span><del>-checksums sha256 5d871b1e52047d1b2882bbcc6f049205ba6acc8d55d746937d22af5d0b33fa9e \
- rmd160 bb7551404e203fa99240b5e33c3d30ca8555830f
</del><ins>+checksums sha256 5ebc168212a159218a4454c72d0c060b8a8af78605b93b214b3d6c5e2a124896 \
+ rmd160 47b9a1949b7c82ec235dcb96a81d456f3b18eae6
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-Makefile.diff
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcapstonefilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/capstone/files/patch-Makefile.diff (117651 => 117652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/capstone/files/patch-Makefile.diff 2014-03-07 02:53:56 UTC (rev 117651)
+++ trunk/dports/devel/capstone/files/patch-Makefile.diff 2014-03-07 05:09:28 UTC (rev 117652)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.orig 2014-01-22 04:33:35.000000000 -0600
-+++ Makefile 2014-02-14 18:38:48.000000000 -0600
-@@ -21,20 +21,23 @@
</del><ins>+--- Makefile.org 2014-03-04 18:18:25.000000000 -0800
++++ Makefile 2014-03-04 18:27:48.000000000 -0800
+@@ -21,20 +21,24 @@
</ins><span class="cx"> CFLAGS += -DUSE_SYS_DYN_MEM
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="lines">@@ -10,15 +10,16 @@
</span><span class="cx"> DESTDIR ?=
</span><span class="cx"> -INCDIR = $(DESTDIR)$(PREFIX)/include
</span><span class="cx"> +INCDIR = $(PREFIX)/include
</span><del>-+
</del><ins>+
+-LIBDIR = $(DESTDIR)$(PREFIX)/lib
</ins><span class="cx"> +UNAME_S := $(shell uname -s)
</span><span class="cx"> +ifeq ($(UNAME_S),Darwin)
</span><span class="cx"> +LDFLAGS += -dynamiclib -install_name $(LIBDIR)/$(LIBRARY)
</span><span class="cx"> +else
</span><span class="cx"> +LDFLAGS += -shared
</span><span class="cx"> +endif
</span><del>-
--LIBDIR = $(DESTDIR)$(PREFIX)/lib
</del><ins>++
++
</ins><span class="cx"> +LIBDIR = $(PREFIX)/lib
</span><span class="cx"> # on x86_64, we might have /usr/lib64 directory instead of /usr/lib
</span><span class="cx"> -MACHINE := $(shell uname -m)
</span><span class="lines">@@ -33,15 +34,29 @@
</span><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-@@ -88,7 +91,6 @@
-
</del><ins>+@@ -136,21 +140,10 @@
+ LIBOBJ += $(LIBOBJ_ARM) $(LIBOBJ_ARM64) $(LIBOBJ_MIPS) $(LIBOBJ_PPC) $(LIBOBJ_X86)
</ins><span class="cx"> LIBOBJ += MCInst.o
</span><span class="cx">
</span><ins>+-
</ins><span class="cx"> -UNAME_S := $(shell uname -s)
</span><ins>+-PKGCFCGDIR = $(LIBDIR)/pkgconfig
+-
</ins><span class="cx"> # OSX?
</span><span class="cx"> ifeq ($(UNAME_S),Darwin)
</span><span class="cx"> EXT = dylib
</span><del>-@@ -145,25 +147,25 @@
</del><ins>+ AR_EXT = a
+-# By default, suppose that Brew is installed & use Brew path for pkgconfig file
+-PKGCFCGDIR = /usr/local/lib/pkgconfig
+-# is Macport installed instead?
+-ifneq (,$(wildcard /opt/local/bin/port))
+-# then correct the path for pkgconfig file
+-PKGCFCGDIR = /opt/local/lib/pkgconfig
+-endif
+ else
+ # Cygwin?
+ IS_CYGWIN := $(shell $(CC) -dumpmachine | grep -i cygwin | wc -l)
+@@ -228,25 +221,25 @@
</ins><span class="cx"> echo 'Description: Capstone disassembler engine' >> $(PKGCFGF)
</span><span class="cx"> echo 'Version: $(VERSION)' >> $(PKGCFGF)
</span><span class="cx"> echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
</span><span class="lines">@@ -57,8 +72,8 @@
</span><span class="cx"> - $(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
</span><span class="cx"> - mkdir -p $(INCDIR)/$(LIBNAME)
</span><span class="cx"> - $(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
</span><del>-- mkdir -p $(LIBDIR)/pkgconfig
-- $(INSTALL_DATA) $(PKGCFGF) $(LIBDIR)/pkgconfig/
</del><ins>+- mkdir -p $(PKGCFCGDIR)
+- $(INSTALL_DATA) $(PKGCFGF) $(PKGCFCGDIR)/
</ins><span class="cx"> + mkdir -p $(DESTDIR)$(LIBDIR)
</span><span class="cx"> + $(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(DESTDIR)$(LIBDIR)
</span><span class="cx"> + $(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(DESTDIR)$(LIBDIR)
</span><span class="lines">@@ -71,7 +86,7 @@
</span><span class="cx"> - rm -rf $(INCDIR)/$(LIBNAME)
</span><span class="cx"> - rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT)
</span><span class="cx"> - rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
</span><del>-- rm -f $(LIBDIR)/pkgconfig/$(LIBNAME).pc
</del><ins>+- rm -f $(PKGCFCGDIR)/$(LIBNAME).pc
</ins><span class="cx"> + rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
</span><span class="cx"> + rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(EXT)
</span><span class="cx"> + rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
</span></span></pre>
</div>
</div>
</body>
</html>