svn commit: r346753 - head/devel/capstone/files

[John Marino]

Author: marino
Date: Sun Mar  2 09:56:45 2014
New Revision: 346753
URL: http://svnweb.freebsd.org/changeset/ports/346753
QAT: https://qat.redports.org/buildarchive/r346753/

Log:
  devel/capstone: Add DragonFly support
  
  The makefile patch was strange in that it defined LIBDATADIR once
  unconditionally and then again conditionally.  This could have been
  done via MAKE_ARGS and no patch at all.  However, I changed the
  patch to a single definition that is true for "ports" regardless
  of the platform used (pkgconfig files always in libdata in ports).
  This allows port to build on DragonFly and no-op for FreeBSD.

Modified:
  head/devel/capstone/files/patch-Makefile

Modified: head/devel/capstone/files/patch-Makefile
==============================================================================
--- head/devel/capstone/files/patch-Makefile	Sun Mar  2 09:45:12 2014	(r346752)
+++ head/devel/capstone/files/patch-Makefile	Sun Mar  2 09:56:45 2014	(r346753)
@@ -1,6 +1,6 @@
---- Makefile.orig	2014-01-22 11:33:35.000000000 +0100
-+++ Makefile	2014-01-25 19:13:32.000000000 +0100
-@@ -15,7 +15,7 @@
+--- Makefile.orig	2014-01-22 10:33:35.000000000 +0000
++++ Makefile
+@@ -15,7 +15,7 @@ RANLIB = $(CROSS)ranlib
  STRIP = $(CROSS)strip
  endif
  
@@ -9,22 +9,16 @@
  
  ifeq ($(USE_SYS_DYN_MEM),yes)
  CFLAGS += -DUSE_SYS_DYN_MEM
-@@ -38,6 +38,14 @@
+@@ -38,6 +38,8 @@ LIBDIR = $(DESTDIR)$(PREFIX)/lib
  endif
  endif
  
-+LIBDATADIR = $(LIBDIR)
-+UNAME_S := $(shell uname -s)
-+ifeq ($(UNAME_S), FreeBSD)
 +LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata
-+else
-+LIBDATADIR = $(LIBDIR)
-+endif
 +
  INSTALL_BIN ?= install
  INSTALL_DATA ?= $(INSTALL_BIN) -m0644
  INSTALL_LIBRARY ?= $(INSTALL_BIN) -m0755
-@@ -88,7 +96,6 @@
+@@ -88,7 +90,6 @@ endif
  
  LIBOBJ += MCInst.o
  
@@ -32,7 +26,7 @@
  # OSX?
  ifeq ($(UNAME_S),Darwin)
  EXT = dylib
-@@ -156,14 +163,14 @@
+@@ -156,14 +157,14 @@ install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY
  	$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
  	mkdir -p $(INCDIR)/$(LIBNAME)
  	$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)