4 files changed, 33 insertions, 49 deletions

diff --git a/devel/dyncall/Makefile b/devel/dyncall/Makefile
index 1411dcdfda96..d2944a3e42a2 100644
--- a/devel/dyncall/Makefile
+++ b/devel/dyncall/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	dyncall
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	devel
-MASTER_SITES=	http://www.dyncall.org/r${PORTVERSION}/
+MASTER_SITES=	http://www.dyncall.org/r${PORTVERSION}/ \
+		http://www.potion-studios.com/
 
 MAINTAINER=	tphilipp@potion-studios.com
 COMMENT=	Highly dynamic multi-platform foreign function call interface library
@@ -18,8 +19,8 @@ HAS_CONFIGURE=	yes
 
 MAKEFILE=	BSDmakefile
 
-# There is no install target in the BSD makefile of version 0.5 of the dyncall library, so
-# install it manually.
+# There is no install target in the BSD makefile for this version of the dyncall
+# library, so install it manually.
 
 .include <bsd.port.pre.mk>
 
@@ -29,8 +30,24 @@ BROKEN=		Does not install (unsupported architecture)
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/dyncall/dyncall.h \
-		${WRKSRC}/dyncall/dyncall_*.h \
-		${WRKSRC}/dyncallback/dyncall_*.h \
+		${WRKSRC}/dyncall/dyncall_alloc.h \
+		${WRKSRC}/dyncall/dyncall_vector.h \
+		${WRKSRC}/dyncall/dyncall_types.h \
+		${WRKSRC}/dyncall/dyncall_value.h \
+		${WRKSRC}/dyncall/dyncall_callf.h \
+		${WRKSRC}/dyncall/dyncall_callvm.h \
+		${WRKSRC}/dyncall/dyncall_config.h \
+		${WRKSRC}/dyncall/dyncall_macros.h \
+		${WRKSRC}/dyncall/dyncall_signature.h \
+		${WRKSRC}/dyncallback/dyncall_alloc_wx.h \
+		${WRKSRC}/dyncallback/dyncall_args.h \
+		${WRKSRC}/dyncallback/dyncall_callback.h \
+		${WRKSRC}/dyncallback/dyncall_thunk.h \
+		${WRKSRC}/dyncallback/dyncall_thunk_arm32_arm.h \
+		${WRKSRC}/dyncallback/dyncall_thunk_arm32_thumb.h \
+		${WRKSRC}/dyncallback/dyncall_thunk_ppc32.h \
+		${WRKSRC}/dyncallback/dyncall_thunk_x86.h \
+		${WRKSRC}/dyncallback/dyncall_thunk_x64.h \
 		${WRKSRC}/dynload/dynload.h \
 		${PREFIX}/include
 	${INSTALL_DATA}	${WRKSRC}/dyncall/libdyncall_s.a \
diff --git a/devel/dyncall/distinfo b/devel/dyncall/distinfo
index f0d63a769842..c6ba83ec5c4b 100644
--- a/devel/dyncall/distinfo
+++ b/devel/dyncall/distinfo
@@ -1,3 +1,3 @@
-MD5 (dyncall-0.5.tar.gz) = 0f3682045851abe6f853383c7c08c6ae
-SHA256 (dyncall-0.5.tar.gz) = a781f110e5d7e02cb356ea1aada0c1cd63fff951056d138838a4442f100b9e7f
-SIZE (dyncall-0.5.tar.gz) = 257532
+MD5 (dyncall-0.6.tar.gz) = 8e1e47285374222d1ea2f6bf6ecd78c3
+SHA256 (dyncall-0.6.tar.gz) = c99414abb8ebda2c83b345ec90c3f79ee4daaaaf2a0a29d4a1cc589ed43d0dc7
+SIZE (dyncall-0.6.tar.gz) = 302634
diff --git a/devel/dyncall/files/patch-configure b/devel/dyncall/files/patch-configure
deleted file mode 100644
index 8db74153d78f..000000000000
--- a/devel/dyncall/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2010-02-01 20:28:54.000000000 +0100
-+++ configure	2010-04-28 17:51:33.000000000 +0200
-@@ -145,7 +145,7 @@
-     elif [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "x64" ]; then
-       CONFIG_ARCH="x64"
-     fi
--  elif [ "$ARCH" = "Power Macintosh" ] || [ "$ARCH" = "ppc" ] || [ "$ARCH" = "macppc" ]; then
-+  elif [ "$ARCH" = "Power Macintosh" ] || [ "$ARCH" = "ppc" ] || [ "$ARCH" = "macppc" ] || [ "$ARCH" = "powerpc" ]; then
-     CONFIG_ARCH="ppc32"
-   elif [ "$ARCH" = "x86" ] || [ "$ARCH" = "i386" ] || [ "$ARCH" = "i486" ] || [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ] || [ "$ARCH" = "i86pc" ]; then
-     CONFIG_ARCH="x86"
diff --git a/devel/dyncall/pkg-plist b/devel/dyncall/pkg-plist
index bda2cef55ab7..1b77d0931db0 100644
--- a/devel/dyncall/pkg-plist
+++ b/devel/dyncall/pkg-plist
@@ -1,44 +1,22 @@
 include/dyncall.h
 include/dyncall_alloc.h
-include/dyncall_alloc_wx.h
-include/dyncall_args.h
-include/dyncall_args_arm32_arm.h
-include/dyncall_args_arm32_thumb.h
-include/dyncall_args_ppc32.h
-include/dyncall_args_x64.h
-include/dyncall_args_x86.h
-include/dyncall_call_arm32_arm.h
-include/dyncall_call_arm32_thumb.h
-include/dyncall_call_mips32.h
-include/dyncall_call_ppc32.h
-include/dyncall_call_x64.h
-include/dyncall_call_x86.h
-include/dyncall_callback.h
-include/dyncall_callback_arm32_arm.h
-include/dyncall_callback_arm32_thumb.h
-include/dyncall_callback_ppc32.h
-include/dyncall_callback_x64.h
-include/dyncall_callback_x86.h
+include/dyncall_vector.h
+include/dyncall_types.h
+include/dyncall_value.h
 include/dyncall_callf.h
 include/dyncall_callvm.h
-include/dyncall_callvm_arm32_arm.h
-include/dyncall_callvm_arm32_thumb.h
-include/dyncall_callvm_mips32.h
-include/dyncall_callvm_ppc32.h
-include/dyncall_callvm_x64.h
-include/dyncall_callvm_x86.h
 include/dyncall_config.h
 include/dyncall_macros.h
 include/dyncall_signature.h
+include/dyncall_alloc_wx.h
+include/dyncall_args.h
+include/dyncall_callback.h
 include/dyncall_thunk.h
 include/dyncall_thunk_arm32_arm.h
 include/dyncall_thunk_arm32_thumb.h
 include/dyncall_thunk_ppc32.h
-include/dyncall_thunk_x64.h
 include/dyncall_thunk_x86.h
-include/dyncall_types.h
-include/dyncall_value.h
-include/dyncall_vector.h
+include/dyncall_thunk_x64.h
 include/dynload.h
 lib/libdyncall_s.a
 lib/libdyncallback_s.a