8 files changed, 26 insertions, 40 deletions

diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 4de032894b8e..180460bbf54b 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	cal3d
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-full-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Skeletal based 3d character animation library written in C++
@@ -17,14 +18,17 @@ COMMENT=	Skeletal based 3d character animation library written in C++
 USE_BZIP2=		yes
 USE_GNOME=		pkgconfig
 USE_AUTOMAKE_VER=	19
+AUTOMAKE_ARGS=		"--add-missing"
 USE_AUTOHEADER_VER=	259
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
+CONFIGURE_ARGS+=	--disable-static
 
 .include <bsd.port.pre.mk>
 
-pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL}
+post-patch:
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
 	cd ${WRKSRC} && ${AUTOHEADER}
+	cd ${WRKSRC} && ${LIBTOOLIZE} --automake --force
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cal3d-devel/distinfo b/graphics/cal3d-devel/distinfo
index 92e6f085002f..a286b37a92c9 100644
--- a/graphics/cal3d-devel/distinfo
+++ b/graphics/cal3d-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (cal3d-0.9.1.tar.bz2) = 55023cf5b4063990f355629c57a175af
-SIZE (cal3d-0.9.1.tar.bz2) = 2871094
+MD5 (cal3d-full-0.10.0.tar.bz2) = 47b3b72c6adcf5351f0884639d606d05
+SIZE (cal3d-full-0.10.0.tar.bz2) = 2995348
diff --git a/graphics/cal3d-devel/files/patch-src_cal3d_Makefile.am b/graphics/cal3d-devel/files/patch-src_cal3d_Makefile.am
deleted file mode 100644
index af0cd89babb1..000000000000
--- a/graphics/cal3d-devel/files/patch-src_cal3d_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/cal3d/Makefile.am.orig	Mon Jul 12 17:34:29 2004
-+++ src/cal3d/Makefile.am	Mon Jul 12 17:35:04 2004
-@@ -13,7 +13,8 @@
- INCLUDES = $(all_includes) -I$(top_srcdir)/src
- 
- all_libraries = @all_libraries@
--LDFLAGS = @LDFLAGS@
-+#LDFLAGS = @LDFLAGS@
-+AM_LDFLAGS = @AM_LDFLAGS@
- 
- EXTRA_DIST = cal3d.rc cal3d.dsp SConscript
- 
diff --git a/graphics/cal3d-devel/pkg-plist b/graphics/cal3d-devel/pkg-plist
index 54fc843ae4fc..079d377287ae 100644
--- a/graphics/cal3d-devel/pkg-plist
+++ b/graphics/cal3d-devel/pkg-plist
@@ -1,6 +1,7 @@
 include/cal3d/animation.h
 include/cal3d/animation_action.h
 include/cal3d/animation_cycle.h
+include/cal3d/animcallback.h
 include/cal3d/bone.h
 include/cal3d/buffersource.h
 include/cal3d/cal3d.h
@@ -19,6 +20,7 @@ include/cal3d/coretrack.h
 include/cal3d/datasource.h
 include/cal3d/error.h
 include/cal3d/global.h
+include/cal3d/hardwaremodel.h
 include/cal3d/loader.h
 include/cal3d/matrix.h
 include/cal3d/mesh.h
@@ -39,7 +41,6 @@ include/cal3d/tinystr.h
 include/cal3d/tinyxml.h
 include/cal3d/vector.h
 @dirrm include/cal3d
-lib/libcal3d-0.9.1.so
-lib/libcal3d.la
 lib/libcal3d.so
+lib/libcal3d.so.11
 libdata/pkgconfig/cal3d.pc
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 4de032894b8e..180460bbf54b 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	cal3d
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-full-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Skeletal based 3d character animation library written in C++
@@ -17,14 +18,17 @@ COMMENT=	Skeletal based 3d character animation library written in C++
 USE_BZIP2=		yes
 USE_GNOME=		pkgconfig
 USE_AUTOMAKE_VER=	19
+AUTOMAKE_ARGS=		"--add-missing"
 USE_AUTOHEADER_VER=	259
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
+CONFIGURE_ARGS+=	--disable-static
 
 .include <bsd.port.pre.mk>
 
-pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL}
+post-patch:
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
 	cd ${WRKSRC} && ${AUTOHEADER}
+	cd ${WRKSRC} && ${LIBTOOLIZE} --automake --force
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 92e6f085002f..a286b37a92c9 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,2 +1,2 @@
-MD5 (cal3d-0.9.1.tar.bz2) = 55023cf5b4063990f355629c57a175af
-SIZE (cal3d-0.9.1.tar.bz2) = 2871094
+MD5 (cal3d-full-0.10.0.tar.bz2) = 47b3b72c6adcf5351f0884639d606d05
+SIZE (cal3d-full-0.10.0.tar.bz2) = 2995348
diff --git a/graphics/cal3d/files/patch-src_cal3d_Makefile.am b/graphics/cal3d/files/patch-src_cal3d_Makefile.am
deleted file mode 100644
index af0cd89babb1..000000000000
--- a/graphics/cal3d/files/patch-src_cal3d_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/cal3d/Makefile.am.orig	Mon Jul 12 17:34:29 2004
-+++ src/cal3d/Makefile.am	Mon Jul 12 17:35:04 2004
-@@ -13,7 +13,8 @@
- INCLUDES = $(all_includes) -I$(top_srcdir)/src
- 
- all_libraries = @all_libraries@
--LDFLAGS = @LDFLAGS@
-+#LDFLAGS = @LDFLAGS@
-+AM_LDFLAGS = @AM_LDFLAGS@
- 
- EXTRA_DIST = cal3d.rc cal3d.dsp SConscript
- 
diff --git a/graphics/cal3d/pkg-plist b/graphics/cal3d/pkg-plist
index 54fc843ae4fc..079d377287ae 100644
--- a/graphics/cal3d/pkg-plist
+++ b/graphics/cal3d/pkg-plist
@@ -1,6 +1,7 @@
 include/cal3d/animation.h
 include/cal3d/animation_action.h
 include/cal3d/animation_cycle.h
+include/cal3d/animcallback.h
 include/cal3d/bone.h
 include/cal3d/buffersource.h
 include/cal3d/cal3d.h
@@ -19,6 +20,7 @@ include/cal3d/coretrack.h
 include/cal3d/datasource.h
 include/cal3d/error.h
 include/cal3d/global.h
+include/cal3d/hardwaremodel.h
 include/cal3d/loader.h
 include/cal3d/matrix.h
 include/cal3d/mesh.h
@@ -39,7 +41,6 @@ include/cal3d/tinystr.h
 include/cal3d/tinyxml.h
 include/cal3d/vector.h
 @dirrm include/cal3d
-lib/libcal3d-0.9.1.so
-lib/libcal3d.la
 lib/libcal3d.so
+lib/libcal3d.so.11
 libdata/pkgconfig/cal3d.pc