Attachment 15087 Details for Bug 28073 – file.diff

[patch] file.diff

file.diff (text/plain), 1.47 KB, created by pat on 2001-06-11 18:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pat

Created: 2001-06-11 18:20:01 UTC

Size: 1.47 KB

patch

obsolete

>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)

Actions: View | Diff

Attachments on bug 28073: 15087