Update to 3.7.0 RC3

PR:		ports/156431
Submitted by:	Bjoern Koenig <bkoenig at alpha-tierchen.de>

graphics/povray37/Makefile

@@ -6,73 +6,181 @@
 #
 
 PORTNAME=	povray
-PORTVERSION=	3.6.1
-PORTREVISION=	8
+DISTVERSION=	3.7.0.RC3
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	Official/Unix
-DIST_SUBDIR=	povray36
+MASTER_SITES=	http://www.povray.org/beta/source/
+DIST_SUBDIR=	${UNIQUENAME}
 
-MAINTAINER=	maho@FreeBSD.org
+MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
 
-.if defined(WITH_ICC)
-BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
-.endif
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff \
-		jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
+
+OPTIONS=	X11 "X Window display support" OFF \
+		PNG "PNG support" ON \
+		JPEG "JPEG support" ON \
+		TIFF "TIFF support" OFF \
+		OPENEXR "OpenEXR support" OFF \
+		STATIC "Build static binary" OFF \
+		IO "Disable I/O restrictions (security risk)" OFF \
+		EXAMPLES "Install example scenes" ON \
+		HTML "Install HTML documentation" ON
 
-USE_XORG=	x11
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf
-LATEST_LINK=	${PORTNAME}36
+LATEST_LINK=	${PORTNAME}37
+
+VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${VERSION_BASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE}
+DATADIR=	${PREFIX}/share/${PORTNAME}-${VERSION_BASE}
+ETCDIR=		${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "i386")
-LIB_DEPENDS+=	vga:${PORTSDIR}/graphics/svgalib
-.endif
+INCLUDES=	-I${LOCALBASE}/include
 
-.if defined(WITH_OPTIMIZED_FLAGS)
-CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
-CXXFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
-.if (${ARCH} == "i386" && !${ARCH} == "amd64" )
-CFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
-CXXFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
-.endif # i386
-.endif
-
-.if defined(WITH_ICC)
-CC=		${LOCALBASE}/intel_cc_80/bin/icc
-CXX=		${LOCALBASE}/intel_cc_80/bin/icpc
-CFLAGS=		-O3 -tpp7 -axN -Vaxlib
-CXXFLAGS=	-O3 -tpp7 -axN -Vaxlib
-.endif
-
-CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \
-		CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \
-		CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \
-		LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
+CONFIGURE_ARGS=	COMPILED_BY=${MAINTAINER} --prefix=${PREFIX} \
+		--program-transform-name='s/${PORTNAME}/${UNIQUENAME}/' \
 		--disable-optimiz
 
-MAN1=		povray.1
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=		X11="@comment "
+.else
+USE_XORG=		xpm sm ice x11
+USE_SDL=		sdl
+CONFIGURE_ARGS+=	--x-include=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs
+PLIST_SUB+=		X11=""
+.endif
 
