From 31e7820a1495fd86a6381c94d20dcc5e984f958c Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 9 Oct 2006 12:25:08 +0000 Subject: - Update to 0.0.9 - Switch to scons PR: ports/104191 Submitted by: David Yeske (maintainer) --- graphics/yafaray/Makefile | 35 +++++----------------- graphics/yafaray/distinfo | 6 ++-- graphics/yafaray/files/patch-SConstruct | 13 ++++++++ graphics/yafaray/files/patch-configure | 10 ------- graphics/yafaray/files/patch-freebsd-settings.py | 32 ++++++++++++++++++++ .../yafaray/files/patch-src::yafraycore::buffer.h | 13 -------- .../files/patch-src_yafraycore_threadedscene.cc | 13 ++++++++ .../yafaray/files/patch-src_yafraycore_y_alloc.h | 24 +++++++++++++++ graphics/yafaray/pkg-plist | 4 +-- 9 files changed, 94 insertions(+), 56 deletions(-) create mode 100644 graphics/yafaray/files/patch-SConstruct delete mode 100644 graphics/yafaray/files/patch-configure create mode 100644 graphics/yafaray/files/patch-freebsd-settings.py delete mode 100644 graphics/yafaray/files/patch-src::yafraycore::buffer.h create mode 100644 graphics/yafaray/files/patch-src_yafraycore_threadedscene.cc create mode 100644 graphics/yafaray/files/patch-src_yafraycore_y_alloc.h (limited to 'graphics/yafaray') diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile index da57c94a51bc..0ec10507831e 100644 --- a/graphics/yafaray/Makefile +++ b/graphics/yafaray/Makefile @@ -5,22 +5,20 @@ # $FreeBSD$ PORTNAME= yafray -PORTVERSION= 0.0.6 +PORTVERSION= 0.0.9 CATEGORIES= graphics -MASTER_SITES= http://www.coala.uniovi.es/~jandro/noname/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-2 +MASTER_SITES= http://www.yafray.org/sec/2/downloads/ MAINTAINER= dyeske@yahoo.com COMMENT= A fast XML based raytracer LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +USE_SCONS= yes USE_GETOPT_LONG=yes -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +WRKSRC= ${WRKDIR}/${PORTNAME} .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math @@ -38,26 +36,7 @@ pre-everything:: USE_GCC=3.4+ .endif -post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | \ - ${XARGS} ${REINPLACE_CMD} -E -e \ - 's|^CXX =.+$$|CXX=${CXX}|; \ - s|-O3||; \ - s|-D_PTHREADS||; \ - s|-pthread|-lpthread|g; \ - s|-lpthread|${PTHREAD_LIBS}|g; \ - s|-ffast-math||; \ - s|-ldl||; \ - s|-Wall|${CXXFLAGS}|' - - @${FIND} ${WRKSRC} -name "configure.in" \ - -or -name "configure" | ${XARGS} \ - ${REINPLACE_CMD} -E -e \ - 's|-pthread|-lpthread|g; \ - s|-lpthread|${PTHREAD_LIBS}|g' - -#make sure we don't need to run auto**** - @${TOUCH} ${TOUCH_FLAGS} -t 199705212205.21 \ - ${WRKSRC}/configure.in +pre-patch: + @${MV} ${WRKSRC}/linux-settings.py ${WRKSRC}/freebsd-settings.py .include diff --git a/graphics/yafaray/distinfo b/graphics/yafaray/distinfo index 33937db242fc..13bae9f58068 100644 --- a/graphics/yafaray/distinfo +++ b/graphics/yafaray/distinfo @@ -1,3 +1,3 @@ -MD5 (yafray-0.0.6-2.tar.gz) = bf87b6018435f3bc5bfd1be598c1a28f -SHA256 (yafray-0.0.6-2.tar.gz) = 2bb6d8d6a77975efcf3c469ea575690fd3a35df57470d614ba63ac959b724056 -SIZE (yafray-0.0.6-2.tar.gz) = 498452 +MD5 (yafray-0.0.9.tar.gz) = 7365122e0ca6f439988f51e8b4db935c +SHA256 (yafray-0.0.9.tar.gz) = f803e7058fb65cab9c0d00599daa85ca291fb57941822d622426e3466ec0aefb +SIZE (yafray-0.0.9.tar.gz) = 316033 diff --git a/graphics/yafaray/files/patch-SConstruct b/graphics/yafaray/files/patch-SConstruct new file mode 100644 index 000000000000..844f3f07e7b3 --- /dev/null +++ b/graphics/yafaray/files/patch-SConstruct @@ -0,0 +1,13 @@ +--- SConstruct.orig Tue Jun 20 13:24:00 2006 ++++ SConstruct Thu Sep 14 01:13:55 2006 +@@ -8,6 +8,10 @@ + ficheros = { + 'darwin' : 'darwin-settings', + 'linux2' : 'linux-settings', ++'freebsd4' : 'freebsd-settings', ++'freebsd5' : 'freebsd-settings', ++'freebsd6' : 'freebsd-settings', ++'freebsd7' : 'freebsd-settings', + 'win32' : 'win32-settings', + 'sunos5' : 'sunos5-settings' + } diff --git a/graphics/yafaray/files/patch-configure b/graphics/yafaray/files/patch-configure deleted file mode 100644 index d17586d40ac4..000000000000 --- a/graphics/yafaray/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Thu Jun 12 21:31:41 2003 -+++ configure Thu Jun 12 21:32:01 2003 -@@ -7842,6 +7842,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='${SHELL} /usr/local/bin/libtool' diff --git a/graphics/yafaray/files/patch-freebsd-settings.py b/graphics/yafaray/files/patch-freebsd-settings.py new file mode 100644 index 000000000000..454943db3bb7 --- /dev/null +++ b/graphics/yafaray/files/patch-freebsd-settings.py @@ -0,0 +1,32 @@ +--- freebsd-settings.py.orig Sat Sep 23 00:21:17 2006 ++++ freebsd-settings.py Sat Sep 23 00:21:29 2006 +@@ -10,6 +10,7 @@ + global prefix + prefix = args.get('prefix','/usr/local') + ++def get_include(args): return prefix+"/usr/local/include" + def get_libpath(args): return prefix+"/lib" + def get_pluginpath(args): return prefix+"/lib/yafray" + def get_binpath(args): return prefix+"/bin" +@@ -46,9 +47,9 @@ + class jpeg(globalinfo.library): + C_ID = 'JPEG' + +- def present(args): return os.path.exists("/usr/include/jpeglib.h") +- def get_include(args): return [] +- def get_libpath(args): return [] ++ def present(args): return os.path.exists("/usr/local/include/jpeglib.h") ++ def get_include(args): return ['/usr/local/include'] ++ def get_libpath(args): return ['/usr/local/lib'] + def get_libs(args): return ['jpeg'] + + class pthread(globalinfo.library): +@@ -73,7 +74,7 @@ + def present(args): return True + def get_include(args): return [] + def get_libpath(args): return [] +- def get_libs(args): return ['dl'] ++ def get_libs(args): return [''] + + def derive_shared_env(common_env): + return common_env.Copy() diff --git a/graphics/yafaray/files/patch-src::yafraycore::buffer.h b/graphics/yafaray/files/patch-src::yafraycore::buffer.h deleted file mode 100644 index 84dd8b1e22fe..000000000000 --- a/graphics/yafaray/files/patch-src::yafraycore::buffer.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/yafraycore/buffer.h.orig Thu Sep 30 14:31:34 2004 -+++ src/yafraycore/buffer.h Thu Sep 30 14:42:42 2004 -@@ -27,7 +27,10 @@ - #include - #endif - -+#include - #include -+ -+using namespace std; - - __BEGIN_YAFRAY - diff --git a/graphics/yafaray/files/patch-src_yafraycore_threadedscene.cc b/graphics/yafaray/files/patch-src_yafraycore_threadedscene.cc new file mode 100644 index 000000000000..fa5e770f96a6 --- /dev/null +++ b/graphics/yafaray/files/patch-src_yafraycore_threadedscene.cc @@ -0,0 +1,13 @@ +--- src/yafraycore/threadedscene.cc.orig Mon Jul 4 11:01:46 2005 ++++ src/yafraycore/threadedscene.cc Sat Sep 23 00:16:35 2006 +@@ -35,6 +35,10 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + sem_t pstop; + + diff --git a/graphics/yafaray/files/patch-src_yafraycore_y_alloc.h b/graphics/yafaray/files/patch-src_yafraycore_y_alloc.h new file mode 100644 index 000000000000..e45f3b6b2172 --- /dev/null +++ b/graphics/yafaray/files/patch-src_yafraycore_y_alloc.h @@ -0,0 +1,24 @@ +--- src/yafraycore/y_alloc.h.orig Thu Jul 13 12:35:02 2006 ++++ src/yafraycore/y_alloc.h Tue Sep 19 03:33:32 2006 +@@ -5,7 +5,7 @@ + #include + #endif + +-#ifdef __APPLE__ ++#ifdef __FreeBSD__ + #include + #else + #include +@@ -26,6 +26,12 @@ + // however, malloc is supposed to return at least SSE2 compatible alignment, which has to be enough. + // alternative would be valloc, but i have no good info on its effects. + return malloc(size); ++#elif defined(__FreeBSD__) ++ void *ret; ++ if (posix_memalign(&ret, bound, size) != 0) ++ return (NULL); ++ else ++ return (ret); + #else + return memalign(bound, size); + #endif diff --git a/graphics/yafaray/pkg-plist b/graphics/yafaray/pkg-plist index 98ffffb4d933..ef2765719f2a 100644 --- a/graphics/yafaray/pkg-plist +++ b/graphics/yafaray/pkg-plist @@ -1,8 +1,6 @@ bin/yafray etc/gram.yafray -lib/libyafraycore.la lib/libyafraycore.so -lib/libyafrayplugin.la lib/libyafrayplugin.so lib/yafray/libpathlight.so lib/yafray/libsunlight.so @@ -19,5 +17,7 @@ lib/yafray/libbasicblocks.so lib/yafray/libmixblocks.so lib/yafray/libblendershader.so lib/yafray/libhdri.so +lib/yafray/libshaderback.so +lib/yafray/libsss.so lib/yafray/libsunsky.so @dirrm lib/yafray -- cgit v1.2.3