Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Nov 2015 13:43:31 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400654 - in head: . graphics graphics/cal3d graphics/cal3d-devel
Message-ID:  <201511021343.tA2DhVvg029458@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Mon Nov  2 13:43:31 2015
New Revision: 400654
URL: https://svnweb.freebsd.org/changeset/ports/400654

Log:
  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)

Deleted:
  head/graphics/cal3d-devel/
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/cal3d/Makefile
  head/graphics/cal3d/distinfo
  head/graphics/cal3d/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Nov  2 13:41:03 2015	(r400653)
+++ head/MOVED	Mon Nov  2 13:43:31 2015	(r400654)
@@ -7900,7 +7900,7 @@ net/py-medusa||2015-10-28|Abandoned upst
 audio/py-audiotools|audio/py-fmoo-audiotools|2015-10-29|Rename to match PyPI nomenclature
 audio/cmus-post.fm||2015-10-31|Has expired: Broken for more than 6 months
 devel/libphish||2015-10-31|Has expired: Broken for more than 6 months
-devel/rubygem-debugger||2015-10-31|Has expired: This port is for Ruby 1.9 only. Upstream stopped maintenance.
+devel/rubygem-debugger||2015-10-31|Has expired: This port is for Ruby 1.9 only, upstream stopped maintenance
 games/linux-ningpo-demo||2015-10-31|Has expired: Broken for more than 6 months
 graphics/gdal-grass||2015-10-31|Has expired: Superseded by gdal-2.0.0
 graphics/picviz||2015-10-31|Has expired: Broken for more than 6 months
@@ -7924,3 +7924,4 @@ devel/pyvisa|devel/py-pyvisa|2015-11-02|
 devel/pyvisa-py|devel/py-pyvisa-py|2015-11-02|Renamed to comply with Python ports policy
 science/pyteomics.biolccc|science/py-pyteomics.biolccc|2015-11-02|Renamed to comply with Python ports policy
 science/pyteomics|science/py-pyteomics|2015-11-02|Renamed to comply with Python ports policy
+graphics/cal3d-devel|graphics/cal3d|2015-11-02|Dvelopment ceased in 2006 so set last devel version as stable

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Nov  2 13:41:03 2015	(r400653)
+++ head/graphics/Makefile	Mon Nov  2 13:43:31 2015	(r400654)
@@ -77,7 +77,6 @@
     SUBDIR += cairo-reference
     SUBDIR += cairomm
     SUBDIR += cal3d
-    SUBDIR += cal3d-devel
     SUBDIR += camera
     SUBDIR += camerakit
     SUBDIR += cbrpager

Modified: head/graphics/cal3d/Makefile
==============================================================================
--- head/graphics/cal3d/Makefile	Mon Nov  2 13:41:03 2015	(r400653)
+++ head/graphics/cal3d/Makefile	Mon Nov  2 13:43:31 2015	(r400654)
@@ -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>

Modified: head/graphics/cal3d/distinfo
==============================================================================
--- head/graphics/cal3d/distinfo	Mon Nov  2 13:41:03 2015	(r400653)
+++ head/graphics/cal3d/distinfo	Mon Nov  2 13:43:31 2015	(r400654)
@@ -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

Modified: head/graphics/cal3d/pkg-descr
==============================================================================
--- head/graphics/cal3d/pkg-descr	Mon Nov  2 13:41:03 2015	(r400653)
+++ head/graphics/cal3d/pkg-descr	Mon Nov  2 13:43:31 2015	(r400654)
@@ -16,4 +16,4 @@ whether it's a game or a VR application.
 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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511021343.tA2DhVvg029458>