From tkato432@yahoo.com  Thu Nov 24 18:15:17 2011
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F397E106567F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 24 Nov 2011 18:14:39 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169])
	by mx1.freebsd.org (Postfix) with ESMTP id BC98C8FC19
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 24 Nov 2011 18:14:39 +0000 (UTC)
Received: from msa106lp.auone-net.jp (MSA106lp [172.27.12.184])
	by msa106lp.auone-net.jp (au one net msa) with ESMTP id 59A6F500228
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 25 Nov 2011 03:02:21 +0900 (JST)
Received: from localhost.localdomain (ZT046077.ppp.dion.ne.jp [59.128.46.77])
	by msa106lp.auone-net.jp (au one net msa) with ESMTP id A3A8223C031
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 25 Nov 2011 03:02:17 +0900 (JST)
Message-Id: <20111125025115.60eb78e9.tkato432@yahoo.com>
Date: Fri, 25 Nov 2011 02:51:15 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: graphics/rayshade

>Number:         162838
>Category:       ports
>Synopsis:       Update port: graphics/rayshade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 24 18:20:15 UTC 2011
>Closed-Date:    Sat Jan 14 19:36:54 UTC 2012
>Last-Modified:  Sat Jan 14 19:36:54 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support CFLAGS properly
- Support PORTDOCS/PORTEXAMPLES/PLIST_FILES

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/rayshade/Makefile graphics/rayshade/Makefile
--- /usr/ports/graphics/rayshade/Makefile	2010-03-28 17:39:17.000000000 +0900
+++ graphics/rayshade/Makefile	2011-09-26 14:07:46.000000000 +0900
@@ -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=	*
+PORTEXAMPLE=	*
+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 -urN /usr/ports/graphics/rayshade/files/config.ans graphics/rayshade/files/config.ans
--- /usr/ports/graphics/rayshade/files/config.ans	2003-07-29 21:32:25.000000000 +0900
+++ graphics/rayshade/files/config.ans	2011-09-12 19:51:39.000000000 +0900
@@ -4,7 +4,7 @@
 
 
 @CC@
-
+none
 @CFLAGS@
 
 @LOCALBASE@/include
diff -urN /usr/ports/graphics/rayshade/pkg-plist graphics/rayshade/pkg-plist
--- /usr/ports/graphics/rayshade/pkg-plist	2003-07-29 21:32:25.000000000 +0900
+++ graphics/rayshade/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -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%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 24 18:22:19 UTC 2011 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162838 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Mon Nov 28 11:34:32 UTC 2011 
State-Changed-Why:  
- Fix MASTER_SITES 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162838 
State-Changed-From-To: feedback->open 
State-Changed-By: miwi 
State-Changed-When: Mon Nov 28 11:35:20 UTC 2011 
State-Changed-Why:  
sorry messed up with feedback note 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162838 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Mon Nov 28 11:35:33 UTC 2011 
State-Changed-Why:  
build failed with PORTDOCS/PORTEXAMPLE check, 
http://tb.smeets.im/tb/index.php?action=describe_port&id=1504 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162838 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/162838: commit references a PR
Date: Sun,  4 Dec 2011 09:35:29 +0000 (UTC)

 miwi        2011-12-04 09:35:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/rayshade    Makefile 
     graphics/rayshade/files config.ans 
   Removed files:
     graphics/rayshade    pkg-plist 
   Log:
   - Fix MASTER_SITES
   - Support CFLAGS properly
   - Support PORTDOCS/PORTEXAMPLES/PLIST_FILES
   
   PR:             162838
   Submitted by:   Ports Fury
   Feature safe:   yes
   
   Revision  Changes    Path
   1.21      +28 -20    ports/graphics/rayshade/Makefile
   1.4       +1 -1      ports/graphics/rayshade/files/config.ans
   1.3       +0 -19     ports/graphics/rayshade/pkg-plist (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jan 14 19:36:53 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162838 
>Unformatted:
