summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-04-12 13:20:01 +0000
committerjlam <jlam@pkgsrc.org>2002-04-12 13:20:01 +0000
commit2976466a4167d76e659c4226a3452089ed99bb0a (patch)
treee45e242bd2bf9d523e67a199305e72a00961f632 /x11
parent68f6bab4ef546ce9a52926e3f1f8ae058f071192 (diff)
downloadpkgsrc-2976466a4167d76e659c4226a3452089ed99bb0a.tar.gz
Several changes:
* It's CONFIGURE_ARGS, not CONFIGURE_ARG. * Use Mesa/buildlink.mk to properly handle whether we're using XF3 or XF4 (the latter contains its own MesaGL libraries). * Comment out inclusion of x11.buildlink.mk since we're not even weakly buildlinked, so jumping ahead to trying to strongly buldlinkify this package is overboard. * Sort the buildlink.mk file (just personal aesthetics).
Diffstat (limited to 'x11')
-rw-r--r--x11/xplanet/Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index fc8d870e73c..5f731e80aa5 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/04 16:47:54 atatat Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/12 13:20:01 jlam Exp $
#
DISTNAME= xplanet-0.93
@@ -10,13 +10,11 @@ MAINTAINER= atatat@netbsd.org
HOMEPAGE= http://xplanet.sourceforge.net/
COMMENT= Rotating rendered map of the Earth in X11 root window
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --with-gl-dir=${X11BASE} --with-glut-dir=${X11BASE}
-USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-gl-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-glut-dir=${BUILDLINK_DIR}
-DEPENDS+= MesaLib-*:../../graphics/MesaLib
-DEPENDS+= glut-*:../../graphics/glut
-DEPENDS+= glu-*:../../graphics/glu
+USE_GMAKE= yes
LIBS= -lpbm -lppm -lpgm
MAKE_ENV+= LIBS="${LIBS}"
@@ -27,12 +25,14 @@ pre-configure:
[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
-.include "../../graphics/libungif/buildlink.mk"
+.include "../../graphics/Mesa/buildlink.mk"
.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/freetype2/buildlink.mk"
+.include "../../graphics/libungif/buildlink.mk"
.include "../../graphics/netpbm/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
.include "../../graphics/tiff/buildlink.mk"
-.include "../../graphics/freetype2/buildlink.mk"
.include "../../x11/tk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+
+#.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"