- Fix MASTER_SITES

- Support CFLAGS properly
- Support PORTDOCS/PORTEXAMPLES/PLIST_FILES

PR:		162838
Submitted by:	Ports Fury
Feature safe:	yes

3 files changed, 29 insertions, 40 deletions

diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index fc91eed7b7e9..817ede2bcb39 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -7,47 +7,55 @@
 
 PORTNAME=	rayshade
 PORTVERSION=	4.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://graphics.stanford.edu/pub/rayshade/	\
-		ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
+MASTER_SITES=	http://ccl.net/cca/software/SOURCES/C/rayshade/ \
+		http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
+		ftp://graphics.stanford.edu/pub/rayshade/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
-.ifndef NOPORTDOCS
+.if !defined(NOPORTDOCS)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} guide.ps.Z
 .endif
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	rayshade
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible system for creating ray-traced images
 
 BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
 
-DIST_SUBDIR=	rayshade
-
 WRKSRC=		${WRKDIR}/${PORTNAME}.4.0
+
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-ALL_TARGET=
+ALL_TARGET=	# empty
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/rayshade
 
-.if defined (BATCH) || defined(PACKAGE_BUILDING)
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
-pre-configure:
-	@${MKDIR} ${PREFIX}/bin
-	${CP} ${FILESDIR}/config.ans ${WRKDIR}/config.ans
-	${REINPLACE_CMD} -e "s,@CFLAGS@,${CFLAGS},g ; \
-			     s,@CC@,${CC},g ; \
-			     s,@LOCALBASE@,${LOCALBASE},g ; \
-			     s,@PREFIX@,${PREFIX},g" ${WRKDIR}/config.ans
 .endif
 
+pre-configure:
+	@${SED} -e \
+		"s,@CFLAGS@,${CFLAGS},g ; \
+		 s,@CC@,${CC},g ; \
+		 s,@LOCALBASE@,${LOCALBASE},g ; \
+		 s,@PREFIX@,${PREFIX},g" \
+		< ${FILESDIR}/config.ans > ${WRKDIR}/config.ans
+
 do-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/rayshade/rayshade $(PREFIX)/bin
-.ifndef NOPORTDOCS
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR}
-	$(MKDIR) $(PREFIX)/share/examples/rayshade
-	$(INSTALL_DATA) $(WRKSRC)/Examples/* $(PREFIX)/share/examples/rayshade
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/rayshade/files/config.ans b/graphics/rayshade/files/config.ans
index 23bb7a06994a..3c4ede327502 100644
--- a/graphics/rayshade/files/config.ans
+++ b/graphics/rayshade/files/config.ans
@@ -4,7 +4,7 @@
 
 
 @CC@
-
+none
 @CFLAGS@
 
 @LOCALBASE@/include
diff --git a/graphics/rayshade/pkg-plist b/graphics/rayshade/pkg-plist
deleted file mode 100644
index fe4b27fa2a8c..000000000000
--- a/graphics/rayshade/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/rayshade
-%%PORTDOCS%%%%DOCSDIR%%/guide.ps.Z
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/ashtray.def.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/ashtray.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/balls.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/blob.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/boxball.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/coin.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/csg.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/glass.def.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/glass.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/mtv.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/planet.map
-%%PORTDOCS%%%%EXAMPLESDIR%%/planet.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/pool.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/solids.ray
-%%PORTDOCS%%%%EXAMPLESDIR%%/stripe.ray
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%