diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /time/glclock | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'time/glclock')
| -rw-r--r-- | time/glclock/Makefile | 9 | ||||
| -rw-r--r-- | time/glclock/distinfo | 4 | ||||
| -rw-r--r-- | time/glclock/patches/patch-aa | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/time/glclock/Makefile b/time/glclock/Makefile index 35830ae10a6..772f6759a4f 100644 --- a/time/glclock/Makefile +++ b/time/glclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:08 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:23 jlam Exp $ # DISTNAME= glclock-6.0b6.0 @@ -11,7 +11,9 @@ COMMENT= OpenGL-based pocket watch MAKEFILE= makefile ALL_TARGET= glclock -USE_BUILDLINK_ONLY= yes + +USE_BUILDLINK2= # defined +USE_X11= # defined .include "../../mk/bsd.prefs.mk" @@ -26,6 +28,5 @@ do-install: # mwclock woodclock;do \ # ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done -.include "../../graphics/Mesa/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/distinfo b/time/glclock/distinfo index 8b88800a728..3c26d767268 100644 --- a/time/glclock/distinfo +++ b/time/glclock/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/09/14 16:32:30 drochner Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:51:23 jlam Exp $ SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685 Size (glclock-6.0b6.0.tar.gz) = 811803 bytes -SHA1 (patch-aa) = ad8e2962a1648c0d3b977c658ea3c150dac16687 +SHA1 (patch-aa) = 388d8c9e3236f377912dd6261af50cd42064eb22 SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59 diff --git a/time/glclock/patches/patch-aa b/time/glclock/patches/patch-aa index a68e19a0db8..a1a75d2072b 100644 --- a/time/glclock/patches/patch-aa +++ b/time/glclock/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:51:23 jlam Exp $ --- makefile.orig Sun Jun 18 16:37:40 2000 +++ makefile @@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $ - INCLUDE_PATH = -I/usr/X11R6/include - LIB_PATH = -L/usr/X11R6/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 ++ INCLUDE_PATH = -I${LOCALBASE}/include ++ LIB_PATH = -L${LOCALBASE}/lib -L${X11BASE}/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 |