ports/76512: Update port: graphics/glew fixes bug in previous commit

[Igor Pokrovsky]

>Number:         76512
>Category:       ports
>Synopsis:       Update port: graphics/glew fixes bug in previous commit
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 20 17:50:23 GMT 2005
>Closed-Date:
>Last-Modified:
>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 Jan 13 13:24:12 MSK 2005 root at doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
Fix stupid bug introduced by previous commit.
	
>How-To-Repeat:
	
>Fix:

	

--- glew.diff begins here ---
diff -ru /usr/ports/graphics/glew/files/patch-Makefile glew/files/patch-Makefile
--- /usr/ports/graphics/glew/files/patch-Makefile	Wed Jan 12 21:19:50 2005
+++ glew/files/patch-Makefile	Thu Jan 20 20:41:50 2005
@@ -1,49 +1,36 @@
 
-$FreeBSD: ports/graphics/glew/files/patch-Makefile,v 1.4 2005/01/08 10:45:44 krion Exp $
+$FreeBSD$
 
 --- Makefile.orig
 +++ Makefile
-@@ -143,6 +143,26 @@
- 
- else
+@@ -121,17 +121,17 @@
  # ----------------------------------------------------------------------------
-+# FreeBSD
-+# ----------------------------------------------------------------------------
-+ifeq ($(patsubst FreeBSD%,FreeBSD,$(SYSTEM)), FreeBSD)
-+NAME = GLEW
-+CC ?= gcc
+ ifeq ($(patsubst FreeBSD%,FreeBSD,$(SYSTEM)), FreeBSD)
+ NAME = GLEW
+-CC = cc
+-LD = ld
++CC ?= cc
 +LD ?= ld
-+CFLAGS.EXTRA = -fPIC -I${X11BASE}/include
-+LDFLAGS.SO = -shared -soname $(LIB.SONAME)
-+LDFLAGS.EXTRA = -L${X11BASE}/lib
-+LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
-+GLEW_DEST = ${X11BASE}
-+WARN = -Wall -W
-+BIN.SUFFIX =
-+LIB.SONAME = lib$(NAME).so.$(GLEW_MAJOR)
-+LIB.DEVLNK = lib$(NAME).so
-+LIB.SHARED = lib$(NAME).so.$(GLEW_VERSION)
-+LIB.STATIC = lib$(NAME).a
-+
-+else
-+# ----------------------------------------------------------------------------
- # Irix
- # ----------------------------------------------------------------------------
- ifeq ($(patsubst IRIX%,IRIX,$(SYSTEM)), IRIX)
-@@ -228,6 +248,7 @@
- endif
+ ifneq (undefined, $(origin GLEW_MX))
+ CFLAGS.EXTRA = -DGLEW_MX
  endif
- endif
-+endif
- 
- ifeq (undefined, $(origin SHARED_OBJ_EXT))
- SHARED_OBJ_EXT = o
-@@ -245,7 +266,7 @@
+ LDFLAGS.SO = -shared -soname $(LIB.SONAME)
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib
++LDFLAGS.EXTRA = -L${X11BASE}/lib
+ LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+ LDFLAGS.STATIC = -Wl,-Bstatic
+ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+-CFLAGS.EXTRA += -I/usr/X11R6/include
++CFLAGS.EXTRA += -I${X11BASE}/include -fPIC
+ NAME = GLEW
+ WARN = -Wall -W
+ POPT = -O2
+@@ -245,7 +245,7 @@
  STRIP = -s
  endif
  INCLUDE = -Iinclude
 -CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
-+CFLAGS += $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) -fPIC
++CFLAGS += $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
  
  LIB.SRCS = src/glew.c
  LIB.OBJS = $(LIB.SRCS:.c=.o)
--- glew.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: