a) Backout former commit. It has already been correctly updated

   to 0.3.5 by ports fury.
b) forget to acknoledge Clement Laforet <sheepkiller@cultdeadsheep.org>
   for former commit.

Submitted by:	KATO Tsuguru <tkato@prontomail.com> aka ports fury
Pointy hat to:	myself

2 files changed, 79 insertions, 62 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index a809ed23af0f..6094b74961a6 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -11,40 +11,33 @@ CATEGORIES=	graphics
 MASTER_SITES=	http://www.giram.org/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Giram is Really A Modeller
-
-RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray31
+COMMENT=	A POV-Ray oriented modeller
 
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
-USE_MESA=	yes
-USE_GMAKE=	yes
+USE_PERL5_BUILD=	yes
 USE_GNOME=	gtk20
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gl=${X11BASE}
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+=	libcapplet
-PKGNAMESUFFIX=	-gnome
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		INTLTOOL_PERL="${PERL}"
+CONFIGURE_ARGS=	--datadir="${PREFIX}/lib" \
+		--with-tutorial-path="${DOCSDIR}" \
+		--with-lib3ds-prefix="${LOCALBASE}"
+MAN1=		giram.1
+
+.if defined(WITH_POVRAY31)
+BUILD_DEPENDS=	povray:${PORTSDIR}/graphics/povray31
+RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray31
 .else
-CONFIGURE_ARGS+=--disable-gnome
+BUILD_DEPENDS=	povray:${PORTSDIR}/graphics/povray
+RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$(top_builddir)/intl/libintl.a|-lintl|g' \
-		 ${WRKSRC}/configure
-
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes
-	#${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/*.pov ${EXAMPLESDIR}
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/giram/pkg-plist b/graphics/giram/pkg-plist
index c4cda55fa8f4..10b1803f5d15 100644
--- a/graphics/giram/pkg-plist
+++ b/graphics/giram/pkg-plist
@@ -1,44 +1,53 @@
-bin/povfront
 bin/giram
+bin/povfront
 etc/giram/0.3/giramrc
 etc/giram/0.3/giramrc_user
 etc/giram/0.3/gtkrc
 etc/giram/0.3/gtkrc_user
 etc/giram/0.3/ps-menurc
-libexec/giram/plug-ins/Spheres
+lib/giram/0.3/color/color1.gcf
+lib/giram/0.3/finish/finish1
+lib/giram/0.3/giram_logo.ppm
+lib/giram/0.3/giram_splash.ppm
+lib/giram/0.3/modules/librender_flat.so
+lib/giram/0.3/modules/librender_gouraud.so
+lib/giram/0.3/modules/librender_hiddenfaces.so
+lib/giram/0.3/modules/librender_povray.so
+lib/giram/0.3/modules/librender_raytracing.so
+lib/giram/0.3/modules/librender_wireframe.so
+lib/giram/0.3/normal/normal1
+lib/giram/0.3/pigment/pigment1
+lib/giram/0.3/shape/shape1
+lib/giram/0.3/texture/texture1
+lib/giram/0.3/tips/giram_conseils.fr.txt
+lib/giram/0.3/tips/giram_tips.txt
+lib/giram/0.3/user_install
 libexec/giram/plug-ins/Box
 libexec/giram/plug-ins/Rotate
-man/man1/giram.1
-share/doc/giram/Tutorial
-share/giram/0.3/color/color1.gcf
-share/giram/0.3/finish/finish1
-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/modules/librender_wireframe.so
-share/giram/0.3/modules/librender_wireframe.la
-share/giram/0.3/modules/librender_wireframe.a
-share/giram/0.3/modules/librender_hiddenfaces.so
-share/giram/0.3/modules/librender_hiddenfaces.la
-share/giram/0.3/modules/librender_hiddenfaces.a
-share/giram/0.3/modules/librender_flat.so
-share/giram/0.3/modules/librender_flat.la
-share/giram/0.3/modules/librender_flat.a
-share/giram/0.3/modules/librender_gouraud.so
-share/giram/0.3/modules/librender_gouraud.la
-share/giram/0.3/modules/librender_gouraud.a
-share/giram/0.3/modules/librender_raytracing.so
-share/giram/0.3/modules/librender_raytracing.la
-share/giram/0.3/modules/librender_raytracing.a
-share/giram/0.3/modules/librender_povray.so
-share/giram/0.3/modules/librender_povray.la
-share/giram/0.3/modules/librender_povray.a
-share/giram/0.3/tips/giram_tips.txt
-share/giram/0.3/tips/giram_conseils.fr.txt
-share/giram/0.3/user_install
-share/giram/0.3/giram_logo.ppm
-share/giram/0.3/giram_splash.ppm
+libexec/giram/plug-ins/Spheres
+%%DOCSDIR%%/Tutorial
+%%PORTDOCS%%%%EXAMPLESDIR%%/Cone.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/Disc.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/Giram.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox1.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox2.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox3.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane1.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane2.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane3.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/Triangle.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue2.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue3.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue4.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/box.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/checker.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/lollipop.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/superel1.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/superel2.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/superel3.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/test.pov
+%%PORTDOCS%%%%EXAMPLESDIR%%/torus.pov
 share/locale/ca/LC_MESSAGES/giram.mo
 share/locale/cs/LC_MESSAGES/giram.mo
 share/locale/da/LC_MESSAGES/giram.mo
@@ -50,8 +59,8 @@ share/locale/fi/LC_MESSAGES/giram.mo
 share/locale/fr/LC_MESSAGES/giram.mo
 share/locale/ga/LC_MESSAGES/giram.mo
 share/locale/gl/LC_MESSAGES/giram.mo
-share/locale/hu/LC_MESSAGES/giram.mo
 share/locale/hr/LC_MESSAGES/giram.mo
+share/locale/hu/LC_MESSAGES/giram.mo
 share/locale/it/LC_MESSAGES/giram.mo
 share/locale/ja/LC_MESSAGES/giram.mo
 share/locale/ko/LC_MESSAGES/giram.mo
@@ -67,3 +76,18 @@ share/locale/tr/LC_MESSAGES/giram.mo
 share/locale/uk/LC_MESSAGES/giram.mo
 share/locale/zh_CN/LC_MESSAGES/giram.mo
 share/locale/zh_TW/LC_MESSAGES/giram.mo
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%
+@dirrm libexec/giram/plug-ins
+@dirrm libexec/giram
+@dirrm lib/giram/0.3/tips
+@dirrm lib/giram/0.3/texture
+@dirrm lib/giram/0.3/shape
+@dirrm lib/giram/0.3/pigment
+@dirrm lib/giram/0.3/normal
+@dirrm lib/giram/0.3/modules
+@dirrm lib/giram/0.3/finish
+@dirrm lib/giram/0.3/color_map
+@dirrm lib/giram/0.3/color
+@dirrm lib/giram/0.3
+@dirrm lib/giram