Date: Tue, 26 Sep 2000 15:14:43 -0700 (PDT) From: KATO@FreeBSD.ORG, Tsuguru@FreeBSD.ORG To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21577: Update port: graphics/togl Message-ID: <20000926221443.89B5137B422@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21577
>Category: ports
>Synopsis: Update port: graphics/togl
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 26 15:20:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: tkato@prontomail.ne.jp
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS/LOCALBASE/X11BASE properly
Contacted maintainer with 'User unknown' error.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/togl/patches/patch-aa graphics/togl/patches/patch-aa
--- /usr/ports/graphics/togl/patches/patch-aa Mon Nov 29 03:32:23 1999
+++ graphics/togl/patches/patch-aa Thu Aug 10 21:13:53 2000
@@ -1,15 +1,19 @@
---- ORIG/Makefile Wed Mar 11 23:11:26 1998
-+++ Makefile Wed Aug 18 18:57:46 1999
-@@ -61,23 +61,28 @@
- CC = cc
+--- Makefile.orig Thu Mar 12 13:11:26 1998
++++ Makefile Thu Aug 10 21:13:42 2000
+@@ -58,26 +58,30 @@
+
+
+ # The C compiler:
+-CC = cc
++CC ?= cc
# Compiler options:
-COPTS = -c -O
-+COPTS = -c -O -w
++COPTS = -c -w
# Shared library linker command:
-SHLINK = cc -G
-+SHLINK = cc -shared
++SHLINK = ${CC} -shared
# Name for the shared lib:
-#SH_LIB = libtogl.so.1.3
@@ -20,16 +24,15 @@
-# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
-INCLUDES = -I/usr/local/include -I/usr/include/tcl
+# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc:
-+INCLUDES = -I/usr/local/include/tcl8.2 \
-+ -I/usr/local/include/tk8.2 \
-+ -I/usr/local/include/tk8.2/generic \
-+ -I/usr/X11R6/include \
-+ -I/usr/include/tcl
++INCLUDES = -I${LOCALBASE}/include/tcl8.2 \
++ -I${LOCALBASE}/include/tk8.2 \
++ -I${LOCALBASE}/include/tk8.2/generic \
++ -I${X11BASE}/include
# Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries:
-LIBDIRS = -L/usr/local/lib
-+LIBDIRS = -L/usr/local/lib \
-+ -L/usr/X11R6/lib
++LIBDIRS = -L${LOCALBASE}/lib \
++ -L${X11BASE}/lib
# Libraries to link with (-ldl for Linux only?):
-LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl
@@ -37,7 +40,16 @@
TK_FLAGS =
-@@ -144,8 +149,8 @@
+@@ -85,7 +89,7 @@
+ #### Shouldn't have to change anything beyond this point ####
+
+
+-CFLAGS = $(COPTS) $(INCLUDES) $(TK_FLAGS)
++CFLAGS += $(COPTS) $(INCLUDES) $(TK_FLAGS)
+
+ LFLAGS = $(LIBDIRS)
+
+@@ -144,8 +148,8 @@
$(CC) $(CFLAGS) togl.c
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000926221443.89B5137B422>