[142225] trunk/dports/devel/radare2

[g5pw at macports.org]

Revision: 142225
          https://trac.macports.org/changeset/142225
Author:   g5pw at macports.org
Date:     2015-11-07 05:28:56 -0800 (Sat, 07 Nov 2015)
Log Message:
-----------
devel/radare2:
  update to 0.9.9
  remove ewf variant (removed upstream)
  remove gcc patch (configure correctly detects the compiler now)

Modified Paths:
--------------
    trunk/dports/devel/radare2/Portfile

Added Paths:
-----------
    trunk/dports/devel/radare2/files/patch-libr-bin-Makefile.diff
    trunk/dports/devel/radare2/files/patch-shlr-gdb-Makefile.diff

Removed Paths:
-------------
    trunk/dports/devel/radare2/files/gcc.mk.patch

Modified: trunk/dports/devel/radare2/Portfile
===================================================================
--- trunk/dports/devel/radare2/Portfile	2015-11-07 06:08:21 UTC (rev 142224)
+++ trunk/dports/devel/radare2/Portfile	2015-11-07 13:28:56 UTC (rev 142225)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        radare radare2 0.9.6
+github.setup        radare radare2 0.9.9
 categories          devel
 platforms           darwin
 license             LGPL-3+
@@ -13,29 +13,22 @@
 long_description    ${name} provides ${description}.
 homepage            http://radare.org
 
-checksums           rmd160  644125784c46b0ab41a91d6c9c904cd3f3e72f0d \
-                    sha256  a15827380a4a530810dbda8d7da026e774e5067c592b630143522fdc09470824
+depends_lib         port:capstone \
+                    port:libmagic \
+                    port:zlib \
+                    port:libzip
 
-# Patch the fixed (and strangely disabled) arch flags. Will talk with the developers 
-# to integrate this in the build process.
-patchfiles          gcc.mk.patch
+checksums           rmd160  7d569714eec2c27d66eb917bf6e979b7cca24434 \
+                    sha256  2e4558d35bd9065916702db648fed513f82cd71c178af3c7034d97ea7c65b6b9
 
-post-patch {
-    reinplace "s/__ARCH__/${configure.build_arch}/" ${worksrcpath}/mk/gcc.mk
-}
+patchfiles          patch-shlr-gdb-Makefile.diff \
+                    patch-libr-bin-Makefile.diff
 
 configure.args-append \
-                    --without-ewf
-                    # --with-sysmagic # For some strange reason, system's magic doesn't work.
+                    --with-sysmagic \
+                    --with-syscapstone \
+                    --with-syszip \
 
-variant ewf description {Use EWF library} {
-    depends_lib-append \
-                    port:libewf
-    
-    configure.args-delete \
-                    --without-ewf
-}
-
 variant openssl description {Use OpenSSL library} {
     depends_lib-append \
                     path:lib/libssl.dylib:openssl
@@ -44,4 +37,4 @@
                     --with-openssl
 }
 
-default_variants    +ewf +openssl
+default_variants    +openssl

Deleted: trunk/dports/devel/radare2/files/gcc.mk.patch
===================================================================
--- trunk/dports/devel/radare2/files/gcc.mk.patch	2015-11-07 06:08:21 UTC (rev 142224)
+++ trunk/dports/devel/radare2/files/gcc.mk.patch	2015-11-07 13:28:56 UTC (rev 142225)
@@ -1,15 +0,0 @@
---- mk/gcc.mk	2013-03-21 18:18:42.000000000 +0100
-+++ mk/gcc.mk.new	2013-06-02 21:34:57.000000000 +0200
-@@ -17,9 +17,9 @@
- CFLAGS_DEBUG=-g
- 
- ifeq ($(OSTYPE),darwin)
--ARCH=$(shell uname -m)
--#CFLAGS+=-arch ${ARCH}
--#LDFLAGS+=-arch ${ARCH}
-+ARCH=__ARCH__
-+CFLAGS+=-arch ${ARCH}
-+LDFLAGS+=-arch ${ARCH}
- LDFLAGS_LIB=-dynamiclib
- LDFLAGS_SONAME=-Wl,-install_name,${LIBDIR}/
- else

Added: trunk/dports/devel/radare2/files/patch-libr-bin-Makefile.diff
===================================================================
--- trunk/dports/devel/radare2/files/patch-libr-bin-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/radare2/files/patch-libr-bin-Makefile.diff	2015-11-07 13:28:56 UTC (rev 142225)
@@ -0,0 +1,13 @@
+--- libr/bin/Makefile	2015-06-05 04:07:13.000000000 +0200
++++ libr-Makefile	2015-09-01 13:52:03.000000000 +0200
+@@ -4,6 +4,10 @@
+ NAME=r_bin
+ DEPS=r_util r_db r_io r_magic
+ 
++ifeq ($(USE_LIB_MAGIC),1)
++LINK+=-lmagic
++endif
++
+ .PHONY: pre
+ 
+ pre: $(LIBSO) $(LIBAR)

Added: trunk/dports/devel/radare2/files/patch-shlr-gdb-Makefile.diff
===================================================================
--- trunk/dports/devel/radare2/files/patch-shlr-gdb-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/radare2/files/patch-shlr-gdb-Makefile.diff	2015-11-07 13:28:56 UTC (rev 142225)
@@ -0,0 +1,26 @@
+--- shlr/gdb/Makefile	2015-06-05 04:07:13.000000000 +0200
++++ gdb-Makefile	2015-09-01 10:33:39.000000000 +0200
+@@ -13,7 +13,11 @@
+ LD=$(CC)
+ LDFLAGS+=-L${LIBR}/socket -lr_socket
+ LDFLAGS+=-L${LIBR}/util -lr_util
++ifeq ($(USE_LIB_ZIP),1)
++LDFLAGS+=$(pkg-config --libs libzip)
++else
+ LDFLAGS+=../zip/librz.a
++endif
+ #OSTYPE=windows
+ include ../../libr/socket/deps.mk
+ 
+--- libr/bin/p/Makefile	2015-06-05 04:07:13.000000000 +0200
++++ p-Makefile	2015-09-01 15:11:57.000000000 +0200
+@@ -3,6 +3,9 @@
+ CFLAGS=-I$(LTOP)/include -I$(LTOP)/bin/format/ -Wall -fPIC
+ LDFLAGS+=-L$(LTOP)/util -lr_util
+ LDFLAGS+=-L$(LTOP)/bin -lr_bin
++ifeq ($(USE_LIB_MAGIC),1)
++    LDFLAGS+=-lmagic
++endif
+ SHLR=$(LTOP)/../shlr
+ 
+ foo: all
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/4d276a12/attachment-0001.html>