Attachment #189098 for bug #215473




# $FreeBSD$

PORTNAME=	povray
DISTVERSIONPREFIX=	v
DISTVERSION=	3.7.0.5
CATEGORIES=	graphics
MASTER_SITES=	http://www.povray.org/beta/source/
PKGNAMESUFFIX=	37
DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}



BROKEN_powerpc64=	Does not build: c++: Internal error: Killed (program cc1plus)

USE_GITHUB=	yes
GH_ACCOUNT=	POV-Ray

OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
OPTIONS_DEFAULT=PNG JPEG
OPTIONS_SUB=	yes

EXAMPLES_DESC=	Install example scenes
DOCS_DESC=	Install HTML documentation

USES=		gmake autoreconf:build
GNU_CONFIGURE=	yes

VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}

CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
.endif

MAN1=		${PORTNAME}${PKGNAMESUFFIX}.1

DOC_FILES=	AUTHORS ChangeLog NEWS
PORTDOCS=	*
PORTEXAMPLES=	*

post-patch:
	${REINPLACE_CMD} -e 's|@@EXAMPLESDIR@@|${EXAMPLESDIR}|' \
		-e 's|@@ETCDIR@@|${ETCDIR}|' \
		${WRKSRC}/unix/povray.conf

pre-configure:
	cd ${WRKSRC}/unix && ./prebuild.sh
	${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \
		${XARGS} ${GREP} -l shared_ptr | ${SED} '/shellout/d' | \
		${XARGS} ${REINPLACE_CMD} -e 's|shared_ptr|boost::shared_ptr|g'

pre-build:
.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
#	graphics/tiff adds dependencies on libjpeg, libjbig and liblzma
	@${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig -llzma\2,' ${WRKSRC}/unix/Makefile
.endif

post-install:
	${MV} ${STAGEDIR}${DATADIR}/scenes ${STAGEDIR}${EXAMPLESDIR}
.for i in povray.conf povray.ini
	${MV} ${STAGEDIR}${ETCDIR}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}
	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${ETCDIR}
.for i in include ini scripts
	${MKDIR} ${STAGEDIR}${DATADIR}/$i
	cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/$i
.endfor
.if ${PORT_OPTIONS:MX11}
	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
	cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/graphics/povray37/distinfo (-2 / +3 lines)
1	SHA256 (povray37/povray-3.7.0.RC6.tar.gz) = 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3	1	TIMESTAMP = 1514211248
2	SIZE (povray37/povray-3.7.0.RC6.tar.gz) = 13298421	2	SHA256 (povray37/POV-Ray-povray-v3.7.0.5_GH0.tar.gz) = ade4d12ea8b7fe9188e78cf43b0b70608853ed4b511e285971675ef6a4fd9b0e
		3	SIZE (povray37/POV-Ray-povray-v3.7.0.5_GH0.tar.gz) = 52882805




--- 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).




--- source/base/image/image.cpp.orig	2012-06-19 02:57:32.000000000 +0200
+++ source/base/image/image.cpp	2012-09-22 23:19:44.000000000 +0200
@@ -2884,7 +2884,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.");
@@ -3055,7 +3055,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))
@@ -3078,7 +3078,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.");




--- unix/povray.conf
+++ unix/povray.conf
@@ -89,8 +89,8 @@
 [Permitted Paths]
 ;read = "/this/directory/contains space caracters"
 read* = %INSTALLDIR%/include
-read* = %INSTALLDIR%/scenes
-read* = %INSTALLDIR%/../../etc
+read* = @@EXAMPLESDIR@@
+read* = @@ETCDIR@@
 read* = %HOME%
 read+write* = /tmp
 read+write  = .




--- vfe/unix/syspovconfig.h
+++ vfe/unix/syspovconfig.h
@@ -162,7 +162,8 @@
     #include <sys/param.h>
     #if defined(BSD)
         // BSD-style Unix detected.
-        #error BSD-style Unix detected, but not explicitly supported yet; proceed at your own risk.
+        #include <sys/wait.h> // for WEXITSTATUS
+        #define lseek64(handle,offset,whence) lseek(handle,offset,whence)
     #else
         // Not officially supported yet; comment-out the following line to try with default POSIX settings.
         #error Unix detected, but flavor not identified; proceed at your own risk.

