ports/155483: Update port: graphics/povray31

[Bjoern Koenig]

>Number:         155483
>Category:       ports
>Synopsis:       Update port: graphics/povray31
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 11 22:30:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Bjoern Koenig
>Release:        
>Organization:
>Environment:



	
>Description:
	In preparation for the upcoming POV-Ray 3.7 release I clean up
	the povray ports.

	This update has the following major changes:
	
	- rename binary (and manpage) to avoid conflicts
	- make X Window support optional
	- remove dead mirror servers

	With Oliver's accordance I would like to take maintainership
	of this port to make the chain of command shorter in case of
	further changes.
>How-To-Repeat:
>Fix:

--- ports_graphics_povray31.diff begins here ---
diff -ruN ports/graphics/povray31.orig/Makefile ports/graphics/povray31/Makefile
--- ports/graphics/povray31.orig/Makefile	2010-03-28 08:37:38.000000000 +0200
+++ ports/graphics/povray31/Makefile	2011-03-11 23:15:03.000000000 +0100
@@ -7,12 +7,10 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.1g
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
-		ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
-		ftp://ftp.fh-aachen.de/pub/mirror/ftp.povray.org/povray/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	Old-Versions/Official-3.1g/Unix
 DISTNAME=	povray31
@@ -21,10 +19,12 @@
 MAINTAINER=	olli at fromme.com
 COMMENT=	Persistence of Vision Ray Tracer
 
-#BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
+OPTIONS=	X11 "X Window support" ON
+
 DIST_SUBDIR=	povray31
+LATEST_LINK=	povray31
 
 #
 #   I think all of this needs some explanation.
@@ -34,18 +34,28 @@
 #   no UNIX source files for POV-Ray 3.1.
 #
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_X11)
 USE_XORG=	x11
-MAN1=		povray.1
+ALL_TARGET=	newxwin
+POVBIN=		${BUILD_WRKSRC}/x-povray
+.else
+ALL_TARGET=	newunix
+POVBIN=		${BUILD_WRKSRC}/povray
+.endif
+
+MAN1=		${LATEST_LINK}.1
 
-POVLIB=		${PREFIX}/lib/povray31
+POVLIB=		${PREFIX}/lib/${LATEST_LINK}
 
-do-build:
-	@(cd ${WRKSRC}/source/unix; ${SETENV} ${MAKE_ENV} ${MAKE} newxwin)
+BUILD_WRKSRC=	${WRKSRC}/source/unix
+MAKEFILE=	makefile
 
 do-install:
 	@${MKDIR} ${POVLIB}/allscene
 	@${TOUCH} ${POVLIB}/allscene/.bla
-	@${INSTALL_PROGRAM} ${WRKSRC}/source/unix/x-povray ${PREFIX}/bin/povray
+	@${INSTALL_PROGRAM} ${POVBIN} ${PREFIX}/bin/${LATEST_LINK}
 	@(cd ${WRKSRC}; ${TAR} cpf - include scenes) | \
 		(cd ${POVLIB}; ${TAR} xpf -)
 	@${INSTALL_DATA} ${WRKSRC}/*.ini ${POVLIB}/
@@ -53,11 +63,11 @@
 	@${INSTALL_DATA} ${WRKSRC}/*.txt ${POVLIB}/
 	@${INSTALL_DATA} ${WRKSRC}/*.gif ${WRKSRC}/*.xpm ${POVLIB}/
 	@${INSTALL_SCRIPT} ${WRKSRC}/allscene.sh ${POVLIB}/
-	@${RM} -f ${PREFIX}/man/man1/povray.1*
-	@${INSTALL_MAN} ${WRKSRC}/povray.1 ${PREFIX}/man/man1
+	@${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${LATEST_LINK}.1
+	@${INSTALL_MAN} ${WRKSRC}/${LATEST_LINK}.1 ${PREFIX}/man/man1
 	@${CHMOD} -R a+rX,og-w ${POVLIB}
 
 post-install:
 	@${SH} ${FILESDIR}/script
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN ports/graphics/povray31.orig/distinfo ports/graphics/povray31/distinfo
--- ports/graphics/povray31.orig/distinfo	2006-01-22 13:35:08.000000000 +0100
+++ ports/graphics/povray31/distinfo	2011-03-11 22:54:50.000000000 +0100
@@ -1,6 +1,4 @@
-MD5 (povray31/povuni_s.tgz) = 6da91fb1d3d48cd44f46b831760d233f
 SHA256 (povray31/povuni_s.tgz) = 8170af7dd96e497c1bd2b7cd5af17b3edba75c0de87949c410faf9dc677ff609
 SIZE (povray31/povuni_s.tgz) = 946513
-MD5 (povray31/povuni_d.tgz) = dff3b8f3bc2a6dd131a9d008d0f46295
 SHA256 (povray31/povuni_d.tgz) = be7ad6c7f1ec53c3b2a790cc428cacdccf6c874f638f8d8c6fe906cd0b9a13ad
 SIZE (povray31/povuni_d.tgz) = 913748
diff -ruN ports/graphics/povray31.orig/pkg-plist ports/graphics/povray31/pkg-plist
--- ports/graphics/povray31.orig/pkg-plist	2000-04-01 00:11:59.000000000 +0200
+++ ports/graphics/povray31/pkg-plist	2011-03-11 22:27:02.000000000 +0100
@@ -1,4 +1,4 @@
-bin/povray
+bin/povray31
 lib/povray31/CMPL_Unix.doc
 lib/povray31/allscene.ini
 lib/povray31/allscene.sh
--- ports_graphics_povray31.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: