From 8503536d3896846d823f7f76be54e0a99da8d8b6 Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Thu, 23 Feb 2006 10:40:44 +0000
Subject: Conversion to a single libtool environment.

Approved by:	portmgr (kris)
---
 graphics/cal3d-devel/Makefile  | 9 ++++++---
 graphics/cal3d-devel/pkg-plist | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'graphics/cal3d-devel')

diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 5bcc5fdb60c3..601b6763450a 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cal3d
 DISTVERSION=	${CAL3DVER}_pre20050823
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
@@ -26,14 +26,13 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	pkgconfig
 USE_GCC=	3.2+
-USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15:inc
+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_ARGS=	--disable-static
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -53,4 +52,8 @@ pre-configure:
 	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.mk>
diff --git a/graphics/cal3d-devel/pkg-plist b/graphics/cal3d-devel/pkg-plist
index 5138ae9d9ab6..a37c83a4404c 100644
--- a/graphics/cal3d-devel/pkg-plist
+++ b/graphics/cal3d-devel/pkg-plist
@@ -41,6 +41,7 @@ include/cal3d/tinyxml.h
 include/cal3d/transform.h
 include/cal3d/vector.h
 @dirrm include/cal3d
+lib/libcal3d.la
 lib/libcal3d.so
 lib/libcal3d.so.11
 libdata/pkgconfig/cal3d.pc
-- 
cgit v1.2.3