Removed Link Here

(-)a/graphics/povray37/files/patch-vfe_unix_vfeplatform.cpp (-10 lines)
1	--- vfe/unix/vfeplatform.cpp.orig 2011-01-02 14:43:05.000000000 +0100
2	+++ vfe/unix/vfeplatform.cpp 2011-03-08 12:57:50.000000000 +0100
3	@@ -97,6 +97,7 @@
4	#include <pthread.h>
5	#include <stdlib.h>
6	#include <string.h>
7	+#include <sys/wait.h>
8
9	#ifdef HAVE_TIME_H
10	# include <time.h>




--- vfe/vfe.cpp.orig	2012-06-19 11:29:39.000000000 -0500
+++ vfe/vfe.cpp
@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError
 //
 ////////////////////////////////////////////////////////////////////////////////////////
 
-VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) :
+VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) :
   m_Session(&session), m_PlatformBase(session), renderFrontend (ctx)
 {
   backendAddress = addr ;
@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object
 
     if (m_Session->OutputToFileSet())
     {
-      imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts));
+      imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts));
       UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0);
       options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str());
 
@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object
     opts.Set(kPOVAttrib_Declare, declares);
     imageProcessing.reset();
     if (m_Session->OutputToFileSet())
-      imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
-    animationProcessing = shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
+      imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
+    animationProcessing = boost::shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
     options = animationProcessing->GetFrameRenderOptions () ;
   }
 
@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process()
           }
 
           // now we display the render window, if enabled
-          shared_ptr<Display> display(GetDisplay());
+          boost::shared_ptr<Display> display(GetDisplay());
           if (display != NULL)
           {
             vfeDisplay *disp = dynamic_cast<vfeDisplay *>(display.get());




--- vfe/vfe.h.orig	2012-06-19 11:29:39.000000000 -0500
+++ vfe/vfe.h
@@ -267,7 +267,7 @@ namespace vfe
   class VirtualFrontEnd
   {
     public:
-      VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) ;
+      VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) ;
       virtual ~VirtualFrontEnd() ;
 
       virtual bool Start(POVMS_Object& opts) ;
@@ -298,9 +298,9 @@ namespace vfe
       POVMS_Object options;
       RenderFrontendBase::SceneId sceneId;
       RenderFrontendBase::ViewId viewId;
-      shared_ptr<AnimationProcessing> animationProcessing ;
-      shared_ptr<ImageProcessing> imageProcessing ;
-      shared_ptr<ShelloutProcessing> shelloutProcessing;
+      boost::shared_ptr<AnimationProcessing> animationProcessing ;
+      boost::shared_ptr<ImageProcessing> imageProcessing ;
+      boost::shared_ptr<ShelloutProcessing> shelloutProcessing;
       Console **consoleResult;
       Display **displayResult;
       vfeSession* m_Session;




--- vfe/vfesession.cpp.orig	2014-04-21 07:36:50.000000000 -0500
+++ vfe/vfesession.cpp
@@ -602,7 +602,7 @@ const char *vfeSession::GetBackendStateN
 boost::shared_ptr<Display> vfeSession::GetDisplay() const
 {
   if (m_Frontend == NULL)
-    return (shared_ptr<Display>());
+    return (boost::shared_ptr<Display>());
   return m_Frontend->GetDisplay();
 }
 
@@ -640,7 +640,7 @@ void vfeSession::WorkerThread()
   m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast<void **>(&pov::RenderThreadAddr)) ;
   POVMS_Output_Context = pov::POVMS_GUI_Context ;
 
-  m_Console = shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
+  m_Console = boost::shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
 
   POVMS_Object obj ;
   m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ;

Removed Link Here

(-)a/graphics/povray37/files/patch-vfe_vfesession.h (-11 lines)
1	--- vfe/vfesession.h.orig 2012-06-19 11:29:40.000000000 -0500
2	+++ vfe/vfesession.h
3	@@ -1294,7 +1294,7 @@ namespace vfe
4
5	static bool m_Initialized;
6	static vfeSession *m_CurrentSessionTemporaryHack;
7	- shared_ptr<Console> m_Console;
8	+ boost::shared_ptr<Console> m_Console;
9
10	virtual vfeDisplay DefaultDisplayCreator (unsigned int width, unsigned int height, GammaCurvePtr gamma, vfeSession session, bool visible);
11	DisplayCreator m_DisplayCreator;




