Updated to version 0.3.5.

Changes:

- don't install static modules
- enable 3DS support

0.3.5:
======
- cleanups and bugfixes
- new polygonising algorithm

4 files changed, 45 insertions, 31 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index bdefdcd8170..b6840b08129 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2003/05/02 11:55:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/24 11:23:08 salo Exp $
+#
 
-DISTNAME=	giram-0.3.4
-PKGREVISION=	2
+DISTNAME=	giram-0.3.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.giram.org/downloads/
 
@@ -10,31 +10,35 @@ HOMEPAGE=	http://www.giram.org/
 COMMENT=	Giram Is Really A Modeller
 
 DEPENDS+=	povray-[0-9]*:../../graphics/povray
+BUILD_DEPENDS+=	bison:../../devel/bison
 
-USE_BUILDLINK2=		yes
-USE_PKGLOCALEDIR=	yes
-USE_PKGINSTALL=		yes
-USE_X11=		yes
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-BUILD_DEPENDS+=		bison:../../devel/bison
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_PKGINSTALL=		YES
+USE_X11=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 
 PKG_SYSCONFSUBDIR=	giram
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}/0.3
+
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+OWN_DIRS+=	${PKG_SYSCONFDIR}/0.3
 CONF_FILES+=	${PREFIX}/share/examples/giram/giramrc		\
-		${PKG_SYSCONFDIR}/giramrc
+		${PKG_SYSCONFDIR}/0.3/giramrc
 CONF_FILES+=	${PREFIX}/share/examples/giram/giramrc_user	\
-		${PKG_SYSCONFDIR}/giramrc_user
+		${PKG_SYSCONFDIR}/0.3/giramrc_user
 CONF_FILES+=	${PREFIX}/share/examples/giram/gtkrc		\
-		${PKG_SYSCONFDIR}/gtkrc
+		${PKG_SYSCONFDIR}/0.3/gtkrc
 CONF_FILES+=	${PREFIX}/share/examples/giram/gtkrc_user	\
-		${PKG_SYSCONFDIR}/gtkrc_user
+		${PKG_SYSCONFDIR}/0.3/gtkrc_user
 CONF_FILES+=	${PREFIX}/share/examples/giram/ps-menurc	\
-		${PKG_SYSCONFDIR}/ps-menurc
+		${PKG_SYSCONFDIR}/0.3/ps-menurc
 
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/lib3ds/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giram/PLIST b/graphics/giram/PLIST
index 7759e679023..f685bade2ce 100644
--- a/graphics/giram/PLIST
+++ b/graphics/giram/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/15 03:49:05 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/24 11:23:08 salo Exp $
 bin/giram
 bin/povfront
 libexec/giram/plug-ins/Box
@@ -15,22 +15,16 @@ share/giram/0.3/color/color1.gcf
 share/giram/0.3/finish/finish1
 share/giram/0.3/giram_logo.ppm
 share/giram/0.3/giram_splash.ppm
-share/giram/0.3/modules/librender_flat.a
 share/giram/0.3/modules/librender_flat.la
 share/giram/0.3/modules/librender_flat.so
-share/giram/0.3/modules/librender_gouraud.a
 share/giram/0.3/modules/librender_gouraud.la
 share/giram/0.3/modules/librender_gouraud.so
-share/giram/0.3/modules/librender_hiddenfaces.a
 share/giram/0.3/modules/librender_hiddenfaces.la
 share/giram/0.3/modules/librender_hiddenfaces.so
-share/giram/0.3/modules/librender_povray.a
 share/giram/0.3/modules/librender_povray.la
 share/giram/0.3/modules/librender_povray.so
-share/giram/0.3/modules/librender_raytracing.a
 share/giram/0.3/modules/librender_raytracing.la
 share/giram/0.3/modules/librender_raytracing.so
-share/giram/0.3/modules/librender_wireframe.a
 share/giram/0.3/modules/librender_wireframe.la
 share/giram/0.3/modules/librender_wireframe.so
 share/giram/0.3/normal/normal1
@@ -75,10 +69,12 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/giram.mo
 @dirrm share/giram/0.3/normal
 @dirrm share/giram/0.3/modules
 @dirrm share/giram/0.3/finish
-@dirrm share/giram/0.3/color
+@exec ${MKDIR} %D/share/giram/0.3/color_map
 @dirrm share/giram/0.3/color_map
+@dirrm share/giram/0.3/color
 @dirrm share/giram/0.3
 @dirrm share/giram
-@dirrm share/doc/giram
 @dirrm share/examples/giram
+@dirrm share/doc/giram
 @dirrm libexec/giram/plug-ins
+@dirrm libexec/giram
diff --git a/graphics/giram/distinfo b/graphics/giram/distinfo
index 79bbd7bbec4..af1c74bd7cf 100644
--- a/graphics/giram/distinfo
+++ b/graphics/giram/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/02/15 03:49:05 salo Exp $
+$NetBSD: distinfo,v 1.6 2003/05/24 11:23:08 salo Exp $
 
-SHA1 (giram-0.3.4.tar.gz) = 17bb714d96e4e084f03df74b76923ca97ccc7003
-Size (giram-0.3.4.tar.gz) = 1265387 bytes
+SHA1 (giram-0.3.5.tar.gz) = f8ecdd1a954315cb9e1356af3b8a3b20fb9f9b41
+Size (giram-0.3.5.tar.gz) = 1028404 bytes
 SHA1 (patch-aa) = a575aba5e5bc501f62b7ccd409f3d45306e8b002
+SHA1 (patch-ab) = d26d581019ef91e42c93a4eee01d7b78b69e65f3
diff --git a/graphics/giram/patches/patch-ab b/graphics/giram/patches/patch-ab
new file mode 100644
index 00000000000..3f5d0f45245
--- /dev/null
+++ b/graphics/giram/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2003/05/24 11:23:09 salo Exp $
+
+--- configure.orig	2003-05-24 11:42:37.000000000 +0200
++++ configure	2003-05-24 11:56:54.000000000 +0200
+@@ -9017,7 +9017,7 @@
+ 
+ giramdatadir=$datadir/$PACKAGE/$GIRAM_MAJOR_VERSION.$GIRAM_MINOR_VERSION
+ giramplugindir=$libdir/$PACKAGE/$GIRAM_MAJOR_VERSION.$GIRAM_MINOR_VERSION
+-giramsysconfdir=$sysconfdir/$PACKAGE/$GIRAM_MAJOR_VERSION.$GIRAM_MINOR_VERSION
++giramsysconfdir=$sysconfdir
+ 
+ colordata=`ls -1 $srcdir/data/color | grep -v Makefile`
+ color_mapdata=`ls -1 $srcdir/data/color_map | grep -v Makefile`