- Remove previous master site, it was cybersquatted

- Adjust port description according to the new author's page, fix WWW
- Fix plist issues (mixed usage of PORTDOCS and PORTEXAMPLES)
- Relinquish, I no longer use it

3 files changed, 31 insertions, 33 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index c1065de3f051..109bdafec669 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	giram
 PORTVERSION=	0.3.5
 PORTREVISION=	12
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.giram.org/downloads/ \
-		http://freebsd.nsu.ru/distfiles/
+MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
+		#http://www.giram.org/downloads/
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A POV-Ray oriented modeller
 
 LIB_DEPENDS=	3ds-1.3:${PORTSDIR}/graphics/lib3ds
@@ -43,6 +43,7 @@ RUN_DEPENDS+=	povray:${PORTSDIR}/graphics/povray
 .endif
 
 MAN1=		giram.1
+PORTDOCS=	Tutorial
 
 post-patch:
 	@${REINPLACE_CMD} -e '36s,static ,,' ${WRKSRC}/src/tools/tool_disc.c
@@ -50,7 +51,7 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/*.pov ${EXAMPLESDIR}
 .endif
diff --git a/graphics/giram/pkg-descr b/graphics/giram/pkg-descr
index 6581ca9ac639..eb6aaa24fa09 100644
--- a/graphics/giram/pkg-descr
+++ b/graphics/giram/pkg-descr
@@ -1,7 +1,6 @@
-Giram Is Really A Modeller.
+Giram Is a Renderer And a Modeller.
 
-It is a Persistance Of Vision (POV-Ray) oriented modeller. But may become
+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>
-WWW: http://www.giram.org/
+WWW: http://dindinx.net/giram/
diff --git a/graphics/giram/pkg-plist b/graphics/giram/pkg-plist
index 21d8f3a29805..adeefc27b7d5 100644
--- a/graphics/giram/pkg-plist
+++ b/graphics/giram/pkg-plist
@@ -37,29 +37,29 @@ lib/giram/0.3/user_install
 libexec/giram/plug-ins/Box
 libexec/giram/plug-ins/Rotate
 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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Cone.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Disc.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Giram.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSphereBox1.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSphereBox2.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSphereBox3.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSpherePlane1.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSpherePlane2.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IntSpherePlane3.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Triangle.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicvue.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicvue2.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicvue3.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicvue4.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/box.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checker.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lollipop.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/superel1.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/superel2.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/superel3.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pov
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/torus.pov
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 share/locale/ca/LC_MESSAGES/giram.mo
 share/locale/cs/LC_MESSAGES/giram.mo
 share/locale/da/LC_MESSAGES/giram.mo
@@ -88,8 +88,6 @@ 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