bin/povray37
man/man1/povray37.1.gz
@sample %%ETCDIR%%/povray.conf.sample
@sample %%ETCDIR%%/povray.ini.sample
%%X11%%%%DATADIR%%/icons/file_inc_classic_16.png
%%X11%%%%DATADIR%%/icons/file_inc_classic_32.png
%%X11%%%%DATADIR%%/icons/file_inc_classic_48.png

%%X11%%%%DATADIR%%/icons/povray_32.png
%%X11%%%%DATADIR%%/icons/povray_48.png
%%X11%%%%DATADIR%%/icons/povray_64.png
%%DATADIR%%/include/Mount1.png
%%DATADIR%%/include/Mount2.png
%%DATADIR%%/include/arrays.inc
%%DATADIR%%/include/ash.map
%%DATADIR%%/include/benediti.map

%%DATADIR%%/include/golds.inc
%%DATADIR%%/include/ior.inc
%%DATADIR%%/include/logo.inc
%%DATADIR%%/include/makegrass.inc
%%DATADIR%%/include/marbteal.map
%%DATADIR%%/include/math.inc
%%DATADIR%%/include/meshmaker.inc
%%DATADIR%%/include/metals.inc
%%DATADIR%%/include/mtmand.pot
%%DATADIR%%/include/mtmandj.png

%%DATADIR%%/include/screen.inc
%%DATADIR%%/include/shapes.inc
%%DATADIR%%/include/shapes2.inc
%%DATADIR%%/include/shapes3.inc
%%DATADIR%%/include/shapes_old.inc
%%DATADIR%%/include/shapesq.inc
%%DATADIR%%/include/skies.inc

Return to bug 215473

Lines 1-10 Link Here

(-)b/graphics/povray37/Makefile (-40 / +18 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= povray	3	PORTNAME= povray
4	DISTVERSION= 3.7.0.RC6	4	DISTVERSIONPREFIX= v
5	PORTREVISION= 12	5	DISTVERSION= 3.7.0.5
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= http://www.povray.org/beta/source/
8	PKGNAMESUFFIX= 37	7	PKGNAMESUFFIX= 37
9	DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX}	8	DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX}
10		9
Lines 15-20 LIB_DEPENDS= libboost_thread.so:devel/boost-libs Link Here
15		14
16	BROKEN_powerpc64= Does not build: c++: Internal error: Killed (program cc1plus)	15	BROKEN_powerpc64= Does not build: c++: Internal error: Killed (program cc1plus)
17		16
		17	USE_GITHUB= yes
		18	GH_ACCOUNT= POV-Ray
		19