-post-patch:
-	#@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
-	#@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
-.if !defined(WITH_OPTIMIZED_FLAGS)
-	@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=--enable-static
+.endif
+
+.if defined(WITH_IO)
+CONFIGURE_ARGS+=--disable-io-restrictions
+.endif
+
+.if defined(WITH_PNG)
+.if defined(WITH_STATIC)
+BUILD_DEPENDS+=	png>=1.4:${PORTSDIR}/graphics/png
+.else
+LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIBS+=		-lpng
+.endif
+.else
+CONFIGURE_ARGS+=--without-libpng
+.endif
+
+.if defined(WITH_JPEG)
+.if defined(WITH_STATIC)
+BUILD_DEPENDS+=	jpeg>=6b:${PORTSDIR}/graphics/jpeg
+.else
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+LIBS+=		-ljpeg
+.endif
+.else
+CONFIGURE_ARGS+=--without-libjpeg
+.endif
+
+.if defined(WITH_TIFF)
+.if defined(WITH_STATIC)
+BUILD_DEPENDS+=	tiff>=4:${PORTSDIR}/graphics/tiff
+.else
+LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
+LIBS+=		-ltiff
+.endif
+.else
+CONFIGURE_ARGS+=--without-libtiff
+.endif
+
+.if defined(WITH_OPENEXR)
+.if defined(WITH_STATIC)
+BUILD_DEPENDS+=	OpenEXR>=1.6:${PORTSDIR}/graphics/OpenEXR
+.else
+LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
+LIBS+=		-lIlmImf
+INCLUDES+=	-I${LOCALBASE}/include/OpenEXR
+.endif
+.else
+CONFIGURE_ARGS+=--without-openexr
+.endif
+
+.if defined(WITHOUT_PNG) || defined(WITHOUT_JPEG) || defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
+.endif
+
+.if defined(WITHOUT_EXAMPLES)
+PLIST_SUB+=	EXAMPLES="@comment "
+.else
+PLIST_SUB+=	EXAMPLES=""
+.endif
+
+.if defined(WITHOUT_HTML)
+PLIST_SUB+=	HTML="@comment "
+.else
+PLIST_SUB+=	HTML=""
+.endif
+
+CONFIGURE_ARGS+=CXXFLAGS="${CXXFLAGS} ${INCLUDES}"
+
+MAN1=		${UNIQUENAME}.1
+
+DOC_FILES=	AUTHORS ChangeLog NEWS
+
+pre-build:
+.if defined(WITH_STATIC) && defined(WITH_TIFF)
+#	graphics/tiff adds dependencies on libjpeg and libjbig
+	@${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig\2,' ${WRKSRC}/unix/Makefile
 .endif
 
 do-install:
-	@(cd ${WRKSRC} ; ${GMAKE} install)
-
-post-install:
-	@${SED} -e 's,/usr/local,${PREFIX},g' ${DESCR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${PREFIX}/bin/${UNIQUENAME}
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/${MAN1}
+	@${MKDIR} ${ETCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${ETCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${ETCDIR}
+	@${MKDIR} ${DATADIR}/include ${DATADIR}/ini ${DATADIR}/scripts
+	@filelist=`find ${WRKSRC}/include/ ${WRKSRC}/ini/ ${WRKSRC}/scripts/ -type f | ${SED} s,${WRKSRC}/,,`; \
+	for f in $$filelist ; do \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DATADIR}//$$f; \
+	done
+.if !defined(WITHOUT_X11)
+	@${MKDIR} ${DATADIR}/icons
+	@filelist=`find ${WRKSRC}/icons/ -type f | ${SED} s,${WRKSRC}/icons/,,`; \
+	for f in $$filelist ; do \
+		${INSTALL_DATA} ${WRKSRC}/icons/$$f ${DATADIR}/icons/$$f; \
+	done
+.endif
+.if !defined(WITHOUT_EXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@dirlist=`find ${WRKSRC}/scenes/ -type d | ${SED} s,${WRKSRC}/scenes/,,`; \
+	for p in "" $$dirlist ; do \
+		${MKDIR} ${EXAMPLESDIR}/$$p; \
+	done
+	@filelist=`find ${WRKSRC}/scenes/ -type f | ${SED} s,${WRKSRC}/scenes/,,`; \
+	for f in $$filelist ; do \
+		${INSTALL_DATA} ${WRKSRC}/scenes/$$f ${EXAMPLESDIR}/$$f; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@for f in ${DOC_FILES} ; do \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}/$$f; \
+	done
+.if !defined(WITHOUT_HTML)
+	@dirlist=`find ${WRKSRC}/doc/ -type d | ${SED} s,${WRKSRC}/doc/,,`; \
+	for p in "" $$dirlist ; do \
+		${MKDIR} ${DOCSDIR}/$$p; \
+	done
+	@filelist=`find ${WRKSRC}/doc/ -type f | ${SED} s,${WRKSRC}/doc/,,`; \
+	for f in $$filelist ; do \
+		${INSTALL_DATA} ${WRKSRC}/doc/$$f ${DOCSDIR}/$$f; \
+	done
+.endif
+.endif
 
 .include <bsd.port.post.mk>

graphics/povray37/distinfo

@@ -1,3 +1,2 @@
-MD5 (povray36/povray-3.6.1.tar.bz2) = b5789bb7eeaed0809c5c82d0efda571d
-SHA256 (povray36/povray-3.6.1.tar.bz2) = 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
-SIZE (povray36/povray-3.6.1.tar.bz2) = 8200160
+SHA256 (povray37/povray-3.7.0.RC3.tar.bz2) = 246affb3be8ebbd3b0a192da7ee9684295d707143d192d4831e78210c6dbbdcb
+SIZE (povray37/povray-3.7.0.RC3.tar.bz2) = 11226551

graphics/povray37/files/patch-Makefile.in

@@ -0,0 +1,58 @@
+--- Makefile.in.orig	2011-01-22 06:36:17.000000000 +0100
++++ Makefile.in	2011-04-15 21:25:36.000000000 +0200
+@@ -512,16 +512,6 @@
+ 	cd "$(DESTDIR)$(povconfdir)" && rm -f $$files
+ install-povdocDATA: $(povdoc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(povdocdir)" || $(MKDIR_P) "$(DESTDIR)$(povdocdir)"
+-	@list='$(povdoc_DATA)'; test -n "$(povdocdir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(povdocdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(povdocdir)" || exit $$?; \
+-	done
+ 
+ uninstall-povdocDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -1018,7 +1008,7 @@
+ install-data-local:
+ 	cat /dev/null > $(povinstall);
+ 	@echo "Creating data directories..."; \
+-	list='$(top_srcdir)/icons $(top_srcdir)/include $(top_srcdir)/ini $(top_srcdir)/scenes'; \
++	list='$(top_srcdir)/include $(top_srcdir)/ini'; \
+ 	dirlist=`find $$list -type d | sed s,$(top_srcdir)/,,`; \
+ 	for p in "" $$dirlist ; do \
+ 	  $(mkdir_p) $(DESTDIR)$(povlibdir)/$$p && printf "%s\n" "$(DESTDIR)$(povlibdir)/$$p" "`cat $(povinstall)`" > $(povinstall); \
+@@ -1028,29 +1018,6 @@
+ 	for f in $$filelist ; do \
+ 	  $(INSTALL_DATA) $(top_srcdir)/$$f $(DESTDIR)$(povlibdir)/$$f && echo "$(DESTDIR)$(povlibdir)/$$f" >> $(povinstall); \
+ 	done
+-	@echo "Creating documentation directories..."; \
+-	dirlist=`find $(top_srcdir)/doc/ -type d | sed s,$(top_srcdir)/doc/,,`; \
+-	for p in "" $$dirlist ; do \
+-	  $(mkdir_p) $(DESTDIR)$(povdocdir)/$$p && printf "%s\n" "$(DESTDIR)$(povdocdir)/$$p" "`cat $(povinstall)`" > $(povinstall); \
+-	done
+-	@echo "Copying documentation files..."; \
+-	filelist=`find $(top_srcdir)/doc/ -type f | sed s,$(top_srcdir)/doc/,,`; \
+-	for f in $$filelist ; do \
+-	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
+-	done
+-	@echo "Creating user directories..."; \
+-	for p in $(povuser) $(povconfuser) ; do \
+-	  $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
+-	done
+-	@echo "Copying user configuration and INI files..."; \
+-	for f in povray.conf povray.ini ; do \
+-	  if test -f $(povconfuser)/$$f; then \
+-	    echo "Creating backup of $(povconfuser)/$$f"; \
+-	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
+-	  fi; \
+-	done; \
+-	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
+-	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
+ 
+ # Remove data, config, and empty folders for 'make uninstall'.
+ # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).

graphics/povray37/files/patch-png_pov.cpp

@@ -1,20 +0,0 @@
---- source/png_pov.cpp.orig	2004-08-03 01:11:37.000000000 +0200
-+++ source/png_pov.cpp	2010-03-29 14:06:26.000000000 +0200
-@@ -1428,7 +1428,7 @@
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1461,7 +1461,7 @@
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");

graphics/povray37/files/patch-source_base_image_image.cpp

@@ -0,0 +1,29 @@
+--- source/base/image/image.cpp.orig	2011-01-22 06:31:21.000000000 +0100
++++ source/base/image/image.cpp	2011-03-08 12:37:06.000000000 +0100
+@@ -2886,7 +2886,7 @@
+ 			meta[0] = sizeof(pixel_type);
+ 			meta[1] = m_Width;
+ 			meta[2] = m_Height;
+-			if (lseek64(m_File, pos, SEEK_SET) != pos)
++			if (lseek(m_File, pos, SEEK_SET) != pos)
+ 					throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed at creation.");
+ 			if (write(m_File, &meta[0], (int) sizeof(size_type)*3) != (sizeof(size_type)*3))
+ 					throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed at creation.");
+@@ -3057,7 +3057,7 @@
+ #endif
+ 				pos = block * sizeof(pixel_type) * m_Blocksize;
+ 				int chunk = sizeof(pixel_type) * m_Blocksize;
+-				if (lseek64(m_File, pos, SEEK_SET) != pos)
++				if (lseek(m_File, pos, SEEK_SET) != pos)
+ 					throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file read/seek failed.");
+ 				int bytes = read(m_File, &m_Buffer[0], chunk);
+ 				if (bytes != (sizeof(pixel_type) * m_Blocksize))
+@@ -3080,7 +3080,7 @@
+ 
+ 			if (m_Dirty) {
+ 				pos = m_CurrentBlock * sizeof(pixel_type) * m_Blocksize;
+-				if (lseek64(m_File, pos, SEEK_SET) != pos)
++				if (lseek(m_File, pos, SEEK_SET) != pos)
+ 					throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed.");
+ 				if (write(m_File, &m_Buffer[0], (int) sizeof(pixel_type) * m_Blocksize) != (sizeof(pixel_type) * m_Blocksize))
+ 					throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed.");

graphics/povray37/files/patch-vfe_unix_vfeplatform.cpp

@@ -0,0 +1,10 @@
+--- vfe/unix/vfeplatform.cpp.orig	2011-01-02 14:43:05.000000000 +0100
++++ vfe/unix/vfeplatform.cpp	2011-03-08 12:57:50.000000000 +0100
+@@ -97,6 +97,7 @@
+ #include <pthread.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/wait.h>
+ 
+ #ifdef HAVE_TIME_H
+ # include <time.h>

graphics/povray37/pkg-descr

@@ -1,4 +1,4 @@
-POV-Ray(TM) 3.5 Persistence of Vision Ray Tracer
+POV-Ray(TM) Persistence of Vision Ray Tracer
 
 The  Persistence  of  Vision(tm)   Ray-Tracer   creates   three-dimensional,
 photo-realistic images using a rendering  technique  called  ray-tracing.  It
@@ -8,7 +8,4 @@ of a camera also described in the  text  file.  Ray-tracing  is  not  a  fast
 process by any means, but it produces very high quality images with realistic
 reflections, shading, perspective and other effects.
 
-Legal and License information can be consulted in the following file
-/usr/local/share/doc/povray-3.6/povlegal.doc
-
 WWW: http://www.povray.org/