7 files changed, 26 insertions, 71 deletions

diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 74eae23e5b70..4c2e8fd61241 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -6,36 +6,32 @@
 #
 
 PORTNAME=	cal3d
-PORTVERSION=	0.10.0
-PORTREVISION=	2
+PORTVERSION=	0.11.0
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}-full-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	http://download.gna.org/cal3d/sources/
 
-MAINTAINER=	stefan@FreeBSD.org
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Skeletal based 3d character animation library written in C++
 
 CONFLICTS=	cal3d-devel-[0-9]*
 
-USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15
-AUTOMAKE_ARGS=	"--add-missing"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_GCC=	3.4+
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.include <bsd.port.pre.mk>
+MAN1=	cal3d_converter.1
 
 post-patch:
+	@${REINPLACE_CMD} \
+		-e 's|^\(pkgconfigdir\ =\).*|\1 $$(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|<istream>|<iostream>|' \
+		${WRKSRC}/src/cal3d/buffersource.h \
+		${WRKSRC}/src/cal3d/loader.h \
+		${WRKSRC}/src/cal3d/streamsource.h
 	@${REINPLACE_CMD} -e '/^all_libraries/d' ${WRKSRC}/src/cal3d/Makefile.am
 
-pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
-	cd ${WRKSRC} && ${AUTOHEADER}
-	cd ${WRKSRC} && ${LIBTOOLIZE} --automake --force
-
-# XXX: handle slight differences between 6.x and 5.x/4.x
-post-install:
-	@${RM} -f ${PREFIX}/lib/libcal3d.a
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 62e00ecef1a4..251a7338208b 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (cal3d-full-0.10.0.tar.bz2) = 47b3b72c6adcf5351f0884639d606d05
-SHA256 (cal3d-full-0.10.0.tar.bz2) = 2f5b8886ea92ff5b06fd590234059dec8a91c2db3724696fbd809000834116f2
-SIZE (cal3d-full-0.10.0.tar.bz2) = 2995348
+MD5 (cal3d-0.11.0.tar.gz) = 82ad09c1c28e73bc9596aec47237bfba
+SHA256 (cal3d-0.11.0.tar.gz) = fc4a6fe311004987377ec80b804a04aab44c32085fd974d275aa9d0b14144b06
+SIZE (cal3d-0.11.0.tar.gz) = 568532
diff --git a/graphics/cal3d/files/patch-Makefile.am b/graphics/cal3d/files/patch-Makefile.am
deleted file mode 100644
index a018a42f5cd7..000000000000
--- a/graphics/cal3d/files/patch-Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.am.orig	Mon Jul 12 19:40:09 2004
-+++ Makefile.am	Mon Jul 12 19:41:07 2004
-@@ -16,7 +16,8 @@
- 
- SUBDIRS = src docs
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+#pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = cal3d.pc
- 
- 
diff --git a/graphics/cal3d/files/patch-src_cal3d_buffersource.h b/graphics/cal3d/files/patch-src_cal3d_buffersource.h
deleted file mode 100644
index 6cc393fdf3ed..000000000000
--- a/graphics/cal3d/files/patch-src_cal3d_buffersource.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cal3d/buffersource.h.orig	Tue Jul 13 10:03:53 2004
-+++ src/cal3d/buffersource.h	Tue Jul 13 10:04:11 2004
-@@ -17,7 +17,7 @@
- 
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
--#include <istream>
-+#include <istream.h>
- 
- /**
-  * CalBufferSource class.
diff --git a/graphics/cal3d/files/patch-src_cal3d_loader.h b/graphics/cal3d/files/patch-src_cal3d_loader.h
deleted file mode 100644
index 8121123c1431..000000000000
--- a/graphics/cal3d/files/patch-src_cal3d_loader.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cal3d/loader.h.orig	Tue Jul 13 10:04:57 2004
-+++ src/cal3d/loader.h	Tue Jul 13 10:05:09 2004
-@@ -17,7 +17,7 @@
- 
- 
- #include <string>
--#include <istream>
-+#include <istream.h>
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
- 
diff --git a/graphics/cal3d/files/patch-src_cal3d_streamsource.h b/graphics/cal3d/files/patch-src_cal3d_streamsource.h
deleted file mode 100644
index b2125b55736f..000000000000
--- a/graphics/cal3d/files/patch-src_cal3d_streamsource.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cal3d/streamsource.h.orig	Tue Jul 13 10:05:35 2004
-+++ src/cal3d/streamsource.h	Tue Jul 13 10:05:47 2004
-@@ -17,7 +17,7 @@
- 
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
--#include <istream>
-+#include <istream.h>
- 
- /**
-  * CalStreamSource class.
diff --git a/graphics/cal3d/pkg-plist b/graphics/cal3d/pkg-plist
index f313a03cc89e..773f1d813c2e 100644
--- a/graphics/cal3d/pkg-plist
+++ b/graphics/cal3d/pkg-plist
@@ -1,3 +1,4 @@
+bin/cal3d_converter
 include/cal3d/animation.h
 include/cal3d/animation_action.h
 include/cal3d/animation_cycle.h
@@ -30,6 +31,8 @@ include/cal3d/morphtargetmixer.h
 include/cal3d/physique.h
 include/cal3d/platform.h
 include/cal3d/quaternion.h
+include/cal3d/refcounted.h
+include/cal3d/refptr.h
 include/cal3d/renderer.h
 include/cal3d/resource.h
 include/cal3d/saver.h
@@ -37,11 +40,12 @@ include/cal3d/skeleton.h
 include/cal3d/springsystem.h
 include/cal3d/streamsource.h
 include/cal3d/submesh.h
-include/cal3d/tinystr.h
 include/cal3d/tinyxml.h
+include/cal3d/transform.h
 include/cal3d/vector.h
-@dirrm include/cal3d
+lib/libcal3d.so.12
+lib/libcal3d.a
 lib/libcal3d.la
 lib/libcal3d.so
-lib/libcal3d.so.11
 libdata/pkgconfig/cal3d.pc
+@dirrm include/cal3d