Ticket #45939: capstone-3.0-macport.diff

File capstone-3.0-macport.diff, 3.4 KB (added by aquynh@…, 9 years ago)

diff between old & new files

  • capstone/Portfile 

    diff -Nurp devel/capstone/Portfile devel2/capstone/Portfile
    old new  
    11# -*- 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
    2 # $Id$
     2# $Id: Portfile 118429 2014-04-02 07:44:35Z and.damore@macports.org $
    33
    44PortSystem          1.0
    55
    66name                capstone
    7 version             2.1.2
     7version             3.0
    88categories          devel
    99platforms           darwin
    1010maintainers         gmail.com:aquynh
    … … homepage http://www.capstone- 
    1818master_sites        ${homepage}download/${version}/
    1919extract.suffix      .tgz
    2020
    21 checksums           sha256  49e41d662c5ed4dcd391ec4cfce75fb31ca4bfd245eba9e8f0cb69d6f6e8d7cc \
    22                     rmd160  c4a542752c1ffc6262507a799f96470e076429b9
     21checksums           sha256  1deacc204f1b0b9df01b543cb1735bf8e857bc0783e6e4749c3760c62e0e7bf0 \
     22                    rmd160  351ee783d2d18679d3db23e4b5e2ebe2b4d15f12
    2323
    2424patchfiles          patch-Makefile.diff
    2525

  • capstone/files/patch-Makefile.diff 

    diff -Nurp devel/capstone/files/patch-Makefile.diff devel2/capstone/files/patch-Makefile.diff
    old new  
    1 --- Makefile.org        2014-04-01 06:08:49.000000000 -0700
    2 +++ Makefile    2014-04-01 06:27:43.000000000 -0700
    3 @@ -163,19 +163,6 @@
     1--- Makefile
     2+++ Makefile
     3@@ -246,14 +246,6 @@ EXT = dylib
    44 VERSION_EXT = $(API_MAJOR).$(EXT)
    5  LDFLAGS += -dynamiclib -install_name lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR)
     5 $(LIBNAME)_LDFLAGS += -dynamiclib -install_name lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR)
    66 AR_EXT = a
     7-# Homebrew wants to make sure its formula does not disable FORTIFY_SOURCE
     8-# However, this is not really necessary because 'CAPSTONE_USE_SYS_DYN_MEM=yes' by default
    79-ifneq ($(HOMEBREW_CAPSTONE),1)
    8 -ifneq ($(USE_SYS_DYN_MEM),yes)
     10-ifneq ($(CAPSTONE_USE_SYS_DYN_MEM),yes)
    911-# remove string check because OSX kernel complains about missing symbols
    1012-CFLAGS += -D_FORTIFY_SOURCE=0
    1113-endif
    12 -# By default, suppose that Brew is installed & use Brew path for pkgconfig file
    13 -PKGCFCGDIR = /usr/local/lib/pkgconfig
    14 -# is Macport installed instead?
    15 -ifneq (,$(wildcard /opt/local/bin/port))
    16 -# then correct the path for pkgconfig file
    17 -PKGCFCGDIR = /opt/local/lib/pkgconfig
    18 -endif
    1914-endif
    2015 else
     16 $(LIBNAME)_LDFLAGS += -shared
    2117 # Cygwin?
    22  IS_CYGWIN := $(shell $(CC) -dumpmachine | grep -i cygwin | wc -l)
    23 @@ -239,15 +226,13 @@
    24         echo 'Version: $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA)' >> $(PKGCFGF)
    25  endif
    26         echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
    27 -       echo 'includedir=$(PREFIX)/include/capstone' >> $(PKGCFGF)
    28 +       echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF)
    29         echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF)
    30         echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
    31         echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)
    32  
    33  install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
    34         mkdir -p $(LIBDIR)
    35 -       # remove potential broken old libs
    36 -       rm -f $(LIBDIR)/lib$(LIBNAME).*
    37         $(INSTALL_LIB) lib$(LIBNAME).$(EXT) $(LIBDIR)
    38  ifneq ($(VERSION_EXT),)
    39         cd $(LIBDIR) && \