From owner-freebsd-ports  Mon Jun 11 10:20:31 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 991AC37B403
	for <freebsd-ports@hub.freebsd.org>; Mon, 11 Jun 2001 10:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.3/8.11.3) id f5BHK1Y92201;
	Mon, 11 Jun 2001 10:20:01 -0700 (PDT)
	(envelope-from gnats)
Received: from wlgrv1.pa.home.com (cc92687-a.wlgrv1.pa.home.com [24.5.63.190])
	by hub.freebsd.org (Postfix) with ESMTP id 4332337B403
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jun 2001 10:11:00 -0700 (PDT)
	(envelope-from pat@wlgrv1.pa.home.com)
Received: (from root@localhost)
	by wlgrv1.pa.home.com (8.11.3/8.11.3) id f5BHAxZ70909;
	Mon, 11 Jun 2001 13:10:59 -0400 (EDT)
	(envelope-from pat)
Message-Id: <200106111710.f5BHAxZ70909@wlgrv1.pa.home.com>
Date: Mon, 11 Jun 2001 13:10:59 -0400 (EDT)
From: pat@databits.net
Reply-To: pat@databits.net
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/28073: Fix compile error for x11-clocks/glclock
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         28073
>Category:       ports
>Synopsis:       Fix compile error for x11-clocks/glclock
>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:   Mon Jun 11 10:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Li
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD bottlenek 4.3-STABLE FreeBSD 4.3-STABLE #0: Thu Jun 7 00:17:13 EDT 2001 pat@bottlenek:/usr/src/sys/compile/BOTTLENEK i386
>Description:
o Add ${PTHREAD_LIBS} and ${PTHREAD_CFLAGS} to fix compile errors
>How-To-Repeat:
N/A
>Fix:
diff -ruN /usr/ports/x11-clocks/glclock/Makefile glclock/Makefile
--- /usr/ports/x11-clocks/glclock/Makefile	Mon Feb  5 12:05:22 2001
+++ glclock/Makefile	Mon Jun 11 11:59:27 2001
@@ -18,6 +18,7 @@
 USE_MESA=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	glclock
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 SCRIPTS = benchclock crystalclock f_crystalclock f_glclock		\
 	  f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock	\
diff -ruN /usr/ports/x11-clocks/glclock/files/patch-aa glclock/files/patch-aa
--- /usr/ports/x11-clocks/glclock/files/patch-aa	Tue Feb  8 04:29:35 2000
+++ glclock/files/patch-aa	Mon Jun 11 12:00:51 2001
@@ -18,17 +18,17 @@
  
 -           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm
 +   INCLUDE_PATH = -I${X11BASE}/include
-+       LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib 
++       LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib
 +
 +# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.
 +# (see http://people.FreeBSD.org/~3d)
-+           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi
++           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
  
  #                 for Mesa
  #          LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm
  
 -         CFLAGS = -c
-+         CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\"
++         CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ${PTHREAD_CFLAGS}
           LFLAGS =
  
 -COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message