18	OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS	20	OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
19	OPTIONS_DEFAULT=PNG JPEG	21	OPTIONS_DEFAULT=PNG JPEG
20	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
Lines 22-28 IO_DESC= Without I/O restrictions (security risk) Link Here
22	EXAMPLES_DESC= Install example scenes	24	EXAMPLES_DESC= Install example scenes
23	DOCS_DESC= Install HTML documentation	25	DOCS_DESC= Install HTML documentation
24		26
25	USES= gmake	27	USES= gmake autoreconf:build
26	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
27		29
28	VERSION_BASE= ${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}	30	VERSION_BASE= ${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
Lines 101-151 CONFIGURE_ARGS+=--without-openexr Link Here
101	CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes	103	CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
102	.endif	104	.endif
103		105
104	MAN1= ${PORTNAME}${PKGNAMESUFFIX}.1
105
106	DOC_FILES= AUTHORS ChangeLog NEWS
107	PORTDOCS= *	106	PORTDOCS= *
108	PORTEXAMPLES= *	107	PORTEXAMPLES= *
109		108
110	post-patch:	109	post-patch:
111	# Fix with boost 1.52 and now boost 1.55	110	${REINPLACE_CMD} -e 's\|@@EXAMPLESDIR@@\|${EXAMPLESDIR}\|' \
112	@${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \	111	-e 's\|@@ETCDIR@@\|${ETCDIR}\|' \
113	${WRKSRC}/source/base/timer.cpp \	112	${WRKSRC}/unix/povray.conf
114	${WRKSRC}/vfe/vfepovms.cpp \	113
115	${WRKSRC}/vfe/unix/platformbase.cpp \	114	pre-configure:
116	${WRKSRC}/vfe/vfesession.cpp	115	cd ${WRKSRC}/unix && ./prebuild.sh
117	${FIND} ${WRKSRC}/source/end \( -name \.h -o -name \*.cpp \) \| \
118	${XARGS} ${GREP} -l shared_ptr \| ${SED} '/shellout/d' \| \
119	${XARGS} ${REINPLACE_CMD} -e 's\|shared_ptr\|boost::shared_ptr\|g'
120		116
121	pre-build:	117	pre-build:
122	.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}	118	.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
123	# graphics/tiff adds dependencies on libjpeg and libjbig	119	# graphics/tiff adds dependencies on libjpeg, libjbig and liblzma
124	@${REINPLACE_CMD} -e 's,^\(LIBS = .\)-ltiff\(.\),\1-ltiff -ljpeg -ljbig\2,' ${WRKSRC}/unix/Makefile	120	@${REINPLACE_CMD} -e 's,^\(LIBS = .\)-ltiff\(.\),\1-ltiff -ljpeg -ljbig -llzma\2,' ${WRKSRC}/unix/Makefile
125	.endif	121	.endif
126		122
127	do-install:	123	post-install:
128	@${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}	124	${MV} ${STAGEDIR}${DATADIR}/scenes ${STAGEDIR}${EXAMPLESDIR}
129	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${MAN1}	125	.for i in povray.conf povray.ini
130	@${MKDIR} ${STAGEDIR}${ETCDIR}	126	${MV} ${STAGEDIR}${ETCDIR}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
131	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}
132	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${ETCDIR}
133	.for i in include ini scripts
134	${MKDIR} ${STAGEDIR}${DATADIR}/$i
135	cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/$i
136	.endfor	127	.endfor
137	.if ${PORT_OPTIONS:MX11}
138	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
139	cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons
140	.endif
141	.if ${PORT_OPTIONS:MEXAMPLES}
142	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
143	cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
144	.endif
145	.if ${PORT_OPTIONS:MDOCS}
146	@${MKDIR} ${STAGEDIR}${DOCSDIR}
147	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}
148	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
149	.endif
150		128
151	.include <bsd.port.mk>	129	.include <bsd.port.mk>

Removed Link Here

