Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/aqsis/Makefile,v retrieving revision 1.29 diff -u -u -r1.29 Makefile --- Makefile 21 Feb 2008 21:19:58 -0000 1.29 +++ Makefile 21 Aug 2008 13:53:43 -0000 @@ -7,42 +7,43 @@ # PORTNAME= aqsis -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gahr@FreeBSD.org COMMENT= A photorealistic rendering system -BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \ - bjam:${PORTSDIR}/devel/boost \ +BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost \ bison:${PORTSDIR}/devel/bison \ - xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + fltk-threads>=0:${PORTSDIR}/x11-toolkits/fltk-threads +LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ tiff.4:${PORTSDIR}/graphics/tiff -USE_LDCONFIG= yes - -SCONS_FLAGS= boost_include_path='${LOCALBASE}/include' \ - install_prefix='${PREFIX}' +LDFLAGS+= -L${LOCALBASE}/lib +CMAKE_ARGS= -DAQSIS_BOOST_FILESYSTEM_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_filesystem.so \ + -DAQSIS_BOOST_REGEX_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_regex.so \ + -DAQSIS_BOOST_THREAD_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_thread.so \ + -DAQSIS_BOOST_WAVE_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_wave.so \ + -DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME:STRING=boost_filesystem \ + -DAQSIS_BOOST_REGEX_LIBRARY_NAME:STRING=boost_regex \ + -DAQSIS_BOOST_THREAD_LIBRARY_NAME:STRING=boost_thread \ + -DAQSIS_BOOST_WAVE_LIBRARY_NAME:STRING=boost_wave \ + -DAQSIS_FLTK_INCLUDE_DIR:PATH=${LOCALBASE}/include \ + -DAQSIS_FLTK_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libfltk.so \ + -DAQSIS_FLTK_LIBRARIES_DIR:PATH=${LOCALBSAE}/lib -post-patch: - ${REINPLACE_CMD} \ - -e 's|/usr/lib|${LOCALBASE}/lib|g' \ - -e 's|/usr/include|${LOCALBASE}/include|g' \ - -e 's|dl|c|g' \ - ${WRKSRC}/platform/default/SConscript - ${REINPLACE_CMD} \ - -e 's|/usr/bin/bison|${LOCALBASE}/bin/bison|g' \ - ${WRKSRC}/platform/default/Options.py - -do-build: - cd ${WRKSRC} && scons ${SCONS_FLAGS} build +USE_LDCONFIG= yes +USE_CMAKE= yes -do-install: - cd ${WRKSRC} && scons ${SCONS_FLAGS} install +post-configure: + ${FIND} ${WRKSRC} -name "build.make" -o -name "link.txt" -o -name "relink.txt" \ + | ${XARGS} ${REINPLACE_CMD} -i "" -e 's|-ldl||g' + ${REINPLACE_CMD} -e 's|-lz|-lz ${PTHREAD_LIBS}|' \ + ${WRKSRC}/renderer/aqsis/CMakeFiles/aqsis.dir/link.txt \ + ${WRKSRC}/texturing/teqser/CMakeFiles/teqser.dir/link.txt + ${REINPLACE_CMD} -e 's|-O2|-O2 ${PTHREAD_LIBS}|' \ + ${WRKSRC}/shadercompiler/aqsltell/CMakeFiles/aqsltell.dir/link.txt .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/aqsis/distinfo,v retrieving revision 1.9 diff -u -u -r1.9 distinfo --- distinfo 14 Dec 2007 19:08:25 -0000 1.9 +++ distinfo 20 Aug 2008 22:41:38 -0000 @@ -1,3 +1,3 @@ -MD5 (aqsis-1.2.0.tar.gz) = ae9bb1c4b22e396fd7ce84ee3e13cb86 -SHA256 (aqsis-1.2.0.tar.gz) = 1c34522620dbedef1a1cd3fce73a409179addf4afc5d8da80b32e6e5fd2e6317 -SIZE (aqsis-1.2.0.tar.gz) = 1013399 +MD5 (aqsis-1.4.0.tar.gz) = 1bb0d2a4d4b596c430efc14e3845cc0d +SHA256 (aqsis-1.4.0.tar.gz) = f631e2fb1a4c7ba6d80f39e19feb5fca52418bf8e3a33655d55db61f0619fba6 +SIZE (aqsis-1.4.0.tar.gz) = 2586658 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/aqsis/pkg-plist,v retrieving revision 1.8 diff -u -u -r1.8 pkg-plist --- pkg-plist 14 Dec 2007 19:08:25 -0000 1.8 +++ pkg-plist 21 Aug 2008 12:50:32 -0000 @@ -1,24 +1,47 @@ bin/aqsis bin/aqsl bin/aqsltell +bin/eqsl bin/miqser +bin/piqsl bin/teqser etc/aqsis/aqsisrc include/aqsis/aqsis.h +include/aqsis/aqsis_compiler.h include/aqsis/aqsis_types.h +include/aqsis/aqsismath.h include/aqsis/bitvector.h +include/aqsis/cellnoise.h include/aqsis/color.h include/aqsis/exception.h +include/aqsis/execute.h include/aqsis/file.h include/aqsis/list.h +include/aqsis/logging.h +include/aqsis/logging_streambufs.h +include/aqsis/lowdiscrep.h include/aqsis/matrix.h +include/aqsis/matrix2d.h +include/aqsis/memorysentry.h +include/aqsis/multitimer.h +include/aqsis/multitimer_system.h include/aqsis/ndspy.h +include/aqsis/noise.h +include/aqsis/noise1234.h +include/aqsis/plugins.h +include/aqsis/pool.h include/aqsis/random.h include/aqsis/refcount.h include/aqsis/ri.h include/aqsis/ri.inl +include/aqsis/ri_types.h +include/aqsis/riparamlist.h include/aqsis/shadeop.h include/aqsis/slx.h +include/aqsis/smartptr.h +include/aqsis/socket.h +include/aqsis/socket_system.h +include/aqsis/spline.h include/aqsis/sstring.h include/aqsis/vector2d.h include/aqsis/vector3d.h @@ -27,85 +50,179 @@ lib/aqsis/libd_exr.so lib/aqsis/libd_xpm.so lib/aqsis/libdisplay.so -lib/aqsis/plugins/libbake2tif.so -lib/aqsis/plugins/libbmp2tif.so -lib/aqsis/plugins/libdbo_plane.so -lib/aqsis/plugins/libexr2tif.so -lib/aqsis/plugins/libgif2tif.so -lib/aqsis/plugins/libjpg2tif.so -lib/aqsis/plugins/libpcx2tif.so -lib/aqsis/plugins/libpng2tif.so -lib/aqsis/plugins/libppm2tif.so -lib/aqsis/plugins/libtga2tif.so -lib/libaqsis.so.1.2 +lib/aqsis/libpiqsldisplay.so lib/libaqsis.so lib/libaqsis.so.1 -lib/libaqsistypes.so.1.2 +lib/libaqsis.so.1.4 +lib/libaqsisargparse.so +lib/libaqsisargparse.so.1 +lib/libaqsisargparse.so.1.4 +lib/libaqsistex.so +lib/libaqsistex.so.1 +lib/libaqsistex.so.1.4 lib/libaqsistypes.so lib/libaqsistypes.so.1 -lib/libri2rib.so.1.2 +lib/libaqsistypes.so.1.4 lib/libri2rib.so lib/libri2rib.so.1 -lib/libshadervm.so.1.2 +lib/libri2rib.so.1.4 lib/libshadervm.so lib/libshadervm.so.1 -lib/libslxargs.so.1.2 +lib/libshadervm.so.1.4 lib/libslxargs.so lib/libslxargs.so.1 -share/aqsis/shaders/ambientlight.sl -share/aqsis/shaders/ambientlight.slx -share/aqsis/shaders/background.sl -share/aqsis/shaders/background.slx -share/aqsis/shaders/bumpy.sl -share/aqsis/shaders/bumpy.slx -share/aqsis/shaders/constant.sl -share/aqsis/shaders/constant.slx -share/aqsis/shaders/depthcue.sl -share/aqsis/shaders/depthcue.slx -share/aqsis/shaders/distantlight.sl -share/aqsis/shaders/distantlight.slx -share/aqsis/shaders/fog.sl -share/aqsis/shaders/fog.slx -share/aqsis/shaders/matte.sl -share/aqsis/shaders/matte.slx -share/aqsis/shaders/metal.sl -share/aqsis/shaders/metal.slx -share/aqsis/shaders/paintedplastic.sl -share/aqsis/shaders/paintedplastic.slx -share/aqsis/shaders/plastic.sl -share/aqsis/shaders/plastic.slx -share/aqsis/shaders/pointlight.sl -share/aqsis/shaders/pointlight.slx -share/aqsis/shaders/shinymetal.sl -share/aqsis/shaders/shinymetal.slx -share/aqsis/shaders/spotlight.sl -share/aqsis/shaders/spotlight.slx -share/aqsis/content/ribs/features/layeredshaders/grid.tif -share/aqsis/content/ribs/features/layeredshaders/layered.rib -share/aqsis/content/ribs/features/layeredshaders/render.bat -share/aqsis/content/ribs/features/layeredshaders/render.sh -share/aqsis/content/ribs/features/layeredshaders/texmap.sl -share/aqsis/content/ribs/scenes/vase/render.bat -share/aqsis/content/ribs/scenes/vase/render.sh -share/aqsis/content/ribs/scenes/vase/vase.rib -share/aqsis/content/shaders/displacement/dented.sl -share/aqsis/content/shaders/displacement/dented.slx -share/aqsis/content/shaders/light/shadowspot.sl -share/aqsis/content/shaders/light/shadowspot.slx -share/aqsis/scripts/mpanalyse.py +lib/libslxargs.so.1.4 +share/applications/aqsis.desktop +share/applications/aqsl.desktop +share/applications/aqsltell.desktop +share/applications/eqsl.desktop +share/applications/piqsl.desktop +share/mime/packages/aqsis.xml +share/pixmaps/aqsis-doc.png +share/pixmaps/aqsis.png +%%DATADIR%%/scripts/aqsis.sh +%%DATADIR%%/scripts/aqsl.sh +%%DATADIR%%/scripts/aqsltell.sh +%%DATADIR%%/scripts/mpanalyse.py +%%DATADIR%%/shaders/matte.sl +%%DATADIR%%/shaders/ambientlight.sl +%%DATADIR%%/shaders/background.sl +%%DATADIR%%/shaders/metal.sl +%%DATADIR%%/shaders/pointlight.sl +%%DATADIR%%/shaders/bumpy.sl +%%DATADIR%%/shaders/distantlight.sl +%%DATADIR%%/shaders/spotlight.sl +%%DATADIR%%/shaders/paintedplastic.sl +%%DATADIR%%/shaders/plastic.sl +%%DATADIR%%/shaders/shinymetal.sl +%%DATADIR%%/shaders/fog.sl +%%DATADIR%%/shaders/constant.sl +%%DATADIR%%/shaders/depthcue.sl +%%DATADIR%%/shaders/matte.slx +%%DATADIR%%/shaders/ambientlight.slx +%%DATADIR%%/shaders/background.slx +%%DATADIR%%/shaders/metal.slx +%%DATADIR%%/shaders/pointlight.slx +%%DATADIR%%/shaders/bumpy.slx +%%DATADIR%%/shaders/distantlight.slx +%%DATADIR%%/shaders/fog.slx +%%DATADIR%%/shaders/spotlight.slx +%%DATADIR%%/shaders/paintedplastic.slx +%%DATADIR%%/shaders/plastic.slx +%%DATADIR%%/shaders/shinymetal.slx +%%DATADIR%%/shaders/constant.slx +%%DATADIR%%/shaders/depthcue.slx +%%DATADIR%%/content/ribs/features/bake/bakesphere.rib +%%DATADIR%%/content/ribs/features/bake/render.sh +%%DATADIR%%/content/ribs/features/bake/sphere.rib +%%DATADIR%%/content/ribs/features/curves/render.sh +%%DATADIR%%/content/ribs/features/curves/bezier.rib +%%DATADIR%%/content/ribs/features/objectinstance/singlepolygon.rib +%%DATADIR%%/content/ribs/features/objectinstance/render.sh +%%DATADIR%%/content/ribs/features/motionblur/camera.rib +%%DATADIR%%/content/ribs/features/motionblur/render_deformation.sh +%%DATADIR%%/content/ribs/features/motionblur/render_camera.sh +%%DATADIR%%/content/ribs/features/motionblur/deformation.rib +%%DATADIR%%/content/ribs/features/shadows/autoshadow.rib +%%DATADIR%%/content/ribs/features/shadows/render_autoshadow.sh +%%DATADIR%%/content/ribs/features/shadows/softshadow.rib +%%DATADIR%%/content/ribs/features/shadows/render_softshadow.sh +%%DATADIR%%/content/ribs/features/levelofdetail/render.sh +%%DATADIR%%/content/ribs/features/levelofdetail/detail.rib +%%DATADIR%%/content/ribs/features/layeredshaders/grid.tif +%%DATADIR%%/content/ribs/features/layeredshaders/render.sh +%%DATADIR%%/content/ribs/features/layeredshaders/texmap.sl +%%DATADIR%%/content/ribs/features/layeredshaders/layered.rib +%%DATADIR%%/content/ribs/features/subdivision/render.sh +%%DATADIR%%/content/ribs/features/subdivision/creases.rib +%%DATADIR%%/content/ribs/features/occlusion/simple.rib +%%DATADIR%%/content/ribs/features/occlusion/occlmap.py +%%DATADIR%%/content/ribs/features/occlusion/render.sh +%%DATADIR%%/content/ribs/features/occlusion/occlmap.rib +%%DATADIR%%/content/ribs/features/occlusion/envlight.sl +%%DATADIR%%/content/ribs/features/occlusion/world.rib +%%DATADIR%%/content/ribs/features/textures/grid.tif +%%DATADIR%%/content/ribs/features/textures/render.sh +%%DATADIR%%/content/ribs/features/textures/sticky.rib +%%DATADIR%%/content/ribs/features/multipass/myval.sl +%%DATADIR%%/content/ribs/features/multipass/render.sh +%%DATADIR%%/content/ribs/features/multipass/aov.rib +%%DATADIR%%/content/ribs/features/solidmodeling/csg.rib +%%DATADIR%%/content/ribs/features/solidmodeling/render.sh +%%DATADIR%%/content/ribs/scenes/fisheye/README.txt +%%DATADIR%%/content/ribs/scenes/fisheye/fisheye_projection.sl +%%DATADIR%%/content/ribs/scenes/fisheye/lights.rib +%%DATADIR%%/content/ribs/scenes/fisheye/scene.rib +%%DATADIR%%/content/ribs/scenes/fisheye/render.sh +%%DATADIR%%/content/ribs/scenes/fisheye/envmap.rib +%%DATADIR%%/content/ribs/scenes/fisheye/fisheye.rib +%%DATADIR%%/content/ribs/scenes/fisheye/world.rib +%%DATADIR%%/content/ribs/scenes/vase/vase.rib +%%DATADIR%%/content/ribs/scenes/vase/render.sh +%%DATADIR%%/content/ribs/scenes/microbe/microbe.rib +%%DATADIR%%/content/ribs/scenes/microbe/render.sh +%%DATADIR%%/content/shaders/displacement/AqDMap.sl +%%DATADIR%%/content/shaders/displacement/borg_metal.sl +%%DATADIR%%/content/shaders/displacement/micro_bumps.sl +%%DATADIR%%/content/shaders/displacement/wavy.sl +%%DATADIR%%/content/shaders/displacement/dented.sl +%%DATADIR%%/content/shaders/include/patterns.sl +%%DATADIR%%/content/shaders/surface/SpaceTest.sl +%%DATADIR%%/content/shaders/surface/show_st.sl +%%DATADIR%%/content/shaders/surface/expensive.sl +%%DATADIR%%/content/shaders/surface/curvetube.sl +%%DATADIR%%/content/shaders/surface/pinkGranite.sl +%%DATADIR%%/content/shaders/surface/debug.sl +%%DATADIR%%/content/shaders/surface/cddiffract.h +%%DATADIR%%/content/shaders/surface/randgrid.sl +%%DATADIR%%/content/shaders/surface/show_N.sl +%%DATADIR%%/content/shaders/surface/uvtest.sl +%%DATADIR%%/content/shaders/surface/AqSMap.sl +%%DATADIR%%/content/shaders/surface/microscope.sl +%%DATADIR%%/content/shaders/surface/sticky_texture.sl +%%DATADIR%%/content/shaders/surface/DPProctext.h +%%DATADIR%%/content/shaders/surface/showuser.sl +%%DATADIR%%/content/shaders/surface/cellnoisetest.sl +%%DATADIR%%/content/shaders/surface/cd.sl +%%DATADIR%%/content/shaders/surface/face_plastic.sl +%%DATADIR%%/content/shaders/surface/DPBlueMarble.sl +%%DATADIR%%/content/shaders/light/shadowpoint.sl +%%DATADIR%%/content/shaders/light/shadowdistant.sl +%%DATADIR%%/content/shaders/light/shadowspot.sl +%%DATADIR%%/content/shaders/imager/fakesky.sl +%%DATADIR%%/content/shaders/imager/filmgrain.sl +%%DATADIR%%/content/shaders/imager/bluescreen.sl +%%DATADIR%%/content/shaders/imager/exposure.sl +%%DATADIR%%/content/shaders/imager/gradient.sl +%%DATADIR%%/content/shaders/imager/iramp.sl @dirrm etc/aqsis @dirrm include/aqsis -@dirrm lib/aqsis/plugins @dirrm lib/aqsis -@dirrm share/aqsis/content/ribs/features/layeredshaders -@dirrm share/aqsis/content/ribs/features -@dirrm share/aqsis/content/ribs/scenes/vase -@dirrm share/aqsis/content/ribs/scenes -@dirrm share/aqsis/content/ribs -@dirrm share/aqsis/content/shaders/displacement -@dirrm share/aqsis/content/shaders/light -@dirrm share/aqsis/content/shaders -@dirrm share/aqsis/content -@dirrm share/aqsis/shaders -@dirrm share/aqsis/scripts -@dirrm share/aqsis +@dirrm %%DATADIR%%/shaders +@dirrm %%DATADIR%%/content/shaders/surface +@dirrm %%DATADIR%%/content/shaders/light +@dirrm %%DATADIR%%/content/shaders/include +@dirrm %%DATADIR%%/content/shaders/imager +@dirrm %%DATADIR%%/content/shaders/displacement +@dirrm %%DATADIR%%/content/shaders +@dirrm %%DATADIR%%/content/ribs/scenes/vase +@dirrm %%DATADIR%%/content/ribs/scenes/microbe +@dirrm %%DATADIR%%/content/ribs/scenes/fisheye +@dirrm %%DATADIR%%/content/ribs/scenes +@dirrm %%DATADIR%%/content/ribs/features/textures +@dirrm %%DATADIR%%/content/ribs/features/subdivision +@dirrm %%DATADIR%%/content/ribs/features/solidmodeling +@dirrm %%DATADIR%%/content/ribs/features/shadows +@dirrm %%DATADIR%%/content/ribs/features/occlusion +@dirrm %%DATADIR%%/content/ribs/features/objectinstance +@dirrm %%DATADIR%%/content/ribs/features/multipass +@dirrm %%DATADIR%%/content/ribs/features/motionblur +@dirrm %%DATADIR%%/content/ribs/features/levelofdetail +@dirrm %%DATADIR%%/content/ribs/features/layeredshaders +@dirrm %%DATADIR%%/content/ribs/features/curves +@dirrm %%DATADIR%%/content/ribs/features/bake +@dirrm %%DATADIR%%/content/ribs/features +@dirrm %%DATADIR%%/content/ribs +@dirrm %%DATADIR%%/content +@dirrm %%DATADIR%%/scripts +@dirrm %%DATADIR%% Index: files/patch-CMakeLists.txt =================================================================== RCS file: files/patch-CMakeLists.txt diff -N files/patch-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-CMakeLists.txt 20 Aug 2008 23:09:42 -0000 @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2008-08-21 01:09:19.000000000 +0200 ++++ CMakeLists.txt 2008-08-21 01:09:27.000000000 +0200 +@@ -17,9 +17,6 @@ + + INCLUDE(macros) + +-INCLUDE(FirstCMakeRun) +-INCLUDE(OutOfSourceBuild) +- + # Find path to precompiled libs on windows. + INCLUDE(FindWin32Libs) + Index: files/patch-aqsistypes::plugins.cpp =================================================================== RCS file: /home/pcvs/ports/graphics/aqsis/files/patch-aqsistypes::plugins.cpp,v retrieving revision 1.1 diff -u -u -r1.1 patch-aqsistypes::plugins.cpp --- files/patch-aqsistypes::plugins.cpp 14 Dec 2007 19:08:25 -0000 1.1 +++ files/patch-aqsistypes::plugins.cpp 21 Aug 2008 12:49:14 -0000 @@ -1,6 +1,6 @@ --- aqsistypes/plugins.cpp.orig 2007-12-13 22:54:31.000000000 +0100 +++ aqsistypes/plugins.cpp 2007-12-13 22:55:24.000000000 +0100 -@@ -164,7 +164,7 @@ +@@ -170,7 +170,7 @@ LocalFree( lpMsgBuf ); #elif not defined AQSIS_SYSTEM_MACOSX