[pkgsrc/trunk]: pkgsrc/graphics move the common bits of these packages out in...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dd53392d833
branches:  trunk
changeset: 477040:3dd53392d833
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jun 26 06:40:08 2004 +0000

description:
move the common bits of these packages out into gnuplot/Makefile.common.
no functional change.

diffstat:

 graphics/gnuplot-nox11/Makefile  |  27 +++------------------------
 graphics/gnuplot/Makefile        |  28 +++-------------------------
 graphics/gnuplot/Makefile.common |  30 ++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 49 deletions(-)

diffs (119 lines):

diff -r c4a6581f05e3 -r 3dd53392d833 graphics/gnuplot-nox11/Makefile
--- a/graphics/gnuplot-nox11/Makefile   Sat Jun 26 06:03:41 2004 +0000
+++ b/graphics/gnuplot-nox11/Makefile   Sat Jun 26 06:40:08 2004 +0000
@@ -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@localhost
-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 -r c4a6581f05e3 -r 3dd53392d833 graphics/gnuplot/Makefile
--- a/graphics/gnuplot/Makefile Sat Jun 26 06:03:41 2004 +0000
+++ b/graphics/gnuplot/Makefile Sat Jun 26 06:40:08 2004 +0000
@@ -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@localhost
-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
+.include "../../graphics/gnuplot/Makefile.common"
 
-CONFIGURE_ARGS+=       --with-pdf
-CONFIGURE_ARGS+=       --with-plot=${LOCALBASE}
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
-
-.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 -r c4a6581f05e3 -r 3dd53392d833 graphics/gnuplot/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gnuplot/Makefile.common  Sat Jun 26 06:40:08 2004 +0000
@@ -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@localhost
+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"