(-)a/graphics/povray37/files/patch-Makefile.in (-58 lines)
1	--- Makefile.in.orig 2011-01-22 06:36:17.000000000 +0100
2	+++ Makefile.in 2011-04-15 21:25:36.000000000 +0200
3	@@ -512,16 +512,6 @@
4	cd "$(DESTDIR)$(povconfdir)" && rm -f $$files
5	install-povdocDATA: $(povdoc_DATA)
6	@$(NORMAL_INSTALL)
7	- test -z "$(povdocdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(povdocdir)"
8	- @list='$(povdoc_DATA)'; test -n "$(povdocdir)" \|\| list=; \
9	- for p in $$list; do \
10	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11	- echo "$$d$$p"; \
12	- done \| $(am__base_list) \| \
13	- while read files; do \
14	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(povdocdir)'"; \
15	- $(INSTALL_DATA) $$files "$(DESTDIR)$(povdocdir)" \|\| exit $$?; \
16	- done
17
18	uninstall-povdocDATA:
19	@$(NORMAL_UNINSTALL)
20	@@ -1018,7 +1008,7 @@
21	install-data-local:
22	cat /dev/null > $(povinstall);
23	@echo "Creating data directories..."; \
24	- list='$(top_srcdir)/icons $(top_srcdir)/include $(top_srcdir)/ini $(top_srcdir)/scenes'; \
25	+ list='$(top_srcdir)/include $(top_srcdir)/ini'; \
26	dirlist=`find $$list -type d \| sed s,$(top_srcdir)/,,`; \
27	for p in "" $$dirlist ; do \
28	$(mkdir_p) $(DESTDIR)$(povlibdir)/$$p && printf "%s\n" "$(DESTDIR)$(povlibdir)/$$p" "`cat $(povinstall)`" > $(povinstall); \
29	@@ -1028,29 +1018,6 @@
30	for f in $$filelist ; do \
31	$(INSTALL_DATA) $(top_srcdir)/$$f $(DESTDIR)$(povlibdir)/$$f && echo "$(DESTDIR)$(povlibdir)/$$f" >> $(povinstall); \
32	done
33	- @echo "Creating documentation directories..."; \
34	- dirlist=`find $(top_srcdir)/doc/ -type d \| sed s,$(top_srcdir)/doc/,,`; \
35	- for p in "" $$dirlist ; do \
36	- $(mkdir_p) $(DESTDIR)$(povdocdir)/$$p && printf "%s\n" "$(DESTDIR)$(povdocdir)/$$p" "`cat $(povinstall)`" > $(povinstall); \
37	- done
38	- @echo "Copying documentation files..."; \
39	- filelist=`find $(top_srcdir)/doc/ -type f \| sed s,$(top_srcdir)/doc/,,`; \
40	- for f in $$filelist ; do \
41	- $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
42	- done
43	- @echo "Creating user directories..."; \
44	- for p in $(povuser) $(povconfuser) ; do \
45	- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
46	- done
47	- @echo "Copying user configuration and INI files..."; \
48	- for f in povray.conf povray.ini ; do \
49	- if test -f $(povconfuser)/$$f; then \
50	- echo "Creating backup of $(povconfuser)/$$f"; \
51	- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
52	- fi; \
53	- done; \
54	- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
55	- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall)
56
57	# Remove data, config, and empty folders for 'make uninstall'.
58	# Use 'hook' instead of 'local' so as to properly remove empty folders (e.g. scripts).

Removed Link Here

