summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/giram/DESCR6
-rw-r--r--graphics/giram/Makefile33
-rw-r--r--graphics/giram/PLIST102
-rw-r--r--graphics/giram/distinfo8
-rw-r--r--graphics/giram/patches/patch-aa24
-rw-r--r--graphics/giram/patches/patch-ak14
6 files changed, 127 insertions, 60 deletions
diff --git a/graphics/giram/DESCR b/graphics/giram/DESCR
index 3d3774df2ff..1ab31632295 100644
--- a/graphics/giram/DESCR
+++ b/graphics/giram/DESCR
@@ -1,6 +1,4 @@
Giram Is Really A Modeller.
-It is a Persistance Of Vision (POV-Ray) oriented modeller. But may become
-more of a general modeller in the future.
-
-Author: David Odin <David.Odin@bigfoot.com>
+Giram is a Persistance Of Vision (POV-Ray) oriented modeller but may become
+more of a general multi-purpose modeller in the future.
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index bb025d58b9b..fd764a09038 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,28 +1,37 @@
-# $NetBSD: Makefile,v 1.21 2002/12/01 13:49:40 salo Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
+# $NetBSD: Makefile,v 1.22 2003/02/15 03:49:05 salo Exp $
-DISTNAME= Giram-0.1.2
-PKGNAME= giram-0.1.2
-PKGREVISION= 1
+DISTNAME= giram-0.3.4
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.minet.net/pub/giram/
+MASTER_SITES= http://www.giram.org/downloads/
MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.minet.net/giram/
-COMMENT= Giram is Really A Modeller
+HOMEPAGE= http://www.giram.org/
+COMMENT= Giram Is Really A Modeller
DEPENDS+= povray-[0-9]*:../../graphics/povray
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
+USE_PKGINSTALL= yes
USE_X11= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram
- ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+
+PKG_SYSCONFSUBDIR= giram
+
+CONF_FILES+= ${PREFIX}/share/examples/giram/giramrc \
+ ${PKG_SYSCONFDIR}/giramrc
+CONF_FILES+= ${PREFIX}/share/examples/giram/giramrc_user \
+ ${PKG_SYSCONFDIR}/giramrc_user
+CONF_FILES+= ${PREFIX}/share/examples/giram/gtkrc \
+ ${PKG_SYSCONFDIR}/gtkrc
+CONF_FILES+= ${PREFIX}/share/examples/giram/gtkrc_user \
+ ${PKG_SYSCONFDIR}/gtkrc_user
+CONF_FILES+= ${PREFIX}/share/examples/giram/ps-menurc \
+ ${PKG_SYSCONFDIR}/ps-menurc
.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giram/PLIST b/graphics/giram/PLIST
index 126a38fa076..7759e679023 100644
--- a/graphics/giram/PLIST
+++ b/graphics/giram/PLIST
@@ -1,34 +1,84 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/25 19:20:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/15 03:49:05 salo Exp $
bin/giram
bin/povfront
libexec/giram/plug-ins/Box
libexec/giram/plug-ins/Rotate
libexec/giram/plug-ins/Spheres
+man/man1/giram.1
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
-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/box.pov
-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
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/Giram.mo
-@dirrm share/examples/Giram
+share/examples/giram/giramrc
+share/examples/giram/giramrc_user
+share/examples/giram/gtkrc
+share/examples/giram/gtkrc_user
+share/examples/giram/ps-menurc
+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
+share/giram/0.3/pigment/pigment1
+share/giram/0.3/shape/shape1
+share/giram/0.3/texture/texture1
+share/giram/0.3/tips/giram_conseils.fr.txt
+share/giram/0.3/tips/giram_tips.txt
+share/giram/0.3/user_install
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/giram.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/giram.mo
+@dirrm share/giram/0.3/tips
+@dirrm share/giram/0.3/texture
+@dirrm share/giram/0.3/shape
+@dirrm share/giram/0.3/pigment
+@dirrm share/giram/0.3/normal
+@dirrm share/giram/0.3/modules
+@dirrm share/giram/0.3/finish
+@dirrm share/giram/0.3/color
+@dirrm share/giram/0.3/color_map
+@dirrm share/giram/0.3
+@dirrm share/giram
@dirrm share/doc/giram
+@dirrm share/examples/giram
@dirrm libexec/giram/plug-ins
-@dirrm libexec/giram
diff --git a/graphics/giram/distinfo b/graphics/giram/distinfo
index 7300dc2fa93..79bbd7bbec4 100644
--- a/graphics/giram/distinfo
+++ b/graphics/giram/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/12/01 13:49:40 salo Exp $
+$NetBSD: distinfo,v 1.5 2003/02/15 03:49:05 salo Exp $
-SHA1 (Giram-0.1.2.tar.gz) = d0758b5bdc51d41c868ae68cf3ce1352b16b68ea
-Size (Giram-0.1.2.tar.gz) = 452540 bytes
-SHA1 (patch-ak) = 27587c5825d11ee9278edfb342fa1b6e6d20a428
+SHA1 (giram-0.3.4.tar.gz) = 17bb714d96e4e084f03df74b76923ca97ccc7003
+Size (giram-0.3.4.tar.gz) = 1265387 bytes
+SHA1 (patch-aa) = a575aba5e5bc501f62b7ccd409f3d45306e8b002
diff --git a/graphics/giram/patches/patch-aa b/graphics/giram/patches/patch-aa
new file mode 100644
index 00000000000..d6b19fa04e4
--- /dev/null
+++ b/graphics/giram/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.5 2003/02/15 03:49:06 salo Exp $
+
+--- Makefile.in.orig Thu Jul 25 00:32:27 2002
++++ Makefile.in Sat Feb 15 04:13:53 2003
+@@ -307,14 +307,14 @@
+
+ install-giramsysconfDATA: $(giramsysconf_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(giramsysconfdir)
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/giram
+ @list='$(giramsysconf_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(giramsysconfdir)/$$p"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(giramsysconfdir)/$$p; \
++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/giram/$$p"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/giram/$$p; \
+ else if test -f $$p; then \
+- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(giramsysconfdir)/$$p"; \
+- $(INSTALL_DATA) $$p $(DESTDIR)$(giramsysconfdir)/$$p; \
++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/giram/$$p"; \
++ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/giram/$$p; \
+ fi; fi; \
+ done
+
diff --git a/graphics/giram/patches/patch-ak b/graphics/giram/patches/patch-ak
deleted file mode 100644
index 9a3589f6081..00000000000
--- a/graphics/giram/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/01/25 19:20:29 wiz Exp $
-
---- src/tools.c.orig Sat Aug 7 04:17:42 1999
-+++ src/tools.c
-@@ -370,7 +370,8 @@
- &MaskIcon,
- &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);
- gdk_color_white(gdk_colormap_get_system(), &color);