Merge branch 'next' of https://github.com/aquynh/capstone into next

packages/macports/devel/capstone/Portfile

@@ -0,0 +1,40 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 117078 2014-02-15 00:49:41Z ryandesign@macports.org $
+
+PortSystem          1.0
+
+name                capstone
+version             2.0
+revision            1
+categories          devel
+platforms           darwin
+maintainers         gmail.com:aquynh
+license             BSD
+
+description         Capstone disassembly engine
+
+long_description    Capstone is a multi-arch, multi-platform disassembly framework with advanced features
+
+homepage            http://www.capstone-engine.org/
+master_sites        ${homepage}download/${version}/
+extract.suffix      .tgz
+
+checksums           sha256  5d871b1e52047d1b2882bbcc6f049205ba6acc8d55d746937d22af5d0b33fa9e \
+                    rmd160  bb7551404e203fa99240b5e33c3d30ca8555830f
+
+patchfiles          patch-Makefile.diff
+
+variant universal {}
+
+use_configure       no
+
+build.env           CC=${configure.cc} \
+                    CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+                    PREFIX=${prefix}
+
+eval destroot.env   ${build.env}
+
+livecheck.type      regex
+livecheck.url       ${homepage}download.html
+livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

packages/macports/devel/capstone/files/patch-Makefile.diff

@@ -0,0 +1,81 @@
+--- Makefile.orig	2014-01-22 04:33:35.000000000 -0600
++++ Makefile	2014-02-14 18:38:48.000000000 -0600
+@@ -21,20 +21,23 @@
+ CFLAGS += -DUSE_SYS_DYN_MEM
+ endif
+ 
+-LDFLAGS += -shared
+-
+ PREFIX ?= /usr
+ DESTDIR ?=
+-INCDIR = $(DESTDIR)$(PREFIX)/include
++INCDIR = $(PREFIX)/include
++
++UNAME_S := $(shell uname -s)
++ifeq ($(UNAME_S),Darwin)
++LDFLAGS += -dynamiclib -install_name $(LIBDIR)/$(LIBRARY)
++else
++LDFLAGS += -shared
++endif
+ 
+-LIBDIR = $(DESTDIR)$(PREFIX)/lib
++LIBDIR = $(PREFIX)/lib
+ # on x86_64, we might have /usr/lib64 directory instead of /usr/lib
+-MACHINE := $(shell uname -m)
+-ifeq ($(MACHINE), x86_64)
++UNAME_M := $(shell uname -m)
++ifeq ($(UNAME_M),x86_64)
+ ifeq (,$(wildcard $(LIBDIR)))
+-LIBDIR = $(DESTDIR)$(PREFIX)/lib64
+-else
+-LIBDIR = $(DESTDIR)$(PREFIX)/lib
++LIBDIR = $(PREFIX)/lib64
+ endif
+ endif
+ 
+@@ -88,7 +91,6 @@
+ 
+ LIBOBJ += MCInst.o
+ 
+-UNAME_S := $(shell uname -s)
+ # OSX?
+ ifeq ($(UNAME_S),Darwin)
+ EXT = dylib
+@@ -145,25 +147,25 @@
+ 	echo 'Description: Capstone disassembler engine' >> $(PKGCFGF)
+ 	echo 'Version: $(VERSION)' >> $(PKGCFGF)
+ 	echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
+-	echo 'includedir=$(PREFIX)/include/capstone' >> $(PKGCFGF)
++	echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF)
+ 	echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF)
+ 	echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
+ 	echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)
+ 
+ install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
+-	mkdir -p $(LIBDIR)
+-	$(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(LIBDIR)
+-	$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
+-	mkdir -p $(INCDIR)/$(LIBNAME)
+-	$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
+-	mkdir -p $(LIBDIR)/pkgconfig
+-	$(INSTALL_DATA) $(PKGCFGF) $(LIBDIR)/pkgconfig/
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(DESTDIR)$(LIBDIR)
++	mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME)
++	$(INSTALL_DATA) include/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME)
++	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
++	$(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)$(LIBDIR)/pkgconfig/
+ 
+ uninstall:
+-	rm -rf $(INCDIR)/$(LIBNAME)
+-	rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT)
+-	rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
+-	rm -f $(LIBDIR)/pkgconfig/$(LIBNAME).pc
++	rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
++	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(EXT)
++	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
++	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/$(LIBNAME).pc
+ 
+ clean:
+ 	rm -f $(LIBOBJ) lib$(LIBNAME).*