Update giram to 0.1.2

News in 0.1.2: (1999-09-08)
	Some more gnomifications,
	Missing snap features for cones and cylinders has been added,
	Switch to Automake 1.4, reorganize the source tree,
	Helper files are now installed according to the FHS,
	One little bugfix or two.

15 files changed, 24 insertions, 145 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index ff160493828..99ad2ecacda 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1999/08/28 09:43:10 rh Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/09 07:55:18 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
-DISTNAME=	Giram-0.1.1
-PKGNAME=	giram-0.1.1
+DISTNAME=	Giram-0.1.2
+PKGNAME=	giram-0.1.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.minet.net/pub/giram/
 
@@ -11,13 +11,18 @@ HOMEPAGE=	http://www.minet.net/giram/
 
 DEPENDS+=	gtk+-1.2.4:../../x11/gtk
 DEPENDS+=	Mesa-3.0:../../graphics/Mesa
+DEPENDS+=	gnome-libs-1.0.16:../../x11/gnome-libs
+DEPENDS+=	esound-0.2.8:../../audio/esound
 RUN_DEPENDS=	povray:../../graphics/povray
 
+USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
+ALL_TARGET=	install-strip
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/Giram
 	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/
diff --git a/graphics/giram/files/md5 b/graphics/giram/files/md5
index 90be658e9b6..cd7ea047376 100644
--- a/graphics/giram/files/md5
+++ b/graphics/giram/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/08/17 05:18:43 sakamoto Exp $
+$NetBSD: md5,v 1.4 1999/09/09 07:55:19 sakamoto Exp $
 
-MD5 (Giram-0.1.1.tar.gz) = a826bba2f2a67e4b999d25a2a54dfb80
+MD5 (Giram-0.1.2.tar.gz) = 8530b1391ad0c9c12bd8333cb4c58192
diff --git a/graphics/giram/files/patch-sum b/graphics/giram/files/patch-sum
index 578f5470cff..adbcb2c13e6 100644
--- a/graphics/giram/files/patch-sum
+++ b/graphics/giram/files/patch-sum
@@ -1,13 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/09 07:55:19 sakamoto Exp $
 
