From igor@doom.homeunix.org  Sat Jan 21 13:50:52 2006
Return-Path: <igor@doom.homeunix.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 92CB416A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Jan 2006 13:50:52 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: from mail.ecolines.ru (ns.ecolines.ru [81.3.181.213])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A428C43D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Jan 2006 13:50:51 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: (qmail 27937 invoked from network); 21 Jan 2006 13:54:48 -0000
Received: from unknown (HELO doom.homeunix.org) (ip@212.113.114.55)
  by mail.ecolines.ru with ESMTPA; 21 Jan 2006 13:54:48 -0000
Received: from doom.homeunix.org (localhost [127.0.0.1])
	by doom.homeunix.org (8.13.4/8.13.4) with ESMTP id k0LDnTNQ099223
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Jan 2006 16:49:29 +0300 (MSK)
	(envelope-from igor@doom.homeunix.org)
Received: (from igor@localhost)
	by doom.homeunix.org (8.13.4/8.13.4/Submit) id k0LDnTmn099222;
	Sat, 21 Jan 2006 16:49:29 +0300 (MSK)
	(envelope-from igor)
Message-Id: <200601211349.k0LDnTmn099222@doom.homeunix.org>
Date: Sat, 21 Jan 2006 16:49:29 +0300 (MSK)
From: Igor Pokrovsky <ip@doom.homeunix.org>
Reply-To: Igor Pokrovsky <ip@doom.homeunix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: multimedia/jahshaka unbreak
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92096
>Category:       ports
>Synopsis:       Update port: multimedia/jahshaka unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 21 14:00:16 GMT 2006
>Closed-Date:    Sat Jan 21 16:59:16 GMT 2006
>Last-Modified:  Sat Jan 21 16:59:16 GMT 2006
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu Dec 15 07:51:52 MSK 2005 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-p3 i386


	
>Description:
- Unbreak.
- Patch glew.h to work with recent libglut 6.4.1.

Added files:
	files/patch-jah_libraries_glew_glew.h
	
>How-To-Repeat:
	
>Fix:

	

--- jahshaka.diff begins here ---
diff -ruN /usr/ports/multimedia/jahshaka/Makefile jahshaka/Makefile
--- /usr/ports/multimedia/jahshaka/Makefile	Wed Jan 18 20:33:54 2006
+++ jahshaka/Makefile	Sat Jan 21 16:04:18 2006
@@ -21,8 +21,6 @@
 		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
diff -ruN /usr/ports/multimedia/jahshaka/distinfo jahshaka/distinfo
--- /usr/ports/multimedia/jahshaka/distinfo	Sun Sep 18 22:20:48 2005
+++ jahshaka/distinfo	Sat Jan 21 16:07:44 2006
@@ -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
diff -ruN /usr/ports/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h jahshaka/files/patch-jah_libraries_glew_glew.h
--- /usr/ports/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h	Thu Jan  1 03:00:00 1970
+++ jahshaka/files/patch-jah_libraries_glew_glew.h	Sat Jan 21 16:06:25 2006
@@ -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
--- jahshaka.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Sat Jan 21 15:38:05 UTC 2006 
Responsible-Changed-Why:  
Take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92096 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Sat Jan 21 16:59:14 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92096 
>Unformatted:
