summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/glclock/Makefile8
-rw-r--r--x11/glclock/files/patch-sum4
-rw-r--r--x11/glclock/patches/patch-aa17
3 files changed, 20 insertions, 9 deletions
diff --git a/x11/glclock/Makefile b/x11/glclock/Makefile
index e524171c42b..9a237fb1ed4 100644
--- a/x11/glclock/Makefile
+++ b/x11/glclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/09/29 22:58:46 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/30 07:13:03 tron Exp $
DISTNAME= glclock-4.6
CATEGORIES= x11 graphics
@@ -13,6 +13,12 @@ USE_X11BASE= yes
MAKEFILE= makefile
ALL_TARGET= glclock
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == sparc
+CFLAGS=
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/glclock ${PREFIX}/bin
#notyet: lookup of .ppm files
diff --git a/x11/glclock/files/patch-sum b/x11/glclock/files/patch-sum
index 9c7480f2e67..f4edaa67876 100644
--- a/x11/glclock/files/patch-sum
+++ b/x11/glclock/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 2000/05/30 01:43:50 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/30 07:13:04 tron Exp $
-MD5 (patch-aa) = 4278ab8bc86ac8c1a082185212fdd9df
+MD5 (patch-aa) = 4f26efbe595cb15222e366c5354d4bc0
diff --git a/x11/glclock/patches/patch-aa b/x11/glclock/patches/patch-aa
index 08969bfda40..7a66d5817f4 100644
--- a/x11/glclock/patches/patch-aa
+++ b/x11/glclock/patches/patch-aa
@@ -1,10 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2000/05/30 01:43:51 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2000/05/30 07:13:04 tron Exp $
-don't use -O2 (c++ bug on sparc with egcs-1.1.1)
-
---- makefile.orig Thu Feb 4 01:13:25 1999
-+++ makefile Mon May 29 15:47:09 2000
-@@ -6,10 +6,10 @@
+--- makefile.orig Thu Feb 4 07:13:25 1999
++++ makefile Tue May 30 09:10:18 2000
+@@ -5,17 +5,16 @@
+
CC = g++
LN = g++
- OPT = -O2
@@ -19,3 +18,9 @@ don't use -O2 (c++ bug on sparc with egcs-1.1.1)
+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lXt -lSM -lICE -lXi -lX11 -lm
# for Mesa
+ # LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm
+
+- CFLAGS = -c
+ LFLAGS =
+
+ COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)