aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pixie/Makefile39
-rw-r--r--graphics/pixie/distinfo4
-rw-r--r--graphics/pixie/files/patch-Makefile.am11
-rw-r--r--graphics/pixie/files/patch-configure.in25
-rw-r--r--graphics/pixie/pkg-plist37
5 files changed, 78 insertions, 38 deletions
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 3185c875ad8f..790c85927e52 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pixie
-PORTVERSION= 1.3.4
+PORTVERSION= 1.3.16
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,12 +22,9 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
-USE_AUTOMAKE_VER= 14
+WANT_AUTOMAKE_VER= 15
USE_AUTOCONF_VER= 213
-USE_AUTOHEADER_VER= 213
USE_LIBTOOL_VER= 13
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
CXXFLAGS="${CXXFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -44,14 +41,15 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502112
-BROKEN= "Does not install on FreeBSD >= 5.x"
-.endif
-
post-patch:
@${REINPLACE_CMD} -i "" -e 's|malloc\.h|stdlib\.h|g' \
`${FIND} -E ${WRKSRC} -iregex '.*\.(cpp|h)'`
+pre-configure:
+ @(cd ${WRKSRC} && ${ACLOCAL} && \
+ ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} --add-missing && \
+ ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} -i)
+
do-install:
# exes
.for i in ${PIXIE_EXES}
@@ -65,12 +63,16 @@ do-install:
# libs
# avoid conflicts by installing in separate dir
@${MKDIR} ${PREFIX}/lib/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/src/sdr/libsdr.a ${PREFIX}/lib/${PORTNAME}
-
- ${INSTALL_DATA} ${WRKSRC}/src/ri/.libs/libri.a ${PREFIX}/lib/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/src/ri/.libs/libri.la ${PREFIX}/lib/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/src/ri/.libs/libri.so.0 ${PREFIX}/lib/${PORTNAME}
- ${LN} -sf ${PREFIX}/lib/${PORTNAME}/libri.so.0 ${PREFIX}/lib/${PORTNAME}/libri.so
+.for i in sdr ri
+ ${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
+ ${PREFIX}/lib/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.la \
+ ${PREFIX}/lib/${PORTNAME}
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
+ ${PREFIX}/lib/${PORTNAME}
+ ${LN} -sf ${PREFIX}/lib/${PORTNAME}/lib${i}.so.0 \
+ ${PREFIX}/lib/${PORTNAME}/lib${i}.so
+.endfor
.for i in ${PIXIE_SHLIBS}
${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.a \
@@ -99,8 +101,11 @@ do-install:
.ifndef (NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
- @${MKDIR} ${DOCSDIR}/figures
- ${INSTALL_DATA} ${WRKSRC}/doc/figures/*.jpg ${DOCSDIR}/figures
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${DOCSDIR}
+.for i in figures rayreflect rayshadow running softshadow
+ @${MKDIR} ${DOCSDIR}/${i}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${i}/* ${DOCSDIR}/${i}
+.endfor
.endif
post-install:
diff --git a/graphics/pixie/distinfo b/graphics/pixie/distinfo
index 5a9594bd194d..03d032651c1f 100644
--- a/graphics/pixie/distinfo
+++ b/graphics/pixie/distinfo
@@ -1,2 +1,2 @@
-MD5 (Pixie-src-1.3.4.tgz) = 84931bfea9d37dc4a4d002dc6f62202f
-SIZE (Pixie-src-1.3.4.tgz) = 4272597
+MD5 (Pixie-src-1.3.16.tgz) = c82693b10c7a9c2be7bf21be03bc8434
+SIZE (Pixie-src-1.3.16.tgz) = 4949175
diff --git a/graphics/pixie/files/patch-Makefile.am b/graphics/pixie/files/patch-Makefile.am
new file mode 100644
index 000000000000..634dfae7f1a9
--- /dev/null
+++ b/graphics/pixie/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig Sun Aug 29 21:35:42 2004
++++ Makefile.am Sun Aug 29 21:37:04 2004
+@@ -2,7 +2,7 @@
+
+ topdir = $(prefix)
+
+-top_DATA = README AUTHORS LICENSE COPYING
++#top_DATA = README AUTHORS LICENSE COPYING
+
+ EXTRA_DIST = Pixie.dsw Pixie.ncb Pixie.opt DEVNOTES LICENSE makeclean.bat makeinst.bat tutorials win32inst
+
diff --git a/graphics/pixie/files/patch-configure.in b/graphics/pixie/files/patch-configure.in
index d88f8a4884de..ed2b9d16c61d 100644
--- a/graphics/pixie/files/patch-configure.in
+++ b/graphics/pixie/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig Sun Mar 21 07:55:41 2004
-+++ configure.in Sun Apr 4 15:36:24 2004
+--- configure.in.orig Fri Jul 16 00:52:52 2004
++++ configure.in Sun Aug 29 22:09:21 2004
@@ -21,9 +21,9 @@
dnl ---------------------------------------------------
dnl Check standard libraries
@@ -12,28 +12,27 @@
dnl ---------------------------------------------------
dnl Find X
-@@ -52,9 +52,14 @@
-
- FLTK_EXTRA=
+@@ -50,9 +50,13 @@
+ dnl Find FLTK
+ dnl
+saved_LIBS="${LIBS}"
+
+LIBS="$LIBS -lGL"
+
+ have_fltk=false
AC_CHECK_LIB(fltk,main,LIBFLTK="-lfltk")
--AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" FLTK_EXTRA=show])
-+AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL -lstdc++" FLTK_EXTRA=show])
-
-+LIBS="${saved_LIBS}"
+-AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" have_fltk=true])
++AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL -lstdc++" have_fltk=true])
+ AM_CONDITIONAL(BUILD_SHOW, test x$have_fltk = xtrue)
dnl ---------------------------------------------------
- dnl Find libtiff
-@@ -62,7 +67,7 @@
+@@ -61,7 +65,7 @@
- saved_LIBS="${LIBS}"
+ saved_LIBS="$LIBS"
-AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found]))
+dnl AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found]))
AC_CHECK_LIB(tiff,TIFFOpen,,[AC_MSG_ERROR([libtiff not found])],)
- TIFF_LIBS="${LIBS}"
+ TIFF_LIBS="$LIBS"
diff --git a/graphics/pixie/pkg-plist b/graphics/pixie/pkg-plist
index 311cb7ec47db..e74337577dd0 100644
--- a/graphics/pixie/pkg-plist
+++ b/graphics/pixie/pkg-plist
@@ -23,18 +23,18 @@ lib/pixie/libri.la
lib/pixie/libri.so
lib/pixie/libri.so.0
lib/pixie/libsdr.a
+lib/pixie/libsdr.la
+lib/pixie/libsdr.so
+lib/pixie/libsdr.so.0
lib/pixie/rgbe.a
lib/pixie/rgbe.la
lib/pixie/rgbe.so
lib/pixie/rgbe.so.0
-%%PORTDOCS%%%%DOCSDIR%%/arealight.htm
%%PORTDOCS%%%%DOCSDIR%%/attributes.htm
%%PORTDOCS%%%%DOCSDIR%%/autoraytracing.htm
-%%PORTDOCS%%%%DOCSDIR%%/contents.htm
%%PORTDOCS%%%%DOCSDIR%%/display.htm
-%%PORTDOCS%%%%DOCSDIR%%/documentation.htm
%%PORTDOCS%%%%DOCSDIR%%/dso.htm
-%%PORTDOCS%%%%DOCSDIR%%/extraprimitives.htm
+%%PORTDOCS%%%%DOCSDIR%%/figures/Thumbs.db
%%PORTDOCS%%%%DOCSDIR%%/figures/caustic1.jpg
%%PORTDOCS%%%%DOCSDIR%%/figures/caustic2.jpg
%%PORTDOCS%%%%DOCSDIR%%/figures/directPhoton.jpg
@@ -55,16 +55,35 @@ lib/pixie/rgbe.so.0
%%PORTDOCS%%%%DOCSDIR%%/figures/tx3g_beauty.jpg
%%PORTDOCS%%%%DOCSDIR%%/gi.htm
%%PORTDOCS%%%%DOCSDIR%%/hardshaders.htm
-%%PORTDOCS%%%%DOCSDIR%%/header.htm
%%PORTDOCS%%%%DOCSDIR%%/hiders.htm
%%PORTDOCS%%%%DOCSDIR%%/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/logo.jpg
%%PORTDOCS%%%%DOCSDIR%%/network.htm
%%PORTDOCS%%%%DOCSDIR%%/occlusionculling.htm
%%PORTDOCS%%%%DOCSDIR%%/options.htm
+%%PORTDOCS%%%%DOCSDIR%%/rayreflect/reflect.rib
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/index.html
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/logo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/shadow.rib
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/shadow1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/shadow2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/shadowShade.rib
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/tshadow1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/rayshadow/tshadow2.jpg
%%PORTDOCS%%%%DOCSDIR%%/raytracing.htm
%%PORTDOCS%%%%DOCSDIR%%/raytracingsl.htm
-%%PORTDOCS%%%%DOCSDIR%%/running.htm
+%%PORTDOCS%%%%DOCSDIR%%/running/index.html
+%%PORTDOCS%%%%DOCSDIR%%/running/logo.jpg
%%PORTDOCS%%%%DOCSDIR%%/sdrlib.htm
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/Thumbs.db
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/index.html
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/logo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/shadow.JPG
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/shadow.rib
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/shadow.tif
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/shadow2.JPG
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/tshadow.JPG
+%%PORTDOCS%%%%DOCSDIR%%/softshadow/tshadow2.JPG
%%PORTDOCS%%%%DOCSDIR%%/tips.htm
%%PORTDOCS%%%%DOCSDIR%%/tsm.htm
%%PORTDOCS%%%%DOCSDIR%%/versions.htm
@@ -96,6 +115,8 @@ lib/pixie/rgbe.so.0
%%DATADIR%%/shaders/mtorLambert.sl
%%DATADIR%%/shaders/mtorPhong.sdr
%%DATADIR%%/shaders/mtorPhong.sl
+%%DATADIR%%/shaders/normdir.sdr
+%%DATADIR%%/shaders/normdir.sl
%%DATADIR%%/shaders/paintedmatte.sdr
%%DATADIR%%/shaders/paintedmatte.sl
%%DATADIR%%/shaders/paintedplastic.sdr
@@ -122,6 +143,10 @@ lib/pixie/rgbe.so.0
%%DATADIR%%/shaders/spotlight.sl
@dirrm %%DATADIR%%/shaders
@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/softshadow
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/running
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rayshadow
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rayreflect
%%PORTDOCS%%@dirrm %%DOCSDIR%%/figures
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/pixie
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:46:07 +0000