Sat Feb 20 11:40:30 2016 UTC ()
Fix install_name on Darwin.  Bump PKGREVISION.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/devel/capstone/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/capstone/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/capstone/patches/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/capstone/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/capstone/Makefile 2015/07/28 12:48:14 1.7
+++ pkgsrc/devel/capstone/Makefile 2016/02/20 11:40:30 1.8
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2015/07/28 12:48:14 sevan Exp $ 1# $NetBSD: Makefile,v 1.8 2016/02/20 11:40:30 jperkin Exp $
2 2
3DISTNAME= capstone-3.0.4 3DISTNAME= capstone-3.0.4
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=aquynh/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=aquynh/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.capstone-engine.org/ 9HOMEPAGE= http://www.capstone-engine.org/
9COMMENT= Lightweight multi-platform, multi-architecture disassembly framework 10COMMENT= Lightweight multi-platform, multi-architecture disassembly framework
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12PKGCONFIG_OVERRIDE+= capstone.pc 13PKGCONFIG_OVERRIDE+= capstone.pc
13PKGCONFIG_OVERRIDE_STAGE= post-build 14PKGCONFIG_OVERRIDE_STAGE= post-build
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15# succeeds after 'make install' 16# succeeds after 'make install'
16TEST_TARGET= check 17TEST_TARGET= check
cvs diff -r1.8 -r1.9 pkgsrc/devel/capstone/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/capstone/distinfo 2015/11/03 03:27:17 1.8
+++ pkgsrc/devel/capstone/distinfo 2016/02/20 11:40:30 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2015/11/03 03:27:17 agc Exp $ 1$NetBSD: distinfo,v 1.9 2016/02/20 11:40:30 jperkin Exp $
2 2
3SHA1 (capstone-3.0.4.tar.gz) = 6153bbb4a4141fd9e6996d646cf7c81953cfe75a 3SHA1 (capstone-3.0.4.tar.gz) = 6153bbb4a4141fd9e6996d646cf7c81953cfe75a
4RMD160 (capstone-3.0.4.tar.gz) = 3f96993cc7cd2fbc1080e785bb7c7ae7f209d0f9 4RMD160 (capstone-3.0.4.tar.gz) = 3f96993cc7cd2fbc1080e785bb7c7ae7f209d0f9
5SHA512 (capstone-3.0.4.tar.gz) = a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d 5SHA512 (capstone-3.0.4.tar.gz) = a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d
6Size (capstone-3.0.4.tar.gz) = 2800818 bytes 6Size (capstone-3.0.4.tar.gz) = 2800818 bytes
7SHA1 (patch-Makefile) = 7720d97ba443e0bf3465dd5963535b4079956c1e 7SHA1 (patch-Makefile) = a29910046034f468101b6b291c4f995923d09528
cvs diff -r1.1 -r1.2 pkgsrc/devel/capstone/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/capstone/patches/patch-Makefile 2015/07/28 12:48:14 1.1
+++ pkgsrc/devel/capstone/patches/patch-Makefile 2016/02/20 11:40:30 1.2
@@ -1,33 +1,44 @@ @@ -1,33 +1,44 @@
1$NetBSD: patch-Makefile,v 1.1 2015/07/28 12:48:14 sevan Exp $ 1$NetBSD: patch-Makefile,v 1.2 2016/02/20 11:40:30 jperkin Exp $
2 2
3Unbreak build on FreeBSD and DragonflyBSD. 3Unbreak build on FreeBSD and DragonflyBSD.
4 4
5Patch accepted upstream: 5Patch accepted upstream:
6https://github.com/aquynh/capstone/commit/453b41a29ed7f02f8319329cc86853d394b85a1e 6https://github.com/aquynh/capstone/commit/453b41a29ed7f02f8319329cc86853d394b85a1e
7 7
 8Fix install_name on Darwin.
 9
8--- Makefile.orig 2015-07-15 07:44:42.000000000 +0000 10--- Makefile.orig 2015-07-15 07:44:42.000000000 +0000
9+++ Makefile 11+++ Makefile
10@@ -70,12 +70,18 @@ LIBDIRARCH ?= lib 12@@ -70,12 +70,18 @@ LIBDIRARCH ?= lib
11 LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH) 13 LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
12  14
13 LIBDATADIR = $(LIBDIR) 15 LIBDATADIR = $(LIBDIR)
14+ 16+
15+# Don't redefine $LIBDATADIR when global environment variable 17+# Don't redefine $LIBDATADIR when global environment variable
16+# USE_GENERIC_LIBDATADIR is set. This is used by the pkgsrc framework. 18+# USE_GENERIC_LIBDATADIR is set. This is used by the pkgsrc framework.
17+ 19+
18+ifndef USE_GENERIC_LIBDATADIR 20+ifndef USE_GENERIC_LIBDATADIR
19 ifeq ($(UNAME_S), FreeBSD) 21 ifeq ($(UNAME_S), FreeBSD)
20 LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata 22 LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata
21 endif 23 endif
22 ifeq ($(UNAME_S), DragonFly) 24 ifeq ($(UNAME_S), DragonFly)
23 LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata 25 LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata
24 endif 26 endif
25+endif 27+endif
26  28
27 INSTALL_BIN ?= install 29 INSTALL_BIN ?= install
28 INSTALL_DATA ?= $(INSTALL_BIN) -m0644 30 INSTALL_DATA ?= $(INSTALL_BIN) -m0644
 31@@ -248,7 +254,7 @@ IS_APPLE := $(shell $(CC) -dM -E - < /de
 32 ifeq ($(IS_APPLE),1)
 33 EXT = dylib
 34 VERSION_EXT = $(API_MAJOR).$(EXT)
 35-$(LIBNAME)_LDFLAGS += -dynamiclib -install_name lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR)
 36+$(LIBNAME)_LDFLAGS += -dynamiclib -install_name ${LIBDIR}/lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR)
 37 AR_EXT = a
 38 # Homebrew wants to make sure its formula does not disable FORTIFY_SOURCE
 39 # However, this is not really necessary because 'CAPSTONE_USE_SYS_DYN_MEM=yes' by default
29@@ -463,4 +469,3 @@ define generate-pkgcfg 40@@ -463,4 +469,3 @@ define generate-pkgcfg
30 echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF) 41 echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
31 echo 'Cflags: -I$${includedir}' >> $(PKGCFGF) 42 echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)
32 endef 43 endef
33- 44-