Index: head/graphics/pixie/Makefile
===================================================================
--- head/graphics/pixie/Makefile	(revision 106114)
+++ head/graphics/pixie/Makefile	(revision 106115)
@@ -1,104 +1,104 @@
 # New ports collection makefile for:	pixie
 # Date created:		29 Jan 2004
 # Whom:			Igor Pokrovsky <tiamat@comset.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pixie
 PORTVERSION=	1.3.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Pixie-src-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tiamat@comset.net
 COMMENT=	A photorealistic renderer with Pixar's RenderMan-like interface
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
 USE_AUTOCONF_VER=	213
 USE_AUTOHEADER=	yes
 USE_AUTOMAKE_VER=	14
 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" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		LIBS="${PTHREAD_LIBS} -lstdc++"
+		LIBS="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/${PORTNAME}
 WRKSRC=		${WRKDIR}/Pixie
 
 PIXIE_EXES=	precomp rndr sdrc sdrinfo show texmake
 PIXIE_SHLIBS=	file framebuffer rgbe
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|malloc\.h|stdlib\.h|g' \
 		`${FIND} -E ${WRKSRC} -iregex '.*\.(cpp|h)'`
 
 do-install:
 # exes
 .for i in ${PIXIE_EXES}
 	if [ "`${FILE} -b ${WRKSRC}/src/${i}/${i} | ${GREP} script`" ]; then \
 	  ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i} ${PREFIX}/bin; \
 	else \
 	  ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/${i} ${PREFIX}/bin; \
 	fi;
 .endfor
 
 # 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 ${PIXIE_SHLIBS}
 	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.a \
 		${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.la \
 		${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i}.so.0 \
 		${PREFIX}/lib/${PORTNAME}
 	${LN} -sf ${PREFIX}/lib/${PORTNAME}/${i}.so.0 \
 		${PREFIX}/lib/${PORTNAME}/${i}.so
 .endfor
 
 # includes
 	@${MKDIR} ${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/sdr/sdr.h ${PREFIX}/include/${PORTNAME}
 .for i in dlo dsply implicit ri shadeop
 	${INSTALL_DATA} ${WRKSRC}/src/ri/${i}.h ${PREFIX}/include/${PORTNAME}
 .endfor
 
 # shaders
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/shaders
 	${INSTALL_DATA} ${WRKSRC}/shaders/* ${DATADIR}/shaders
 
 # docs
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/figures
 	${INSTALL_DATA} ${WRKSRC}/doc/figures/*.jpg ${DOCSDIR}/figures
 .endif
 
 post-install:
 	@(${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \
 		<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE})
 
 .include <bsd.port.mk>

Property changes on: head/graphics/pixie/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/graphics/pixie/files/patch-configure.in
===================================================================
--- head/graphics/pixie/files/patch-configure.in	(revision 106114)
+++ head/graphics/pixie/files/patch-configure.in	(revision 106115)
@@ -1,39 +1,39 @@
---- configure.in.orig	Sun Mar 21 09:55:41 2004
-+++ configure.in	Fri Apr  2 13:59:41 2004
+--- configure.in.orig	Sun Mar 21 07:55:41 2004
++++ configure.in	Sun Apr  4 15:36:24 2004
 @@ -21,9 +21,9 @@
  dnl ---------------------------------------------------
  dnl Check standard libraries
  dnl
 -AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],)
 +dnl AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],)
  AC_CHECK_LIB(m, sin,,[AC_MSG_ERROR([math library is not found])],)
 -AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],)
 +dnl AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],)
  
  dnl ---------------------------------------------------
  dnl Find X
 @@ -52,9 +52,14 @@
  
  FLTK_EXTRA=
  
 +saved_LIBS="${LIBS}"
 +
 +LIBS="$LIBS -lGL"
 +
  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" FLTK_EXTRA=show])
++AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL -lstdc++" FLTK_EXTRA=show])
  
 +LIBS="${saved_LIBS}"
  
  dnl ---------------------------------------------------
  dnl Find libtiff
 @@ -62,7 +67,7 @@
  
  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}"
-

Property changes on: head/graphics/pixie/files/patch-configure.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property