capstone: updated Makefile for FreeBSD packages
Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
diff --git a/packages/freebsd/ports/devel/capstone/files/patch-Makefile b/packages/freebsd/ports/devel/capstone/files/patch-Makefile
index 7c18ee2..dcb85bb 100644
--- a/packages/freebsd/ports/devel/capstone/files/patch-Makefile
+++ b/packages/freebsd/ports/devel/capstone/files/patch-Makefile
@@ -1,6 +1,7 @@
---- Makefile.orig 2014-01-22 11:33:35.000000000 +0100
-+++ Makefile 2014-01-25 19:13:32.000000000 +0100
-@@ -15,7 +15,7 @@
+diff -ru /Makefile /Makefile
+--- Makefile 2014-03-14 17:24:44.000000000 +0100
++++ Makefile 2014-03-14 17:35:33.000000000 +0100
+@@ -16,7 +16,7 @@
STRIP = $(CROSS)strip
endif
@@ -9,7 +10,7 @@
ifeq ($(USE_SYS_DYN_MEM),yes)
CFLAGS += -DUSE_SYS_DYN_MEM
-@@ -38,6 +38,14 @@
+@@ -39,9 +39,17 @@
endif
endif
@@ -23,30 +24,27 @@
+
INSTALL_BIN ?= install
INSTALL_DATA ?= $(INSTALL_BIN) -m0644
- INSTALL_LIBRARY ?= $(INSTALL_BIN) -m0755
-@@ -88,7 +96,6 @@
+-INSTALL_LIBRARY ?= $(INSTALL_BIN) -m0755
++INSTALL_LIB ?= $(INSTALL_BIN) -m0755
+ LIBNAME = capstone
+
+@@ -138,8 +146,7 @@
LIBOBJ += MCInst.o
+
-UNAME_S := $(shell uname -s)
+-PKGCFCGDIR = $(LIBDIR)/pkgconfig
++PKGCFCGDIR = $(LIBDATADIR)/pkgconfig
+
# OSX?
ifeq ($(UNAME_S),Darwin)
- EXT = dylib
-@@ -156,14 +163,14 @@
+@@ -244,7 +251,7 @@
+
+ install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
+ mkdir -p $(LIBDIR)
+- $(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(LIBDIR)
++ $(INSTALL_LIB) lib$(LIBNAME).$(EXT) $(LIBDIR)
$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
mkdir -p $(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
-- mkdir -p $(LIBDIR)/pkgconfig
-- $(INSTALL_DATA) $(PKGCFGF) $(LIBDIR)/pkgconfig/
-+ mkdir -p $(LIBDATADIR)/pkgconfig
-+ $(INSTALL_DATA) $(PKGCFGF) $(LIBDATADIR)/pkgconfig/
-
- uninstall:
- rm -rf $(INCDIR)/$(LIBNAME)
- rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT)
- rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
-- rm -f $(LIBDIR)/pkgconfig/$(LIBNAME).pc
-+ rm -f $(LIBDATADIR)/pkgconfig/$(LIBNAME).pc
-
- clean:
- rm -f $(LIBOBJ) lib$(LIBNAME).*
diff --git a/packages/freebsd/ports/devel/capstone/files/patch-tests_Makefile b/packages/freebsd/ports/devel/capstone/files/patch-tests_Makefile
deleted file mode 100644
index ea97141..0000000
--- a/packages/freebsd/ports/devel/capstone/files/patch-tests_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- tests/Makefile.orig 2014-01-25 19:14:03.000000000 +0100
-+++ tests/Makefile 2014-01-25 19:14:24.000000000 +0100
-@@ -11,7 +11,7 @@
- endif
-
-
--CFLAGS += -fPIC -O3 -Wall -I$(INCDIR) -L$(LIBDIR)
-+CFLAGS += -fPIC -Wall -I$(INCDIR) -L$(LIBDIR)
-
- LIBNAME = capstone
-
-@@ -48,8 +48,8 @@
- $(BINARY): $(OBJS)
-
- %$(BIN_EXT): %.o
-- ${CC} $(CFLAGS) $(LDFLAGS) $< -O3 -Wall -l$(LIBNAME) -o $@
-- ${CC} $(CFLAGS) $(LDFLAGS) $< -O3 -Wall ../lib$(LIBNAME).$(AR_EXT) -o $(subst $(BIN_EXT),,$@).static$(BIN_EXT)
-+ ${CC} $(CFLAGS) $(LDFLAGS) $< -Wall -l$(LIBNAME) -o $@
-+ ${CC} $(CFLAGS) $(LDFLAGS) $< -Wall ../lib$(LIBNAME).$(AR_EXT) -o $(subst $(BIN_EXT),,$@).static$(BIN_EXT)
-
- %.o: %.c
- ${CC} ${CFLAGS} -c $< -o $@