-MD5 (patch-aa) = 81248c0b738535a8b16978478c0a1ca2
-MD5 (patch-ab) = 6e68a8767eaf37229de44b626ccce14d
-MD5 (patch-ac) = b2c2caea6d32e7fb310dd090397ca82a
-MD5 (patch-ad) = 53560f7b5c218fcdecf53204609b8374
-MD5 (patch-ae) = ba858e4f0485193c4df894e498de21a1
-MD5 (patch-af) = e24f8ba018dfce459e95d57828ea18d1
-MD5 (patch-ag) = e4f17b22a9ef698cb32d941489418023
-MD5 (patch-ah) = 6b3de2c153c6ae0c7dbfe8b7d7950aee
-MD5 (patch-ai) = 20d847a517e74ca566e107f036e9b11c
-MD5 (patch-aj) = ef738a99229c6096dc3ce44bc7c98260
-MD5 (patch-ak) = 0718f39b148cdc58f248e945b1727975
+MD5 (patch-ak) = b119c90c35eed214bc45d0f77740200d
diff --git a/graphics/giram/patches/patch-aa b/graphics/giram/patches/patch-aa
deleted file mode 100644
index 27fd95e8244..00000000000
--- a/graphics/giram/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./docs/Makefile.am.orig	Mon Apr 26 05:19:31 1999
-+++ ./docs/Makefile.am	Tue Aug 17 12:30:30 1999
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--docsdir = $(prefix)/Giram/docs
-+docsdir = $(prefix)/share/doc/Giram
- 
- docs_DATA = Tutorial
diff --git a/graphics/giram/patches/patch-ab b/graphics/giram/patches/patch-ab
deleted file mode 100644
index c4ca8b7ec0b..00000000000
--- a/graphics/giram/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./docs/Makefile.in.orig	Sat Jul 31 11:33:10 1999
-+++ ./docs/Makefile.in	Tue Aug 17 12:30:56 1999
-@@ -88,5 +88,5 @@
- l = @l@
- 
--docsdir = $(prefix)/Giram/docs
-+docsdir = $(prefix)/share/doc/Giram
- 
- docs_DATA = Tutorial
diff --git a/graphics/giram/patches/patch-ac b/graphics/giram/patches/patch-ac
deleted file mode 100644
index 5657f7633a1..00000000000
--- a/graphics/giram/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Box/Makefile.am.orig	Tue Apr 13 23:19:01 1999
-+++ ./plugins/Box/Makefile.am	Tue Aug 17 12:30:30 1999
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Box
diff --git a/graphics/giram/patches/patch-ad b/graphics/giram/patches/patch-ad
deleted file mode 100644
index 80b01a4e552..00000000000
--- a/graphics/giram/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Box/Makefile.in.orig	Sat Jul 31 11:32:58 1999
-+++ ./plugins/Box/Makefile.in	Tue Aug 17 12:30:56 1999
-@@ -88,5 +88,5 @@
- l = @l@
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Box
diff --git a/graphics/giram/patches/patch-ae b/graphics/giram/patches/patch-ae
deleted file mode 100644
index 6d0c4c8a861..00000000000
--- a/graphics/giram/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Rotate/Makefile.am.orig	Fri Jun  4 01:48:33 1999
-+++ ./plugins/Rotate/Makefile.am	Tue Aug 17 12:30:31 1999
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Rotate
diff --git a/graphics/giram/patches/patch-af b/graphics/giram/patches/patch-af
deleted file mode 100644
index 67b61f2ddae..00000000000
--- a/graphics/giram/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Rotate/Makefile.in.orig	Sat Jul 31 11:33:01 1999
-+++ ./plugins/Rotate/Makefile.in	Tue Aug 17 12:30:56 1999
-@@ -88,5 +88,5 @@
- l = @l@
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Rotate
diff --git a/graphics/giram/patches/patch-ag b/graphics/giram/patches/patch-ag
deleted file mode 100644
index c9a7677f5a2..00000000000
--- a/graphics/giram/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Spheres/Makefile.in.orig	Sat Jul 31 11:32:49 1999
-+++ ./plugins/Spheres/Makefile.in	Tue Aug 17 12:30:56 1999
-@@ -88,5 +88,5 @@
- l = @l@
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Spheres
diff --git a/graphics/giram/patches/patch-ah b/graphics/giram/patches/patch-ah
deleted file mode 100644
index 7d74c2bfc34..00000000000
--- a/graphics/giram/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/08/17 05:18:43 sakamoto Exp $
-
---- ./plugins/Spheres/Makefile.am.orig	Tue Apr 13 23:06:41 1999
-+++ ./plugins/Spheres/Makefile.am	Tue Aug 17 12:30:31 1999
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--plugindir = $(prefix)/Giram/plug-ins
-+plugindir = $(prefix)/libexec/Giram
- 
- plugin_PROGRAMS = Spheres
diff --git a/graphics/giram/patches/patch-ai b/graphics/giram/patches/patch-ai
deleted file mode 100644
index 0a6b68ca317..00000000000
--- a/graphics/giram/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/08/17 05:18:44 sakamoto Exp $
-
---- ./configure.in.orig	Mon Jul 26 22:18:17 1999
-+++ ./configure.in	Tue Aug 17 12:30:31 1999
-@@ -372,7 +372,7 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- 
--CFLAGS="$CFLAGS -DPLUGINS_DIR=\"\\\"$prefix/Giram/plug-ins/\\\"\""
-+CFLAGS="$CFLAGS -DPLUGINS_DIR=\"\\\"$prefix/libexec/Giram/\\\"\""
- 
--CFLAGS="$CFLAGS -DHELPFILE=\"\\\"$prefix/Giram/docs/Tutorial\\\"\""
-+CFLAGS="$CFLAGS -DHELPFILE=\"\\\"$prefix/share/doc/Giram/Tutorial\\\"\""
- 
- dnl --------------------------------------------------------------------------
diff --git a/graphics/giram/patches/patch-aj b/graphics/giram/patches/patch-aj
deleted file mode 100644
index e126f33f9e7..00000000000
--- a/graphics/giram/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/08/17 05:18:44 sakamoto Exp $
-
---- ./configure.orig	Tue Jul 27 22:23:55 1999
-+++ ./configure	Tue Aug 17 12:30:56 1999
-@@ -4271,7 +4271,7 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- 
--CFLAGS="$CFLAGS -DPLUGINS_DIR=\"\\\"$prefix/Giram/plug-ins/\\\"\""
-+CFLAGS="$CFLAGS -DPLUGINS_DIR=\"\\\"$prefix/libexec/Giram/\\\"\""
- 
--CFLAGS="$CFLAGS -DHELPFILE=\"\\\"$prefix/Giram/docs/Tutorial\\\"\""
-+CFLAGS="$CFLAGS -DHELPFILE=\"\\\"$prefix/share/doc/Giram/Tutorial\\\"\""
- 
- trap '' 1 2 15
diff --git a/graphics/giram/patches/patch-ak b/graphics/giram/patches/patch-ak
index bf4612bf03e..66d53476c25 100644
--- a/graphics/giram/patches/patch-ak
+++ b/graphics/giram/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 1999/08/17 05:18:44 sakamoto Exp $
+$NetBSD: patch-ak,v 1.2 1999/09/09 07:55:22 sakamoto Exp $
 
