From owner-svn-ports-head@FreeBSD.ORG Sun Mar 2 09:56:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76EB719B; Sun, 2 Mar 2014 09:56:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC531244; Sun, 2 Mar 2014 09:56:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s229ukh0079763; Sun, 2 Mar 2014 09:56:46 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s229ukQv079762; Sun, 2 Mar 2014 09:56:46 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201403020956.s229ukQv079762@svn.freebsd.org> From: John Marino Date: Sun, 2 Mar 2014 09:56:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346753 - head/devel/capstone/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 09:56:46 -0000 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)