Updated plplot to version 5.0.1. The changes are too numerous to

list (especially as the Changelog doesn't mention any recent changes).
Things work much better than in the last version (especially on the
Tcl/Tk end).

1 files changed, 33 insertions, 64 deletions

diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index c4b9ea92396..9523a5f6572 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,89 +1,58 @@
-# $NetBSD: Makefile,v 1.4 2001/01/26 09:47:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 01:15:33 jtb Exp $
 
-DISTNAME=	plplot-5.0.0
+DISTNAME=	plplot-5.0.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://plplot.sourceforge.net/pub/plplot/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=plplot/}
 
 MAINTAINER=	jtb@netbsd.org
 HOMEPAGE=	http://www.plplot.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+DEPENDS+=	tcl>=8.3.0:../../lang/tcl
+DEPENDS+= 	tk>=8.3.0:../../x11/tk
+DEPENDS+=	m4-[0-9]*:../../devel/m4
+BUILD_DEPENDS+=	autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	perl:../../lang/perl5
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_FORTRAN=	YES
+USE_X11=	YES
 
-EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl PYTHON_PREFIX=python
-
-post-patch:
-	@for f in ${WRKSRC}/src/plctrl.c ; do  \
-	${SED} -e 's:%%PREFIX%%:'${PREFIX}':g' \
-	< $$f > $$f.tmp && ${MV} $$f.tmp $$f ; done
-
-pre-configure:
-	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf)
-	@${MV} ${WRKSRC}/cf/configure ${WRKSRC}/configure
-
-PLPLOT_USE_X11= YES
-PLPLOT_USE_TCL= YES
-PLPLOT_USE_TK = YES
+EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl
 
-CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib/plplot"
 CONFIGURE_ENV+=	"BIN_DIR=${PREFIX}/bin"
-CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
+CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib/plplot"
 CONFIGURE_ENV+=	"INCLUDE_DIR=${PREFIX}/include/plplot"
+CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
 CONFIGURE_ENV+=	"DEMOS_DIR=${PREFIX}/share/examples/plplot"
-
-# Python support requires shared libraries. Disabled for now.
-#CONFIGURE_ENV+="PYTHONLIBDIR=${PYTHON_PREFIX}/lib/python1.5"
-#CONFIGURE_ENV+="PYTHON_INC_DIR=${PYTHON_PREFIX}/include/python1.5"
-#CONFIGURE_ENV+="PYTHON_MOD_DIR=${PYTHON_PREFIX}/lib/python1.5/site-packages"
-#CONFIGURE_ENV+="PYTHON_DIR=${PREFIX}/libdata/plplot/python"
+CONFIGURE_ENV+=	"TKINCDIR=${TK_PREFIX}/include"
+CONFIGURE_ENV+=	"TKLIBDIR=${TK_PREFIX}/lib"
+CONFIGURE_ENV+=	"TCLINCDIR=${TCL_PREFIX}/include"
+CONFIGURE_ENV+=	"TCLLIBDIR=${TCL_PREFIX}/lib"
+CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/lib/tcl/plplot"
+CONFIGURE_ENV+=	"USER_FLAGS_C=${CFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LC=${LDFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_CXX=${CXXFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LCXX=${LDFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_F=${FFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LF=${LDLAGS}"
 
 CONFIGURE_ARGS+="--with-double"
+CONFIGURE_ARGS+="--enable-xwin"
+CONFIGURE_ARGS+="--enable-tcl"
+CONFIGURE_ARGS+="--enable-tk"
 CONFIGURE_ARGS+="--without-shlib"
 CONFIGURE_ARGS+="--disable-python"
 CONFIGURE_ARGS+="--disable-itcl"
 CONFIGURE_ARGS+="--disable-dp"
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${PKGDIR}/PLIST.no-x11
-
-.if defined(PLPLOT_USE_TK) && ${PLPLOT_USE_TK} == "YES"
-DEPENDS+= 	tk-8.3.[0-9]:../../x11/tk
-USE_X11=	YES
-PLPLOT_USE_X11= YES
-PLPLOT_USE_TCL= YES
-PLIST_SRC=	${PKGDIR}/PLIST.xwin-tcl-tk
-CONFIGURE_ARGS+="--enable-tk"
-CONFIGURE_ENV+=	"TKINCDIR=${TK_PREFIX}/include"
-CONFIGURE_ENV+=	"TKLIBDIR=${TK_PREFIX}/lib"
-.else
-CONFIGURE_ARGS+="--disable-tk"
-.endif
-
-.if defined(PLPLOT_USE_X11) && ${PLPLOT_USE_X11} == "NO"
-CONFIGURE_ARGS+="--disable-xwin"
-.else
-USE_X11=	YES
-CONFIGURE_ARGS+="--enable-xwin"
-.if ${PLPLOT_USE_TK} == "NO" && ${PLPLOT_USE_TCL} == "NO"
-PLIST_SRC=	${PKGDIR}/PLIST.xwin
-.endif
-.endif
+post-patch:
+	for f in ${WRKSRC}/src/plctrl.c ; do		\
+	${SED} -e 's:@PREFIX@:'${PREFIX}':g'		\
+	< $$f > $$f.tmp && ${MV} $$f.tmp $$f ; done
 
-.if defined(PLPLOT_USE_TCL) && ${PLPLOT_USE_TCL} == "YES"
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
-.if ${PLPLOT_USE_X11} == "NO"
-PLIST_SRC=	${PKGDIR}/PLIST.tcl
-.endif
-CONFIGURE_ARGS+="--enable-tcl"
-CONFIGURE_ENV+=	"TCLINCDIR=${TCL_PREFIX}/include"
-CONFIGURE_ENV+=	"TCLLIBDIR=${TCL_PREFIX}/lib"
-CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/libdata/plplot/tcl"
-.else
-CONFIGURE_ARGS+="--disable-tcl"
-.endif
+pre-configure:
+	(cd ${WRKSRC}/cf && autoconf)
+	${MV} ${WRKSRC}/cf/configure ${WRKSRC}/configure
 
 .include "../../mk/bsd.pkg.mk"