(-)a/graphics/povray37/files/patch-source_base_image_image.cpp (-29 lines)
1	--- source/base/image/image.cpp.orig 2012-06-19 02:57:32.000000000 +0200
2	+++ source/base/image/image.cpp 2012-09-22 23:19:44.000000000 +0200
3	@@ -2884,7 +2884,7 @@
4	meta[0] = sizeof(pixel_type);
5	meta[1] = m_Width;
6	meta[2] = m_Height;
7	- if (lseek64(m_File, pos, SEEK_SET) != pos)
8	+ if (lseek(m_File, pos, SEEK_SET) != pos)
9	throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed at creation.");
10	if (write(m_File, &meta[0], (int) sizeof(size_type)3) != (sizeof(size_type)3))
11	throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed at creation.");
12	@@ -3055,7 +3055,7 @@
13	#endif
14	pos = block * sizeof(pixel_type) * m_Blocksize;
15	int chunk = sizeof(pixel_type) * m_Blocksize;
16	- if (lseek64(m_File, pos, SEEK_SET) != pos)
17	+ if (lseek(m_File, pos, SEEK_SET) != pos)
18	throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file read/seek failed.");
19	int bytes = read(m_File, &m_Buffer[0], chunk);
20	if (bytes != (sizeof(pixel_type) * m_Blocksize))
21	@@ -3078,7 +3078,7 @@
22
23	if (m_Dirty) {
24	pos = m_CurrentBlock * sizeof(pixel_type) * m_Blocksize;
25	- if (lseek64(m_File, pos, SEEK_SET) != pos)
26	+ if (lseek(m_File, pos, SEEK_SET) != pos)
27	throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed.");
28	if (write(m_File, &m_Buffer[0], (int) sizeof(pixel_type) * m_Blocksize) != (sizeof(pixel_type) * m_Blocksize))
29	throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed.");

Added Link Here

(-)b/graphics/povray37/files/patch-unix_povray.conf (+13 lines)
1	--- unix/povray.conf
2	+++ unix/povray.conf
3	@@ -89,8 +89,8 @@
4	[Permitted Paths]
5	;read = "/this/directory/contains space caracters"
6	read* = %INSTALLDIR%/include
7	-read* = %INSTALLDIR%/scenes
8	-read* = %INSTALLDIR%/../../etc
9	+read* = @@EXAMPLESDIR@@
10	+read* = @@ETCDIR@@
11	read* = %HOME%
12	read+write* = /tmp
13	read+write = .

Added Link Here

(-)b/graphics/povray37/files/patch-vfe_unix_syspovconfig.h (+12 lines)
1	--- vfe/unix/syspovconfig.h
2	+++ vfe/unix/syspovconfig.h
3	@@ -162,7 +162,8 @@
4	#include <sys/param.h>
5	#if defined(BSD)
6	// BSD-style Unix detected.
7	- #error BSD-style Unix detected, but not explicitly supported yet; proceed at your own risk.
8	+ #include <sys/wait.h> // for WEXITSTATUS
9	+ #define lseek64(handle,offset,whence) lseek(handle,offset,whence)
10	#else
11	// Not officially supported yet; comment-out the following line to try with default POSIX settings.
12	#error Unix detected, but flavor not identified; proceed at your own risk.

Removed Link Here

(-)a/graphics/povray37/files/patch-vfe_vfe.cpp (-40 lines)
1	--- vfe/vfe.cpp.orig 2012-06-19 11:29:39.000000000 -0500
2	+++ vfe/vfe.cpp
3	@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError
4	//
5	////////////////////////////////////////////////////////////////////////////////////////
6
7	-VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) :
8	+VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) :
9	m_Session(&session), m_PlatformBase(session), renderFrontend (ctx)
10	{
11	backendAddress = addr ;
12	@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object
13
14	if (m_Session->OutputToFileSet())
15	{
16	- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts));
17	+ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts));
18	UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0);
19	options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str());
20
21	@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object
22	opts.Set(kPOVAttrib_Declare, declares);
23	imageProcessing.reset();
24	if (m_Session->OutputToFileSet())
25	- imageProcessing = shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
26	- animationProcessing = shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
27	+ imageProcessing = boost::shared_ptr<ImageProcessing> (new ImageProcessing (opts)) ;
28	+ animationProcessing = boost::shared_ptr<AnimationProcessing> (new AnimationProcessing (opts)) ;
29	options = animationProcessing->GetFrameRenderOptions () ;
30	}
31
32	@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process()
33	}
34
35	// now we display the render window, if enabled
36	- shared_ptr<Display> display(GetDisplay());
37	+ boost::shared_ptr<Display> display(GetDisplay());
38	if (display != NULL)
39	{
40	vfeDisplay disp = dynamic_cast<vfeDisplay >(display.get());

Removed Link Here

(-)a/graphics/povray37/files/patch-vfe_vfe.h (-24 lines)
1	--- vfe/vfe.h.orig 2012-06-19 11:29:39.000000000 -0500
2	+++ vfe/vfe.h
3	@@ -267,7 +267,7 @@ namespace vfe
4	class VirtualFrontEnd
5	{
6	public:
7	- VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr<Console>& console) ;
8	+ VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr<Console>& console) ;
9	virtual ~VirtualFrontEnd() ;
10
11	virtual bool Start(POVMS_Object& opts) ;
12	@@ -298,9 +298,9 @@ namespace vfe
13	POVMS_Object options;
14	RenderFrontendBase::SceneId sceneId;
15	RenderFrontendBase::ViewId viewId;
16	- shared_ptr<AnimationProcessing> animationProcessing ;
17	- shared_ptr<ImageProcessing> imageProcessing ;
18	- shared_ptr<ShelloutProcessing> shelloutProcessing;
19	+ boost::shared_ptr<AnimationProcessing> animationProcessing ;
20	+ boost::shared_ptr<ImageProcessing> imageProcessing ;
21	+ boost::shared_ptr<ShelloutProcessing> shelloutProcessing;
22	Console **consoleResult;
23	Display **displayResult;
24	vfeSession* m_Session;

Removed Link Here

