svn commit: r474071 - in head/graphics/povray37: . files
Tobias Kortkamp
tobik at FreeBSD.org
Sat Jul 7 11:00:18 UTC 2018
Author: tobik
Date: Sat Jul 7 11:00:16 2018
New Revision: 474071
URL: https://svnweb.freebsd.org/changeset/ports/474071
Log:
graphics/povray37: Update to 3.7.0.8
- Fixes build with Clang 6
- Reset maintainer after not responding for > 6 months
- While here add license and sort variables
Changes: https://github.com/POV-Ray/povray/releases/
PR: 215473
Submitted by: Andrey Zholos <aaz at q-fu.com>, Chad Jacob Milios <milios at ccsys.com>
Approved by: bkoenig at alpha-tierchen.de (maintainer timeout, > 6 months)
Added:
head/graphics/povray37/files/patch-unix_povray.conf (contents, props changed)
head/graphics/povray37/files/patch-vfe_unix_syspovconfig.h (contents, props changed)
Deleted:
head/graphics/povray37/files/patch-Makefile.in
head/graphics/povray37/files/patch-source_base_image_image.cpp
head/graphics/povray37/files/patch-vfe_unix_vfeplatform.cpp
head/graphics/povray37/files/patch-vfe_vfe.cpp
head/graphics/povray37/files/patch-vfe_vfe.h
head/graphics/povray37/files/patch-vfe_vfesession.cpp
head/graphics/povray37/files/patch-vfe_vfesession.h
Modified:
head/graphics/povray37/Makefile
head/graphics/povray37/distinfo
head/graphics/povray37/pkg-plist
Modified: head/graphics/povray37/Makefile
==============================================================================
--- head/graphics/povray37/Makefile Sat Jul 7 10:39:58 2018 (r474070)
+++ head/graphics/povray37/Makefile Sat Jul 7 11:00:16 2018 (r474071)
@@ -1,47 +1,48 @@
# $FreeBSD$
PORTNAME= povray
-DISTVERSION= 3.7.0.RC6
-PORTREVISION= 14
+DISTVERSIONPREFIX= v
+DISTVERSION= 3.7.0.8
CATEGORIES= graphics
-MASTER_SITES= http://www.povray.org/beta/source/
PKGNAMESUFFIX= 37
-DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX}
-MAINTAINER= bkoenig at alpha-tierchen.de
+MAINTAINER= ports at FreeBSD.org
COMMENT= Persistence of Vision Ray Tracer
-LIB_DEPENDS= libboost_thread.so:devel/boost-libs
+LICENSE= AGPLv3+
+LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_powerpc64= Does not build: c++: Internal error: Killed (program cc1plus)
-OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
-OPTIONS_DEFAULT=PNG JPEG
-OPTIONS_SUB= yes
-IO_DESC= Without I/O restrictions (security risk)
-EXAMPLES_DESC= Install example scenes
-DOCS_DESC= Install HTML documentation
+LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= gmake localbase
+USES= autoreconf:build gmake
+USE_GITHUB= yes
+GH_ACCOUNT= POV-Ray
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} \
+ --program-transform-name='s/povray/${PKGBASE}/' \
+ --disable-optimiz
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}
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${VERSION_BASE}
ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
+EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE}
-LIBS+= -lboost_system
+OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
+OPTIONS_DEFAULT=PNG JPEG
+OPTIONS_SUB= yes
-CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} \
- --program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \
- --disable-optimiz
+DOCS_DESC= Install HTML documentation
+EXAMPLES_DESC= Install example scenes
+IO_DESC= Without I/O restrictions (security risk)
+IO_CONFIGURE_ON= --disable-io-restrictions
+STATIC_CONFIGURE_ON= --enable-static
X11_USE= XORG=xpm,sm,ice,x11 SDL=sdl
X11_CONFIGURE_OFF= --without-x
-STATIC_CONFIGURE_ON= --enable-static
-IO_CONFIGURE_ON= --disable-io-restrictions
.include <bsd.port.options.mk>
@@ -90,49 +91,27 @@ CONFIGURE_ARGS+=--without-openexr
CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
.endif
-DOC_FILES= AUTHORS ChangeLog NEWS
PORTDOCS= *
PORTEXAMPLES= *
post-patch:
-# Fix with boost 1.52 and now boost 1.55
- @${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \
- ${WRKSRC}/source/base/timer.cpp \
- ${WRKSRC}/vfe/vfepovms.cpp \
- ${WRKSRC}/vfe/unix/platformbase.cpp \
- ${WRKSRC}/vfe/vfesession.cpp
- @${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'
+ ${REINPLACE_CMD} -e 's|@@EXAMPLESDIR@@|${EXAMPLESDIR}|' \
+ -e 's|@@ETCDIR@@|${ETCDIR}|' \
+ ${WRKSRC}/unix/povray.conf
+pre-configure:
+ cd ${WRKSRC}/unix && ./prebuild.sh
+
pre-build:
.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
-# graphics/tiff adds dependencies on libjpeg and libjbig
- @${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig\2,' ${WRKSRC}/unix/Makefile
+# 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
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1
- @${MKDIR} ${STAGEDIR}${ETCDIR}
- ${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
+post-install:
+ ${MV} ${STAGEDIR}${DATADIR}/scenes ${STAGEDIR}${EXAMPLESDIR}
+.for i in povray.conf povray.ini
+ ${MV} ${STAGEDIR}${ETCDIR}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
.endfor
-
-do-install-X11-on:
- @${MKDIR} ${STAGEDIR}${DATADIR}/icons
- cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons
-
-do-install-EXAMPLES-on:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/graphics/povray37/distinfo
==============================================================================
--- head/graphics/povray37/distinfo Sat Jul 7 10:39:58 2018 (r474070)
+++ head/graphics/povray37/distinfo Sat Jul 7 11:00:16 2018 (r474071)
@@ -1,2 +1,3 @@
-SHA256 (povray37/povray-3.7.0.RC6.tar.gz) = 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3
-SIZE (povray37/povray-3.7.0.RC6.tar.gz) = 13298421
+TIMESTAMP = 1530591958
+SHA256 (POV-Ray-povray-v3.7.0.8_GH0.tar.gz) = 53d11ebd2972fc452af168a00eb83aefb61387662c10784e81b63e44aa575de4
+SIZE (POV-Ray-povray-v3.7.0.8_GH0.tar.gz) = 52884333
Added: head/graphics/povray37/files/patch-unix_povray.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/povray37/files/patch-unix_povray.conf Sat Jul 7 11:00:16 2018 (r474071)
@@ -0,0 +1,13 @@
+--- unix/povray.conf.orig 2018-05-27 09:54:06 UTC
++++ unix/povray.conf
+@@ -89,8 +89,8 @@ forbidden
+ [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 = .
Added: head/graphics/povray37/files/patch-vfe_unix_syspovconfig.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/povray37/files/patch-vfe_unix_syspovconfig.h Sat Jul 7 11:00:16 2018 (r474071)
@@ -0,0 +1,12 @@
+--- vfe/unix/syspovconfig.h.orig 2018-05-27 09:54:06 UTC
++++ vfe/unix/syspovconfig.h
+@@ -162,7 +162,8 @@ const int NULL=0;
+ #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.
Modified: head/graphics/povray37/pkg-plist
==============================================================================
--- head/graphics/povray37/pkg-plist Sat Jul 7 10:39:58 2018 (r474070)
+++ head/graphics/povray37/pkg-plist Sat Jul 7 11:00:16 2018 (r474071)
@@ -1,7 +1,7 @@
bin/povray37
man/man1/povray37.1.gz
-%%ETCDIR%%/povray.conf
-%%ETCDIR%%/povray.ini
+ at sample %%ETCDIR%%/povray.conf.sample
+ at 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
@@ -30,7 +30,8 @@ man/man1/povray37.1.gz
%%X11%%%%DATADIR%%/icons/povray_32.png
%%X11%%%%DATADIR%%/icons/povray_48.png
%%X11%%%%DATADIR%%/icons/povray_64.png
-%%DATADIR%%/include/.directory
+%%DATADIR%%/include/Mount1.png
+%%DATADIR%%/include/Mount2.png
%%DATADIR%%/include/arrays.inc
%%DATADIR%%/include/ash.map
%%DATADIR%%/include/benediti.map
@@ -51,8 +52,10 @@ man/man1/povray37.1.gz
%%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
@@ -68,6 +71,7 @@ man/man1/povray37.1.gz
%%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
More information about the svn-ports-all
mailing list