Index: head/multimedia/jahshaka/Makefile
===================================================================
--- head/multimedia/jahshaka/Makefile	(revision 154062)
+++ head/multimedia/jahshaka/Makefile	(revision 154063)
@@ -1,102 +1,100 @@
 # New ports collection makefile for: jahshaka
 # Date created:		07 Feb 2005
 # Whom:			Igor Pokrovsky <ip@doom.homeunix.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jahshaka
 PORTVERSION=	1.9a9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}fx
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	Video and film composing, editing and special fx system
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
 		glut.4:${PORTSDIR}/graphics/libglut \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN=		"Broken with libglut 6.4.1"
-
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_X_PREFIX=	yes
 USE_QT_VER=	3
 MAKE_ENV=	QMAKESPEC=${QMAKESPEC} QTDIR=${X11BASE}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	README
 
 TCSH?=		/bin/csh
 QMAKE?=		${LOCALBASE}/bin/qmake
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 post-patch:
 	@(${FIND} ${WRKSRC} -name '*.h' -or -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -i '' \
 		-e 's|avifile-0.7|avifile|g; s|malloc\.h|stdlib\.h|g')
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/jahshakaSettings.pro
 	@${REINPLACE_CMD} -e "s|qmake|${QMAKE}|g" \
 		${WRKSRC}/configure ${WRKSRC}/plugins/configure
 	@${REINPLACE_CMD} -i '' -e "s|%%DATADIR%%|${DATADIR}|g" \
 		${WRKSRC}/jah/Source/jahshaka.cpp
 	@${REINPLACE_CMD} -i '' \
 	-e "s|JahBasePath+\"plugins/\"|\"${PREFIX}/lib/${PORTNAME}/plugins/\"|g" \
 		${WRKSRC}/jah/libraries/jahplugins/jahpluginlib.cpp
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TCSH} ./configure
 	cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} ${TCSH} ./configure
 
 post-build:
 	cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} ${MAKE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 # UI pics
 	${MKDIR} ${DATADIR}
 .for ext in bmp jpg gif png xpm
 .for dir in "" desktop desktopController interface jahplayer modules paint player
 	${MKDIR} ${DATADIR}/Pixmaps/${dir}
 	${FIND} -X ${WRKSRC}/Pixmaps/${dir} -name "*.${ext}" -depth 1 | \
 		${XARGS} -J % ${INSTALL_DATA} % ${DATADIR}/Pixmaps/${dir}
 .endfor
 .endfor
 
 # database
 	${MKDIR} ${DATADIR}/database
 	${INSTALL_DATA} ${WRKSRC}/database/* ${DATADIR}/database
 
 # fonts
 	${MKDIR} ${DATADIR}/fonts
 	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${DATADIR}/fonts
 
 # scenes
 	${MKDIR} ${DATADIR}/scenes
 	${INSTALL_DATA} ${WRKSRC}/scenes/*.jsf ${DATADIR}/scenes
 
 # media for scenes
 	${MKDIR} ${DATADIR}/media
 	${MKDIR} ${DATADIR}/media/images
 	${INSTALL_DATA} ${WRKSRC}/media/images/* ${DATADIR}/media/images
 	${MKDIR} ${DATADIR}/media/models
 	${INSTALL_DATA} ${WRKSRC}/media/models/* ${DATADIR}/media/models
 
 # plugins
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}/plugins
 	${FIND} -X ${WRKSRC}/plugins -name '*.so' | \
 	${XARGS} -J % ${INSTALL_PROGRAM} % ${PREFIX}/lib/${PORTNAME}/plugins
 
 .ifndef (NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/multimedia/jahshaka/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/multimedia/jahshaka/distinfo
===================================================================
--- head/multimedia/jahshaka/distinfo	(revision 154062)
+++ head/multimedia/jahshaka/distinfo	(revision 154063)
@@ -1,2 +1,3 @@
 MD5 (jahshaka_1.9a9.tar.gz) = 1da413be5ab509b417cc8d56c74cdbf3
+SHA256 (jahshaka_1.9a9.tar.gz) = c88cbdf71a23753f36a2ddb4b65019f58de8ddb9a762617b76ee361f7f2ca713
 SIZE (jahshaka_1.9a9.tar.gz) = 4538582

Property changes on: head/multimedia/jahshaka/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h
===================================================================
--- head/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h	(nonexistent)
+++ head/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h	(revision 154063)
@@ -0,0 +1,18 @@
+--- jah/libraries/glew/glew.h.orig
++++ jah/libraries/glew/glew.h
+@@ -8945,11 +8945,15 @@
+ }
+ #endif
+ 
++/* Do not undef GLAPIENTRY here. This is a quick hack to avoid
++   undefined symbols when including glut.h just after glew.h */
++/*
+ #ifdef GLEW_APIENTRY_DEFINED
+ #undef GLEW_APIENTRY_DEFINED
+ #undef APIENTRY
+ #undef GLAPIENTRY
+ #endif
++*/
+ 
+ #ifdef GLEW_CALLBACK_DEFINED
+ #undef GLEW_CALLBACK_DEFINED

Property changes on: head/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property