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

Pawel Pekala pawel at FreeBSD.org
Mon Mar 31 19:56:49 UTC 2014


Author: pawel
Date: Mon Mar 31 19:56:48 2014
New Revision: 349794
URL: http://svnweb.freebsd.org/changeset/ports/349794
QAT: https://qat.redports.org/buildarchive/r349794/

Log:
  Revert part of last commit. This adds DragonFly support back.
  
  Noticed by:	marino

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

Modified: head/devel/capstone/files/patch-Makefile
==============================================================================
--- head/devel/capstone/files/patch-Makefile	Mon Mar 31 19:51:46 2014	(r349793)
+++ head/devel/capstone/files/patch-Makefile	Mon Mar 31 19:56:48 2014	(r349794)
@@ -1,6 +1,5 @@
-diff -ru /Makefile /Makefile
---- Makefile	2014-03-14 17:24:44.000000000 +0100
-+++ Makefile	2014-03-14 17:35:33.000000000 +0100
+--- Makefile.orig	2014-03-11 04:41:09.000000000 +0100
++++ Makefile	2014-03-31 21:34:29.000000000 +0200
 @@ -16,7 +16,7 @@
  STRIP = $(CROSS)strip
  endif
@@ -10,17 +9,11 @@ diff -ru /Makefile /Makefile
  
  ifeq ($(USE_SYS_DYN_MEM),yes)
  CFLAGS += -DUSE_SYS_DYN_MEM
-@@ -39,9 +39,17 @@
+@@ -39,9 +39,11 @@
  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
@@ -29,7 +22,7 @@ diff -ru /Makefile /Makefile
  
  LIBNAME = capstone
  
-@@ -138,8 +146,7 @@
+@@ -138,8 +140,7 @@
  LIBOBJ += MCInst.o
  
  
@@ -39,7 +32,7 @@ diff -ru /Makefile /Makefile
  
  # OSX?
  ifeq ($(UNAME_S),Darwin)
-@@ -244,7 +251,7 @@
+@@ -244,7 +245,7 @@
  
  install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
  	mkdir -p $(LIBDIR)


More information about the svn-ports-head mailing list