From 66b95223e460f56a09ad3edbf8056ee81dcae438 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 14 Sep 2001 16:32:30 +0000
Subject: make it build in an xpkgwedged environment

---
 time/glclock/Makefile         | 7 ++++---
 time/glclock/distinfo         | 4 ++--
 time/glclock/patches/patch-aa | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'time')

diff --git a/time/glclock/Makefile b/time/glclock/Makefile
index 0384caf56cf..3663fd61692 100644
--- a/time/glclock/Makefile
+++ b/time/glclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:32:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/14 16:32:30 drochner Exp $
 #
 
 DISTNAME=		glclock-6.0b6.0
@@ -9,10 +9,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.daionet.gr.jp/~masa/glclock
 COMMENT=		OpenGL-based pocket watch
 
-USE_X11BASE=		yes
-USE_MESA=		yes
 MAKEFILE=		makefile
 ALL_TARGET=		glclock
+USE_BUILDLINK_ONLY=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -27,4 +26,6 @@ do-install:
 #			mwclock woodclock;do \
 #	${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done
 
+.include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/glclock/distinfo b/time/glclock/distinfo
index 87a7fde0c22..8b88800a728 100644
--- a/time/glclock/distinfo
+++ b/time/glclock/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:12 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 16:32:30 drochner Exp $
 
 SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685
 Size (glclock-6.0b6.0.tar.gz) = 811803 bytes
-SHA1 (patch-aa) = b120ea2d2c9bcad401e9799521e3ea7fa355ced7
+SHA1 (patch-aa) = ad8e2962a1648c0d3b977c658ea3c150dac16687
 SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59
diff --git a/time/glclock/patches/patch-aa b/time/glclock/patches/patch-aa
index 35ceb29f078..a68e19a0db8 100644
--- a/time/glclock/patches/patch-aa
+++ b/time/glclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/12/18 00:34:02 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $
 
 --- makefile.orig	Sun Jun 18 16:37:40 2000
 +++ makefile
@@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.2 2000/12/18 00:34:02 wiz Exp $
  
 -   INCLUDE_PATH = -I/usr/X11R6/include
 -       LIB_PATH = -L/usr/X11R6/lib
-+   INCLUDE_PATH = -I${X11BASE}/include
-+       LIB_PATH = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++   INCLUDE_PATH = -I${BUILDLINK_DIR}/include
++       LIB_PATH = -L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
  
 -           LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lm
 +           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lXt -lSM -lICE -lXi -lX11 -lm
-- 
cgit v1.2.3