From 8761b80efded2302519cce4adbe14c065c99fb2b Mon Sep 17 00:00:00 2001 From: grant Date: Sat, 26 Jun 2004 06:40:08 +0000 Subject: move the common bits of these packages out into gnuplot/Makefile.common. no functional change. --- graphics/gnuplot-nox11/Makefile | 27 +++------------------------ graphics/gnuplot/Makefile | 28 +++------------------------- graphics/gnuplot/Makefile.common | 30 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 49 deletions(-) create mode 100644 graphics/gnuplot/Makefile.common (limited to 'graphics') diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile index 22897989bf7..53a7c9f6ff8 100644 --- a/graphics/gnuplot-nox11/Makefile +++ b/graphics/gnuplot-nox11/Makefile @@ -1,35 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2004/06/25 17:09:27 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2004/06/26 06:40:08 grant Exp $ # -DISTNAME= gnuplot-4.0.0 PKGNAME= ${DISTNAME:C/-/-nox11-/} SVR4_PKGNAME= gplot -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} \ - ftp://ftp.ucc.ie/pub/gnuplot/ \ - ftp://ftp.cc.monash.edu.au/pub/gnuplot/ - -MAINTAINER= root@garbled.net -HOMEPAGE= http://gnuplot.sourceforge.net/ -COMMENT= Portable interactive, function plotting utility CONFLICTS+= gnuplot-[0-9]* -USE_BUILDLINK3= YES -# because of missing rl_complete_with_tilde_expansion and rl_terminal_name -USE_GNU_READLINE= YES -GNU_CONFIGURE= YES - -USE_MAKEINFO= YES -INFO_FILES= gnuplot.info - -CONFIGURE_ARGS+= --with-pdf -CONFIGURE_ARGS+= --with-plot=${LOCALBASE} -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} CONFIGURE_ARGS+= --without-x -.include "../../devel/readline/buildlink3.mk" +.include "../../graphics/gnuplot/Makefile.common" + .include "../../graphics/plotutils-nox11/buildlink3.mk" -.include "../../graphics/gd/buildlink3.mk" -.include "../../print/pdflib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 47f60bedc2b..8a19f3f782e 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,36 +1,14 @@ -# $NetBSD: Makefile,v 1.28 2004/06/25 17:08:13 adrianp Exp $ +# $NetBSD: Makefile,v 1.29 2004/06/26 06:40:08 grant Exp $ # -DISTNAME= gnuplot-4.0.0 SVR4_PKGNAME= gplot -CATEGORIES= graphics x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} \ - ftp://ftp.ucc.ie/pub/gnuplot/ \ - ftp://ftp.cc.monash.edu.au/pub/gnuplot/ - -MAINTAINER= root@garbled.net -HOMEPAGE= http://gnuplot.sourceforge.net/ -COMMENT= Portable interactive, function plotting utility +CATEGORIES+= x11 CONFLICTS+= gnuplot-nox11-[0-9]* -PKG_INSTALLATION_TYPES= overwrite pkgviews - -GNU_CONFIGURE= YES -USE_BUILDLINK3= YES -# because of missing rl_complete_with_tilde_expansion and rl_terminal_name -USE_GNU_READLINE= YES USE_X11= YES -USE_MAKEINFO= YES -INFO_FILES= gnuplot.info - -CONFIGURE_ARGS+= --with-pdf -CONFIGURE_ARGS+= --with-plot=${LOCALBASE} -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +.include "../../graphics/gnuplot/Makefile.common" -.include "../../devel/readline/buildlink3.mk" .include "../../graphics/plotutils/buildlink3.mk" -.include "../../graphics/gd/buildlink3.mk" -.include "../../print/pdflib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common new file mode 100644 index 00000000000..b516d489223 --- /dev/null +++ b/graphics/gnuplot/Makefile.common @@ -0,0 +1,30 @@ +# $NetBSD: Makefile.common,v 1.1 2004/06/26 06:40:08 grant Exp $ +# + +DISTNAME= gnuplot-4.0.0 +CATEGORIES+= graphics +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} \ + ftp://ftp.ucc.ie/pub/gnuplot/ \ + ftp://ftp.cc.monash.edu.au/pub/gnuplot/ + +MAINTAINER= root@garbled.net +HOMEPAGE= http://gnuplot.sourceforge.net/ +COMMENT= Portable interactive, function plotting utility + +PKG_INSTALLATION_TYPES= overwrite pkgviews + +GNU_CONFIGURE= YES +USE_BUILDLINK3= YES +# because of missing rl_complete_with_tilde_expansion and rl_terminal_name +USE_GNU_READLINE= YES + +USE_MAKEINFO= YES +INFO_FILES= gnuplot.info + +CONFIGURE_ARGS+= --with-pdf +CONFIGURE_ARGS+= --with-plot=${LOCALBASE} +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} + +.include "../../devel/readline/buildlink3.mk" +.include "../../graphics/gd/buildlink3.mk" +.include "../../print/pdflib/buildlink3.mk" -- cgit v1.2.3