Contract graphics/cal3d-devel into graphics/cal3d

The development of cal3d stopped in July 2006, about a week or two
after the last release (0.11.0).  It makes no sense to have both cal3d
and cal3d-devel, so let's copy over the -devel port over to the stable
one and remove the -devel port.  There's no reason to set a deprecation
period in this case.

While here:
  * remove conflicts
  * Update the WWW to the new home page

I've given graphics/cal3d a "fake" version of 0.11.1 to convey that it
is an update to the previous version of 0.11.0 rather than to completely
change the version scheme.

PR:		203135
Approved by:	maintainer timeout
Discussed:	portmgr (bapt)

9 files changed, 16 insertions, 121 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index bd1c00dcd490..220ec023e04d 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -77,7 +77,6 @@
     SUBDIR += cairo-reference
     SUBDIR += cairomm
     SUBDIR += cal3d
-    SUBDIR += cal3d-devel
     SUBDIR += camera
     SUBDIR += camerakit
     SUBDIR += cbrpager
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
deleted file mode 100644
index e5829ebcc76f..000000000000
--- a/graphics/cal3d-devel/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Stefan Walter <sw@gegenunendlich.de>
-# $FreeBSD$
-
-PORTNAME=	cal3d
-PORTVERSION=	20060720
-PORTREVISION=	4
-CATEGORIES=	graphics devel
-MASTER_SITES=	LOCAL/acm/${PORTNAME}
-PKGNAMESUFFIX=	-devel
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	acm@FreeBSD.org
-COMMENT=	Skeletal based 3D character animation library written in C++ (devel)
-
-CONFLICTS=	cal3d-[0-9]*
-
-GNU_CONFIGURE=	yes
-USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN=	Makefile.am
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-post-patch:
-	@${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
-
-.include <bsd.port.mk>
diff --git a/graphics/cal3d-devel/distinfo b/graphics/cal3d-devel/distinfo
deleted file mode 100644
index a9ea70a21fce..000000000000
--- a/graphics/cal3d-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cal3d/cal3d-20060720.tar.bz2) = c40071e14b9b1f71e36b36d29796bd7de41a1d32b1de6307ffdb334cb39418de
-SIZE (cal3d/cal3d-20060720.tar.bz2) = 607624
diff --git a/graphics/cal3d-devel/files/patch-src_cal3d_platform.h b/graphics/cal3d-devel/files/patch-src_cal3d_platform.h
deleted file mode 100644
index 370be459655b..000000000000
--- a/graphics/cal3d-devel/files/patch-src_cal3d_platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cal3d/platform.h.orig	2006-03-01 22:55:35 UTC
-+++ src/cal3d/platform.h
-@@ -77,6 +77,7 @@ typedef int intptr_t;
- // standard includes
- #include <stdlib.h>
- #include <math.h>
-+#include <string.h>
- 
- // debug includes
- #include <assert.h>
diff --git a/graphics/cal3d-devel/pkg-descr b/graphics/cal3d-devel/pkg-descr
deleted file mode 100644
index 64470ac75479..000000000000
--- a/graphics/cal3d-devel/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Cal3D is a skeletal based 3D character animation library written in C++
-in a way that is both platform-independent and graphics API-independent.
-It was originally designed to be used in a 3D client for Worldforge, but
-evolved into a stand-alone product which can be used in many different
-kinds of projects.
-
-Cal3D's essentials can be boiled down to 2 parts: the C++ library and
-the exporter. The exporter is what you would use to take your characters
-(built in a 3D modeling package) and create the Cal3D-format files that
-the library knows how to load. The exporters are actually plug-ins for
-3D modeling packages. This allows 3D artists to use the modeling tools
-that they're already comfortable with.
-
-The C++ library is what you would actually use in your application,
-whether it's a game or a VR application. The library provides methods to
-load your exported files, build characters, run animations, and access
-the data necessary to render them with 3D graphics. 
-
-WWW:	http://cal3d.sourceforge.net/
diff --git a/graphics/cal3d-devel/pkg-plist b/graphics/cal3d-devel/pkg-plist
deleted file mode 100644
index f807cd8f8cbc..000000000000
--- a/graphics/cal3d-devel/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-bin/cal3d_converter
-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
-include/cal3d/cal3d_wrapper.h
-include/cal3d/coreanimation.h
-include/cal3d/corebone.h
-include/cal3d/corekeyframe.h
-include/cal3d/corematerial.h
-include/cal3d/coremesh.h
-include/cal3d/coremodel.h
-include/cal3d/coremorphanimation.h
-include/cal3d/coreskeleton.h
-include/cal3d/coresubmesh.h
-include/cal3d/coresubmorphtarget.h
-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
-include/cal3d/mixer.h
-include/cal3d/model.h
-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
-include/cal3d/skeleton.h
-include/cal3d/springsystem.h
-include/cal3d/streamsource.h
-include/cal3d/submesh.h
-include/cal3d/tinyxml.h
-include/cal3d/transform.h
-include/cal3d/vector.h
-lib/libcal3d.so
-lib/libcal3d.so.12
-lib/libcal3d.so.12.0.0
-libdata/pkgconfig/cal3d.pc
-man/man1/cal3d_converter.1.gz
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 8d3247ea84e1..acc504bf532c 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -2,19 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	cal3d
-PORTVERSION=	0.11.0
-PORTREVISION=	3
+PORTVERSION=	0.11.1	# see note below
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://download.gna.org/cal3d/sources/
+MASTER_SITES=	LOCAL/acm/cal3d
+DISTNAME=	cal3d-20060720
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Skeletal based 3D character animation library written in C++
 
-CONFLICTS=	cal3d-devel-[0-9]*
+# Cal3D ceased development in July 2006
+# The last version was labelled 0.11R2 (despite version 0.11 being released)
+# The last Cal3D development version was "20060720".
+# This becomes the new "stable" version, and it's given a fake version
+# number of 0.11.1 to indicate it comes after 0.11.0 rather than changing
+# the version scheme completely.
 
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix pkgconfig
+USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
+PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -23,6 +29,7 @@ post-patch:
 		${WRKSRC}/src/cal3d/buffersource.h \
 		${WRKSRC}/src/cal3d/loader.h \
 		${WRKSRC}/src/cal3d/streamsource.h
-	@${REINPLACE_CMD} '/^SUBDIRS =/s/tests//' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^all_libraries/d' \
+		${WRKSRC}/src/cal3d/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 1367701908fd..a9ea70a21fce 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cal3d/cal3d-0.11.0.tar.gz) = fc4a6fe311004987377ec80b804a04aab44c32085fd974d275aa9d0b14144b06
-SIZE (cal3d/cal3d-0.11.0.tar.gz) = 568532
+SHA256 (cal3d/cal3d-20060720.tar.bz2) = c40071e14b9b1f71e36b36d29796bd7de41a1d32b1de6307ffdb334cb39418de
+SIZE (cal3d/cal3d-20060720.tar.bz2) = 607624
diff --git a/graphics/cal3d/pkg-descr b/graphics/cal3d/pkg-descr
index 64470ac75479..7508335aeeb9 100644
--- a/graphics/cal3d/pkg-descr
+++ b/graphics/cal3d/pkg-descr
@@ -16,4 +16,4 @@ whether it's a game or a VR application. The library provides methods to
 load your exported files, build characters, run animations, and access
 the data necessary to render them with 3D graphics. 
 
-WWW:	http://cal3d.sourceforge.net/
+WWW: http://gna.org/projects/cal3d/