Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/math/grace/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/math/grace/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.20
diff -u -p -r1.6 -r1.20
--- pkgsrc/math/grace/Makefile	2001/02/17 18:22:23	1.6
+++ pkgsrc/math/grace/Makefile	2002/09/23 17:22:54	1.20
@@ -1,36 +1,43 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:22:23 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/23 17:22:54 wiz Exp $
 #
 
-DISTNAME=	grace-5.1.2
+DISTNAME=	grace-5.1.4
+PKGREVISION=	1
 CATEGORIES=	math graphics x11
-MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/
+MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
+		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/ \
+		ftp://ftp.fu-berlin.de/unix/graphics/grace/src/ \
+		ftp://ftp.ntua.gr/pub/graphics/grace/src/ \
+		ftp://ftp.ru.xemacs.org/pub/math/grace/src/ \
+		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/ \
+		ftp://ftp2.netmor.com/pub/mirrors/grace/src/
 
 MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://plasma-gate.weizmann.ac.il/Grace/
 COMMENT=	GRaphing, Advanced Computation and Exploration of data
 
-DEPENDS+=	netcdf>=3.4:../../devel/netcdf
-DEPENDS+=	jpeg-6*:../../graphics/jpeg
-DEPENDS+=	tiff-*:../../graphics/tiff
-DEPENDS+=	png>=0.9.6:../../graphics/png
-DEPENDS+=	pdflib>=3.0:../../print/pdflib
-DEPENDS+=	t1lib-1.0.1:../../textproc/t1lib
-DEPENDS+=	Xbae-*:../../x11/Xbae
-#DEPENDS+=	fftw-*:../../math/fftw
-
-USE_GMAKE=	YES
-USE_FORTRAN=	YES
-USE_MOTIF=	YES
-USE_XPM=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace \
-		--with-extra-incpath=${LOCALBASE}/include:${X11BASE}/include
+#DEPENDS+=	fftw-[0-9]*:../../math/fftw
 
-ALL_TARGET=
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_FORTRAN=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace
+CONFIGURE_ARGS+=	--with-extra-incpath=${BUILDLINK_DIR}/include
+MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
 	${RM} -f ${PREFIX}/bin/xmgrace
 	${LN} -s ${PREFIX}/grace/bin/xmgrace ${PREFIX}/bin
 
+.include "../../devel/netcdf/buildlink2.mk"
+.include "../../fonts/t1lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../print/pdflib/buildlink2.mk"
+.include "../../x11/Xbae/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"