[117652] trunk/dports/devel/capstone

[ryandesign at macports.org]

Revision: 117652
          https://trac.macports.org/changeset/117652
Author:   ryandesign at macports.org
Date:     2014-03-06 21:09:28 -0800 (Thu, 06 Mar 2014)
Log Message:
-----------
capstone: update to 2.1 (#42724)

Modified Paths:
--------------
    trunk/dports/devel/capstone/Portfile
    trunk/dports/devel/capstone/files/patch-Makefile.diff

Modified: trunk/dports/devel/capstone/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                capstone
-version             2.0
-revision            1
+version             2.1
 categories          devel
 platforms           darwin
 maintainers         gmail.com:aquynh
@@ -19,8 +18,8 @@
 master_sites        ${homepage}download/${version}/
 extract.suffix      .tgz
 
-checksums           sha256  5d871b1e52047d1b2882bbcc6f049205ba6acc8d55d746937d22af5d0b33fa9e \
-                    rmd160  bb7551404e203fa99240b5e33c3d30ca8555830f
+checksums           sha256  5ebc168212a159218a4454c72d0c060b8a8af78605b93b214b3d6c5e2a124896 \
+                    rmd160  47b9a1949b7c82ec235dcb96a81d456f3b18eae6
 
 patchfiles          patch-Makefile.diff
 

Modified: trunk/dports/devel/capstone/files/patch-Makefile.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- Makefile.orig	2014-01-22 04:33:35.000000000 -0600
-+++ Makefile	2014-02-14 18:38:48.000000000 -0600
-@@ -21,20 +21,23 @@
+--- Makefile.org	2014-03-04 18:18:25.000000000 -0800
++++ Makefile	2014-03-04 18:27:48.000000000 -0800
+@@ -21,20 +21,24 @@
  CFLAGS += -DUSE_SYS_DYN_MEM
  endif
  
@@ -10,15 +10,16 @@
  DESTDIR ?=
 -INCDIR = $(DESTDIR)$(PREFIX)/include
 +INCDIR = $(PREFIX)/include
-+
+ 
+-LIBDIR = $(DESTDIR)$(PREFIX)/lib
 +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)
@@ -33,15 +34,29 @@
  endif
  endif
  
-@@ -88,7 +91,6 @@
- 
+@@ -136,21 +140,10 @@
+ LIBOBJ += $(LIBOBJ_ARM) $(LIBOBJ_ARM64) $(LIBOBJ_MIPS) $(LIBOBJ_PPC) $(LIBOBJ_X86)
  LIBOBJ += MCInst.o
  
+-
 -UNAME_S := $(shell uname -s)
+-PKGCFCGDIR = $(LIBDIR)/pkgconfig
+-
  # OSX?
  ifeq ($(UNAME_S),Darwin)
  EXT = dylib
-@@ -145,25 +147,25 @@
+ 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 @@
  	echo 'Description: Capstone disassembler engine' >> $(PKGCFGF)
  	echo 'Version: $(VERSION)' >> $(PKGCFGF)
  	echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
@@ -57,8 +72,8 @@
 -	$(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 $(PKGCFCGDIR)
+-	$(INSTALL_DATA) $(PKGCFGF) $(PKGCFCGDIR)/
 +	mkdir -p $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(DESTDIR)$(LIBDIR)
@@ -71,7 +86,7 @@
 -	rm -rf $(INCDIR)/$(LIBNAME)
 -	rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT)
 -	rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
--	rm -f $(LIBDIR)/pkgconfig/$(LIBNAME).pc
+-	rm -f $(PKGCFCGDIR)/$(LIBNAME).pc
 +	rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
 +	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(EXT)
 +	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140306/5263328f/attachment.html>