From igor@doom.homeunix.org  Wed Jan 18 09:47:24 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 E1C9E16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Jan 2006 09:47:24 +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 7959A43D90
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Jan 2006 09:47:13 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: (qmail 30448 invoked from network); 18 Jan 2006 09:51:06 -0000
Received: from unknown (HELO doom.homeunix.org) (ip@212.113.114.38)
  by mail.ecolines.ru with ESMTPA; 18 Jan 2006 09:51:06 -0000
Received: from doom.homeunix.org (localhost [127.0.0.1])
	by doom.homeunix.org (8.13.4/8.13.4) with ESMTP id k0I9j4po006439
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Jan 2006 12:45: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 k0I9j0YH006438;
	Wed, 18 Jan 2006 12:45:00 +0300 (MSK)
	(envelope-from igor)
Message-Id: <200601180945.k0I9j0YH006438@doom.homeunix.org>
Date: Wed, 18 Jan 2006 12:45:00 +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: graphics/glew fix compiler errors when using glew with libglut 6.4.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         91944
>Category:       ports
>Synopsis:       Update port: graphics/glew fix compiler errors when using glew with libglut 6.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 18 09:50:03 GMT 2006
>Closed-Date:    Wed Jan 18 17:20:49 GMT 2006
>Last-Modified:  Wed Jan 18 17:20:49 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:
Fix undefined symbol errors when including glut.h just after glew.h in
applications which depends on both of them. Bumped PORTREVISION.

Added files:
	files/patch-include_GL_glew.h

	
>How-To-Repeat:
Try compiling the following test program

#include <GL/glew.h>
#include <GL/glut.h>
int main() {}

	
>Fix:

	

--- glew.diff begins here ---
diff -ruN /usr/ports/graphics/glew/Makefile glew/Makefile
--- /usr/ports/graphics/glew/Makefile	Mon Sep  5 21:52:41 2005
+++ glew/Makefile	Wed Jan 18 12:35:37 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	glew
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN /usr/ports/graphics/glew/files/patch-include_GL_glew.h glew/files/patch-include_GL_glew.h
--- /usr/ports/graphics/glew/files/patch-include_GL_glew.h	Thu Jan  1 03:00:00 1970
+++ glew/files/patch-include_GL_glew.h	Wed Jan 18 12:29:37 2006
@@ -0,0 +1,13 @@
+--- include/GL/glew.h.orig
++++ include/GL/glew.h
+@@ -9647,7 +9647,9 @@
+ #ifdef GLEW_APIENTRY_DEFINED
+ #undef GLEW_APIENTRY_DEFINED
+ #undef APIENTRY
+-#undef GLAPIENTRY
++/* Do not undef GLAPIENTRY here. This is a quick hack to avoid 
++   undefined symbols when including glut.h just after glew.h */
++/* #undef GLAPIENTRY */
+ #endif
+ 
+ #ifdef GLEW_CALLBACK_DEFINED
--- glew.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Wed Jan 18 12:48:41 UTC 2006 
Responsible-Changed-Why:  
Take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91944 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Wed Jan 18 17:20:47 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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