[106647] trunk/dports/devel/radare2

g5pw at macports.org g5pw at macports.org
Mon Jun 3 04:36:28 PDT 2013


Revision: 106647
          https://trac.macports.org/changeset/106647
Author:   g5pw at macports.org
Date:     2013-06-03 04:36:27 -0700 (Mon, 03 Jun 2013)
Log Message:
-----------
devel/radare2:
  bump to 0.9.4
  build system has changed, so remove patches
  fix build for universal

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

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

Removed Paths:
-------------
    trunk/dports/devel/radare2/files/libr-Makefile.diff
    trunk/dports/devel/radare2/files/libr-config.mk.tail.diff
    trunk/dports/devel/radare2/files/libr-rules.mk.diff

Modified: trunk/dports/devel/radare2/Portfile
===================================================================
--- trunk/dports/devel/radare2/Portfile	2013-06-03 09:50:37 UTC (rev 106646)
+++ trunk/dports/devel/radare2/Portfile	2013-06-03 11:36:27 UTC (rev 106647)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                radare2
-version             0.9.2
+version             0.9.4
 categories          devel
 platforms           darwin
 license             LGPL-3+
@@ -14,18 +14,39 @@
 homepage            http://radare.org
 master_sites        ${homepage}/get/
 
-checksums           rmd160  60140f2eeeae9c582bfdc027c78c0e7740868571 \
-                    sha256  5f73a41c36182a5f970c60ab1287958f785f35cf41e0a02c8c759f6003b8c52c
+checksums           rmd160  71d0fad808a215a744bcfb6ab597f70bad071123 \
+                    sha256  7af3413f736b979dbf5db3688e9bc3052879a28428ac4f10086fa7f93cba5de0
 
-patch.pre_args      -p1
-patchfiles          libr-Makefile.diff \
-                    libr-config.mk.tail.diff \
-                    libr-rules.mk.diff
+# Patch the fixed (and strangely disabled) arch flags. Will talk with the developers 
+# to integrate this in the build process.
+patchfiles          gcc.mk.patch
 
-variant universal {}
+post-patch {
+    reinplace "s/__ARCH__/${configure.build_arch}/" ${worksrcpath}/mk/gcc.mk
+}
 
-build.args          CC="${configure.cc} [get_canonical_archflags]"
+configure.args-append \
+                    --without-ewf
+                    # --with-sysmagic # For some strange reason, system's magic doesn't work.
 
+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 \
+                    port:openssl
+
+    configure.args-append \
+                    --with-openssl
+}
+
+default_variants    +ewf +openssl
+
 livecheck.type      regex
 livecheck.url       ${homepage}/y/?p=download
 livecheck.regex     "${name}-(\\d+\\.\\d+(\[0-9rc.\]+)?)${extract.suffix}"

Added: trunk/dports/devel/radare2/files/gcc.mk.patch
===================================================================
--- trunk/dports/devel/radare2/files/gcc.mk.patch	                        (rev 0)
+++ trunk/dports/devel/radare2/files/gcc.mk.patch	2013-06-03 11:36:27 UTC (rev 106647)
@@ -0,0 +1,15 @@
+--- 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

