- Update to 20060720 for graphics/cal3d-devel

- Host graphics/cal3d-devel tarball locally
- Add DIST_SUBDIR for graphics/cal3d and graphics/cal3d-devel

Approved by:	garga (mentor)

5 files changed, 19 insertions, 23 deletions

diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 6fb45ac76350..05ea8dd43977 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	cal3d
-DISTVERSION=	${CAL3DVER}_pre20050823
-PORTREVISION=	2
+PORTVERSION=	20060720
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	acm/${PORTNAME}
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${DISTVERSION}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Skeletal based 3d character animation library written in C++ (devel)
 
-CAL3DVER=	0.11.0
-
 CONFLICTS=	cal3d-[0-9]*
 
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
 USE_GNOME=	pkgconfig
-USE_GCC=	3.2+
+USE_LDCONFIG=	yes
+USE_GCC=	3.4+
 USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15
 AUTOMAKE_ARGS=	--add-missing
-
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
-
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXX="${CXX}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+MAN1=	cal3d_converter.1
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/graphics/cal3d-devel/distinfo b/graphics/cal3d-devel/distinfo
index 65971b34f4e1..aa5768d28216 100644
--- a/graphics/cal3d-devel/distinfo
+++ b/graphics/cal3d-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cal3d-0.11.0_pre20050823.tar.bz2) = da196ac6a41e34c2166cf894f7085bf0
-SHA256 (cal3d-0.11.0_pre20050823.tar.bz2) = 05c48360149be601e851b909bbbd80da0abfe77fc7828b262b80c08494844041
-SIZE (cal3d-0.11.0_pre20050823.tar.bz2) = 8138576
+MD5 (cal3d/cal3d-20060720.tar.bz2) = efc5803a9b96ecbaf920a5b2dbc3280e
+SHA256 (cal3d/cal3d-20060720.tar.bz2) = c40071e14b9b1f71e36b36d29796bd7de41a1d32b1de6307ffdb334cb39418de
+SIZE (cal3d/cal3d-20060720.tar.bz2) = 607624
diff --git a/graphics/cal3d-devel/pkg-plist b/graphics/cal3d-devel/pkg-plist
index a37c83a4404c..816c98f09a36 100644
--- a/graphics/cal3d-devel/pkg-plist
+++ b/graphics/cal3d-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/cal3d_converter
 include/cal3d/animation.h
 include/cal3d/animation_action.h
 include/cal3d/animation_cycle.h
@@ -8,6 +9,7 @@ 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
@@ -15,6 +17,7 @@ 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
@@ -40,8 +43,8 @@ include/cal3d/submesh.h
 include/cal3d/tinyxml.h
 include/cal3d/transform.h
 include/cal3d/vector.h
-@dirrm include/cal3d
+lib/libcal3d.so.12
 lib/libcal3d.la
 lib/libcal3d.so
-lib/libcal3d.so.11
 libdata/pkgconfig/cal3d.pc
+@dirrm include/cal3d
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 4c2e8fd61241..1cc37d9072d0 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	cal3d
 PORTVERSION=	0.11.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://download.gna.org/cal3d/sources/
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Skeletal based 3d character animation library written in C++
diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 251a7338208b..0d8701302e7b 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (cal3d-0.11.0.tar.gz) = 82ad09c1c28e73bc9596aec47237bfba
-SHA256 (cal3d-0.11.0.tar.gz) = fc4a6fe311004987377ec80b804a04aab44c32085fd974d275aa9d0b14144b06
-SIZE (cal3d-0.11.0.tar.gz) = 568532
+MD5 (cal3d/cal3d-0.11.0.tar.gz) = 82ad09c1c28e73bc9596aec47237bfba
+SHA256 (cal3d/cal3d-0.11.0.tar.gz) = fc4a6fe311004987377ec80b804a04aab44c32085fd974d275aa9d0b14144b06
+SIZE (cal3d/cal3d-0.11.0.tar.gz) = 568532