Update to Giram-0.1.1.

15 files changed, 181 insertions, 37 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 209b319707d..475b17e06ac 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/06/21 09:17:20 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 1999/08/17 05:18:43 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
-DISTNAME=	Giram-0.0.18
-PKGNAME=	giram-0.0.18
+DISTNAME=	Giram-0.1.1
+PKGNAME=	giram-0.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.minet.net/pub/giram/
 
@@ -19,7 +19,7 @@ CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
 post-install:
-	@${MKDIR} ${PREFIX}/Giram/SampleScenes
-	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/Giram/SampleScenes/
+	@${MKDIR} ${PREFIX}/share/examples/Giram
+	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giram/files/md5 b/graphics/giram/files/md5
index 3f2a6f0c1de..90be658e9b6 100644
--- a/graphics/giram/files/md5
+++ b/graphics/giram/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/06/21 09:17:21 sakamoto Exp $
+$NetBSD: md5,v 1.3 1999/08/17 05:18:43 sakamoto Exp $
 
-MD5 (Giram-0.0.18.tar.gz) = 591e0f7af9bd3c980ca9f16e108e7f2f
+MD5 (Giram-0.1.1.tar.gz) = a826bba2f2a67e4b999d25a2a54dfb80
diff --git a/graphics/giram/files/patch-sum b/graphics/giram/files/patch-sum
new file mode 100644
index 00000000000..578f5470cff
--- /dev/null
+++ b/graphics/giram/files/patch-sum
@@ -0,0 +1,13 @@
+$NetBSD: patch-sum,v 1.1 1999/08/17 05:18:43 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
diff --git a/graphics/giram/patches/patch-aa b/graphics/giram/patches/patch-aa
new file mode 100644
index 00000000000..27fd95e8244
--- /dev/null
+++ b/graphics/giram/patches/patch-aa
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..c4ca8b7ec0b
--- /dev/null
+++ b/graphics/giram/patches/patch-ab
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..5657f7633a1
--- /dev/null
+++ b/graphics/giram/patches/patch-ac
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..80b01a4e552
--- /dev/null
+++ b/graphics/giram/patches/patch-ad
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..6d0c4c8a861
--- /dev/null
+++ b/graphics/giram/patches/patch-ae
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..67b61f2ddae
--- /dev/null
+++ b/graphics/giram/patches/patch-af
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..c9a7677f5a2
--- /dev/null
+++ b/graphics/giram/patches/patch-ag
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..7d74c2bfc34
--- /dev/null
+++ b/graphics/giram/patches/patch-ah
@@ -0,0 +1,11 @@
+$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
new file mode 100644
index 00000000000..0a6b68ca317
--- /dev/null
+++ b/graphics/giram/patches/patch-ai
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..e126f33f9e7
--- /dev/null
+++ b/graphics/giram/patches/patch-aj
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..bf4612bf03e
--- /dev/null
+++ b/graphics/giram/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 1999/08/17 05:18:44 sakamoto Exp $
+
+--- ./tools.c.orig	Sat Aug  7 11:17:42 1999
++++ ./tools.c	Tue Aug 17 13:08:08 1999
+@@ -371,5 +371,6 @@
+                                                     &transparent,
+                                                     Tools[i].Icon);
+-          TD->PixmapInBox[0] = gtk_pixmap_new(PixmapIcon, MaskIcon);
++	  TD->pos = 0;
++          TD->PixmapInBox[TD->pos] = gtk_pixmap_new(PixmapIcon, MaskIcon);
+           /* Draw the little black triangle */
+           gc = gdk_gc_new((GTK_PIXMAP(TD->PixmapInBox[TD->pos]))->mask);
diff --git a/graphics/giram/pkg/PLIST b/graphics/giram/pkg/PLIST
index 2e4fc4c3427..4af985f80d7 100644
--- a/graphics/giram/pkg/PLIST
+++ b/graphics/giram/pkg/PLIST
@@ -1,31 +1,34 @@
-@comment $NetBSD: PLIST,v 1.2 1999/06/21 09:17:21 sakamoto Exp $
-bin/povfront
+@comment $NetBSD: PLIST,v 1.3 1999/08/17 05:18:44 sakamoto Exp $
 bin/giram
-Giram/plug-ins/Rotate
-Giram/plug-ins/Spheres
-Giram/plug-ins/Box
-Giram/docs/Tutorial
-Giram/SampleScenes/Cone.pov
-Giram/SampleScenes/Disc.pov
-Giram/SampleScenes/Giram.pov
-Giram/SampleScenes/IntSphereBox1.pov
-Giram/SampleScenes/IntSphereBox2.pov
-Giram/SampleScenes/IntSphereBox3.pov
-Giram/SampleScenes/IntSpherePlane1.pov
-Giram/SampleScenes/IntSpherePlane2.pov
-Giram/SampleScenes/IntSpherePlane3.pov
-Giram/SampleScenes/Triangle.pov
-Giram/SampleScenes/basicvue.pov
-Giram/SampleScenes/basicvue2.pov
-Giram/SampleScenes/basicvue3.pov
-Giram/SampleScenes/basicvue4.pov
-Giram/SampleScenes/box.pov
-Giram/SampleScenes/colors.inc
-Giram/SampleScenes/superel1.pov
-Giram/SampleScenes/superel2.pov
-Giram/SampleScenes/superel3.pov
-Giram/SampleScenes/torus.pov
-@dirrm Giram/plug-ins
-@dirrm Giram/SampleScenes
-@dirrm Giram/docs
-@dirrm Giram
+bin/povfront
+libexec/Giram/Box
+libexec/Giram/Rotate
+libexec/Giram/Spheres
+share/doc/Giram/Tutorial
+share/examples/Giram/Cone.pov
+share/examples/Giram/Disc.pov
+share/examples/Giram/Giram.pov
+share/examples/Giram/IntSphereBox1.pov
+share/examples/Giram/IntSphereBox2.pov
+share/examples/Giram/IntSphereBox3.pov
+share/examples/Giram/IntSpherePlane1.pov
+share/examples/Giram/IntSpherePlane2.pov
+share/examples/Giram/IntSpherePlane3.pov
+share/examples/Giram/Triangle.pov
+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
+share/examples/Giram/superel3.pov
+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