Deleted: trunk/dports/devel/radare2/files/libr-Makefile.diff
===================================================================
--- trunk/dports/devel/radare2/files/libr-Makefile.diff	2013-06-03 09:50:37 UTC (rev 106646)
+++ trunk/dports/devel/radare2/files/libr-Makefile.diff	2013-06-03 11:36:27 UTC (rev 106647)
@@ -1,29 +0,0 @@
---- a/libr/Makefile	2011-12-16 06:44:05.000000000 -0800
-+++ b/libr/Makefile	2011-12-16 12:44:12.000000000 -0800
-@@ -54,7 +54,7 @@
- 	done
- 	for a in ${LIBLIST} ; do \
- 		ln -fs ${PWD}/$${a}/libr_$${a}.${EXT_SO} ${LFX}/libr_$${a}.${EXT_SO} ; \
--		ln -fs ${PWD}/$${a}/libr_$${a}.${EXT_SO} ${LFX}/libr_$${a}.${EXT_SO}.${LIBVERSION} ; \
-+		ln -fs ${PWD}/$${a}/libr_$${a}.${EXT_SO} ${LFX}/libr_$${a}.${LIBVERSION}.${EXT_SO} ; \
- 		ln -fs ${PWD}/$${a}/libr_$${a}.${EXT_AR} ${LFX}/libr_$${a}.${EXT_AR} ; \
- 		for b in $${a}/p/*.${EXT_SO} ; do \
- 			if [ -e ${PWD}/$${b} ] ; then \
-@@ -68,12 +68,12 @@
- 	# libraries
- 	@${INSTALL_DIR} ${LFX}
- 	@for a in `find * -type f | grep -e '\.${EXT_SO}$$' | grep -v lib/t | grep lib | grep -v /p/` ; do \
--	  b=`echo $$a|cut -d / -f 2`; \
--	  echo " ${LFX}/$$b.${LIBVERSION}"; \
--	  ${INSTALL_LIB} $$a ${LFX}/$$b.${LIBVERSION} ; \
--	  ( cd ${LFX} ; ln -fs $$b.${LIBVERSION} $$b ) ; \
-+	  b=`echo $$a|cut -d / -f 2|sed -e 's,\.${EXT_SO},,g'`; \
-+	  echo " ${LFX}/$$b.${LIBVERSION}.${EXT_SO}"; \
-+	  ${INSTALL_LIB} $$a ${LFX}/$$b.${LIBVERSION}.${EXT_SO} ; \
-+	  ( cd ${LFX} ; ln -fs $$b.${LIBVERSION}.${EXT_SO} $$b.${EXT_SO} ) ; \
- 	done
--	#Linux only? ( cd ${LFX} ; ln -fs $$b.${LIBVERSION} $$b.0 ; ln -fs $$b.0 $$b )
-+	#Linux only? ( cd ${LFX} ; ln -fs $$b.${LIBVERSION}.${EXT_SO} $$b.0.${EXT_SO} ; ln -fs $$b.0.${EXT_SO} $$b.${EXT_SO} )
- 	# object archives
- 	@for a in `find * -type f | grep -e '\.a$$' | grep -v fs/p` ; do \
- 	  echo " ${LFX}/$$a"; ${INSTALL_DATA} $$a ${LFX} ; done

Deleted: trunk/dports/devel/radare2/files/libr-config.mk.tail.diff
===================================================================
--- trunk/dports/devel/radare2/files/libr-config.mk.tail.diff	2013-06-03 09:50:37 UTC (rev 106646)
+++ trunk/dports/devel/radare2/files/libr-config.mk.tail.diff	2013-06-03 11:36:27 UTC (rev 106647)
@@ -1,10 +0,0 @@
---- a/libr/config.mk.tail	2011-12-16 06:44:05.000000000 -0800
-+++ b/libr/config.mk.tail	2011-12-16 12:45:09.000000000 -0800
-@@ -137,6 +137,6 @@
- ifeq (${OSTYPE},windows)
- libname=-shared -o $1.${EXT_SO}
- else
--libname=-shared -o $1.${EXT_SO} ${LDFLAGS_SONAME}$1.${EXT_SO}.${LIBVERSION}
-+libname=-shared -o $1.${EXT_SO} ${LDFLAGS_SONAME}$1.${LIBVERSION}.${EXT_SO}
- endif
- endif

Deleted: trunk/dports/devel/radare2/files/libr-rules.mk.diff
===================================================================
--- trunk/dports/devel/radare2/files/libr-rules.mk.diff	2013-06-03 09:50:37 UTC (rev 106646)
+++ trunk/dports/devel/radare2/files/libr-rules.mk.diff	2013-06-03 11:36:27 UTC (rev 106647)
@@ -1,11 +0,0 @@
---- a/libr/rules.mk	2011-12-16 06:44:05.000000000 -0800
-+++ b/libr/rules.mk	2011-12-16 14:25:19.000000000 -0800
-@@ -35,7 +35,7 @@
- SRC=$(subst .o,.c,$(OBJ))
- 
- ifeq (${OSTYPE},gnulinux)
--LIBNAME=${LDFLAGS_SONAME}${LIBSO}.${LIBVERSION}
-+LIBNAME=${LDFLAGS_SONAME}${LIBSO}
- else
- LIBNAME=${LDFLAGS_SONAME}${LIBSO}
- endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130603/bf998d7d/attachment.html>


More information about the macports-changes mailing list