---- ./tools.c.orig	Sat Aug  7 11:17:42 1999
-+++ ./tools.c	Tue Aug 17 13:08:08 1999
+--- ./src/tools.c.orig	Sat Aug  7 11:17:42 1999
++++ ./src/tools.c	Thu Sep  9 09:17:58 1999
 @@ -371,5 +371,6 @@
                                                      &transparent,
                                                      Tools[i].Icon);
diff --git a/graphics/giram/pkg/PLIST b/graphics/giram/pkg/PLIST
index 4af985f80d7..181cf87e608 100644
--- a/graphics/giram/pkg/PLIST
+++ b/graphics/giram/pkg/PLIST
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 1999/08/17 05:18:44 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/09/09 07:55:22 sakamoto Exp $
 bin/giram
 bin/povfront
-libexec/Giram/Box
-libexec/Giram/Rotate
-libexec/Giram/Spheres
-share/doc/Giram/Tutorial
+libexec/giram/plug-ins/Box
+libexec/giram/plug-ins/Rotate
+libexec/giram/plug-ins/Spheres
+share/doc/giram/Tutorial
 share/examples/Giram/Cone.pov
 share/examples/Giram/Disc.pov
+share/examples/Giram/Giram.gsf
 share/examples/Giram/Giram.pov
 share/examples/Giram/IntSphereBox1.pov
 share/examples/Giram/IntSphereBox2.pov
@@ -19,9 +20,7 @@ share/examples/Giram/basicvue.pov
 share/examples/Giram/basicvue2.pov
 share/examples/Giram/basicvue3.pov
 share/examples/Giram/basicvue4.pov
-share/examples/Giram/bla.tga
 share/examples/Giram/box.pov
-share/examples/Giram/colors.inc
 share/examples/Giram/lollipop.pov
 share/examples/Giram/superel1.pov
 share/examples/Giram/superel2.pov
@@ -30,5 +29,6 @@ share/examples/Giram/test.pov
 share/examples/Giram/torus.pov
 share/locale/fr/LC_MESSAGES/Giram.mo
 @dirrm share/examples/Giram
-@dirrm share/doc/Giram
-@dirrm libexec/Giram
+@dirrm share/doc/giram
+@dirrm libexec/giram/plug-ins
+@dirrm libexec/giram