(-)a/graphics/povray37/files/patch-vfe_vfesession.cpp (-20 lines)
1	--- vfe/vfesession.cpp.orig 2014-04-21 07:36:50.000000000 -0500
2	+++ vfe/vfesession.cpp
3	@@ -602,7 +602,7 @@ const char *vfeSession::GetBackendStateN
4	boost::shared_ptr<Display> vfeSession::GetDisplay() const
5	{
6	if (m_Frontend == NULL)
7	- return (shared_ptr<Display>());
8	+ return (boost::shared_ptr<Display>());
9	return m_Frontend->GetDisplay();
10	}
11
12	@@ -640,7 +640,7 @@ void vfeSession::WorkerThread()
13	m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast<void **>(&pov::RenderThreadAddr)) ;
14	POVMS_Output_Context = pov::POVMS_GUI_Context ;
15
16	- m_Console = shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
17	+ m_Console = boost::shared_ptr<vfeConsole> (new vfeConsole(this, m_ConsoleWidth)) ;
18
19	POVMS_Object obj ;
20	m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ;

Lines 1-7 Link Here

(-)b/graphics/povray37/pkg-plist (-3 / +7 lines)
1	bin/povray37	1	bin/povray37
2	man/man1/povray37.1.gz	2	man/man1/povray37.1.gz
3	%%ETCDIR%%/povray.conf	3	@sample %%ETCDIR%%/povray.conf.sample
4	%%ETCDIR%%/povray.ini	4	@sample %%ETCDIR%%/povray.ini.sample
5	%%X11%%%%DATADIR%%/icons/file_inc_classic_16.png	5	%%X11%%%%DATADIR%%/icons/file_inc_classic_16.png
6	%%X11%%%%DATADIR%%/icons/file_inc_classic_32.png	6	%%X11%%%%DATADIR%%/icons/file_inc_classic_32.png
7	%%X11%%%%DATADIR%%/icons/file_inc_classic_48.png	7	%%X11%%%%DATADIR%%/icons/file_inc_classic_48.png
Lines 30-36 man/man1/povray37.1.gz Link Here
30	%%X11%%%%DATADIR%%/icons/povray_32.png	30	%%X11%%%%DATADIR%%/icons/povray_32.png
31	%%X11%%%%DATADIR%%/icons/povray_48.png	31	%%X11%%%%DATADIR%%/icons/povray_48.png
32	%%X11%%%%DATADIR%%/icons/povray_64.png	32	%%X11%%%%DATADIR%%/icons/povray_64.png
33	%%DATADIR%%/include/.directory	33	%%DATADIR%%/include/Mount1.png
		34	%%DATADIR%%/include/Mount2.png
34	%%DATADIR%%/include/arrays.inc	35	%%DATADIR%%/include/arrays.inc
35	%%DATADIR%%/include/ash.map	36	%%DATADIR%%/include/ash.map
36	%%DATADIR%%/include/benediti.map	37	%%DATADIR%%/include/benediti.map
Lines 51-58 man/man1/povray37.1.gz Link Here
51	%%DATADIR%%/include/golds.inc	52	%%DATADIR%%/include/golds.inc
52	%%DATADIR%%/include/ior.inc	53	%%DATADIR%%/include/ior.inc
53	%%DATADIR%%/include/logo.inc	54	%%DATADIR%%/include/logo.inc
		55	%%DATADIR%%/include/makegrass.inc
54	%%DATADIR%%/include/marbteal.map	56	%%DATADIR%%/include/marbteal.map
55	%%DATADIR%%/include/math.inc	57	%%DATADIR%%/include/math.inc
		58	%%DATADIR%%/include/meshmaker.inc
56	%%DATADIR%%/include/metals.inc	59	%%DATADIR%%/include/metals.inc
57	%%DATADIR%%/include/mtmand.pot	60	%%DATADIR%%/include/mtmand.pot
58	%%DATADIR%%/include/mtmandj.png	61	%%DATADIR%%/include/mtmandj.png
Lines 68-73 man/man1/povray37.1.gz Link Here
68	%%DATADIR%%/include/screen.inc	71	%%DATADIR%%/include/screen.inc
69	%%DATADIR%%/include/shapes.inc	72	%%DATADIR%%/include/shapes.inc
70	%%DATADIR%%/include/shapes2.inc	73	%%DATADIR%%/include/shapes2.inc
		74	%%DATADIR%%/include/shapes3.inc
71	%%DATADIR%%/include/shapes_old.inc	75	%%DATADIR%%/include/shapes_old.inc
72	%%DATADIR%%/include/shapesq.inc	76	%%DATADIR%%/include/shapesq.inc
73	%%DATADIR%%/include/skies.inc	77	%%DATADIR%%/include/skies.inc