Index: Makefile =================================================================== RCS file: /cvs/obsd/ports/math/gnuplot/Makefile,v retrieving revision 1.45 diff -N -u -p Makefile --- Makefile 22 Nov 2010 10:16:08 -0000 1.45 +++ Makefile 30 Dec 2010 22:29:33 -0000 @@ -1,50 +1,61 @@ # $OpenBSD: Makefile,v 1.44 2010/11/19 07:23:10 espie Exp $ -COMMENT= command-driven interactive function plotting program +COMMENT = command-driven interactive function plotting program -V= 4.2 -PATCHLEVEL= 6 -DISTNAME= gnuplot-${V}.${PATCHLEVEL} -CATEGORIES= math graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} +V = 4.4 +PATCHLEVEL = 0 +DISTNAME = gnuplot-${V}.${PATCHLEVEL} +CATEGORIES = math graphics +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/} -HOMEPAGE= http://www.gnuplot.info/ +HOMEPAGE = http://www.gnuplot.info/ -MAINTAINER= Weldon Goree +MAINTAINER = Weldon Goree # see Copyright in source -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes -WANTLIB= c m ncurses readline stdc++ z +WANTLIB = c m ncurses readline stdc++ z -FLAVORS= no_x11 -FLAVOR?= +FLAVORS = no_cairo no_x11 +FLAVOR ?= -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --without-linux-vga --without-pdf \ - --without-tutorial --with-readline \ - --with-lasergnu --disable-wxwidgets --without-lisp-files -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" \ +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --without-linux-vga --without-latex \ + --without-tutorial --with-readline \ + --with-lasergnu --disable-wxwidgets \ + --without-lisp-files +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng" \ LDFLAGS="-L${LOCALBASE}/lib" -REGRESS_IS_INTERACTIVE= x11 +REGRESS_IS_INTERACTIVE = x11 -SUBST_VARS= V +SUBST_VARS = V .if ${FLAVOR:L:Mno_x11} CONFIGURE_ARGS += --without-x --without-gd .else -LIB_DEPENDS = graphics/gd +LIB_DEPENDS += graphics/gd USE_GROFF = Yes WANTLIB += X11 fontconfig freetype iconv jpeg png gd>=20 CONFIGURE_ARGS += --with-x .endif +.if ${FLAVOR:L:Mno_cairo} || ${FLAVOR:L:Mno_x11} +CONFIGURE_ARGS += --without-cairo +.else +WANTLIB += pangocairo-1.0 cairo glib-2.0 pango-1.0 pangoft2-1.0 +LIB_DEPENDS += devel/pango \ + graphics/cairo +WANTLIB += GL Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm drm \ + expat gmodule-2.0 gobject-2.0 gthread-2.0 intl pixman-1 \ + pthread pthread-stubs xcb xcb-render xcb-shm +.endif + post-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu - -cat ${PATCHDIR}/patch-* >${PREFIX}/share/gnuplot/${V}/patches .include Index: distinfo =================================================================== RCS file: /cvs/obsd/ports/math/gnuplot/distinfo,v retrieving revision 1.10 diff -N -u -p distinfo --- distinfo 7 Oct 2009 20:01:07 -0000 1.10 +++ distinfo 30 Dec 2010 22:29:33 -0000 @@ -1,5 +1,5 @@ -MD5 (gnuplot-4.2.6.tar.gz) = wQRo10Aw6L7Q/WhlpFzx/Q== -RMD160 (gnuplot-4.2.6.tar.gz) = Oxcm5TJ7F7t7UoGY5ioSuf4+WnY= -SHA1 (gnuplot-4.2.6.tar.gz) = 0R/d6CGL7phZfug2y8F+S/YJO3A= -SHA256 (gnuplot-4.2.6.tar.gz) = gfvC62B3vWq/6YxcgqrhSiyXBHPuTCw3dD/zseKqjoI= -SIZE (gnuplot-4.2.6.tar.gz) = 2936753 +MD5 (gnuplot-4.4.0.tar.gz) = 5whmW9USFTrVw1JS/kmQWQ== +RMD160 (gnuplot-4.4.0.tar.gz) = 7RX9RNMrC/YQ9SuZ4sNs0WDLCKY= +SHA1 (gnuplot-4.4.0.tar.gz) = BKLu3nsq+OZBRKqP/t5lNbegQ7U= +SHA256 (gnuplot-4.4.0.tar.gz) = AN4sVKBZIKXS3Gj2aJkLC4SpYQXZKpMtkWAN1T8Vayo= +SIZE (gnuplot-4.4.0.tar.gz) = 3291622 Index: patches/patch-share_Makefile_in =================================================================== RCS file: /cvs/obsd/ports/math/gnuplot/patches/patch-share_Makefile_in,v retrieving revision 1.4 diff -N -u -p patches/patch-share_Makefile_in --- patches/patch-share_Makefile_in 7 Oct 2009 20:01:07 -0000 1.4 +++ /dev/null 18 Jul 2009 08:19:55 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-share_Makefile_in,v 1.3 2009/04/19 15:06:50 steven Exp $ ---- share/Makefile.in.orig Thu Sep 3 04:03:46 2009 -+++ share/Makefile.in Wed Sep 30 14:39:48 2009 -@@ -194,7 +194,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign 1.2h - EXTRA_DIST = Gnuplot.app-defaults --SUBDIRS = LaTeX -+SUBDIRS = - appdefaultdir = $(libdir)/X11/app-defaults - APPDEFAULTFILES = Gnuplot - appdefault_DATA = $(APPDEFAULTFILES) Index: pkg/PFRAG.no-no_x11 =================================================================== RCS file: /cvs/obsd/ports/math/gnuplot/pkg/PFRAG.no-no_x11,v retrieving revision 1.5 diff -N -u -p pkg/PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 19 Apr 2009 15:06:50 -0000 1.5 +++ pkg/PFRAG.no-no_x11 30 Dec 2010 22:29:34 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2008/05/23 20:57:32 steven Exp $ -lib/X11/app-defaults/Gnuplot libexec/gnuplot/ libexec/gnuplot/${V}/ @bin libexec/gnuplot/${V}/gnuplot_x11 +share/gnuplot/${V}/app-defaults/ +share/gnuplot/${V}/app-defaults/Gnuplot Index: pkg/PLIST =================================================================== RCS file: /cvs/obsd/ports/math/gnuplot/pkg/PLIST,v retrieving revision 1.14 diff -N -u -p pkg/PLIST --- pkg/PLIST 19 Apr 2009 15:06:50 -0000 1.14 +++ pkg/PLIST 30 Dec 2010 22:29:34 -0000 @@ -10,6 +10,8 @@ share/gnuplot/${V}/PostScript/ share/gnuplot/${V}/PostScript/8859-1.ps share/gnuplot/${V}/PostScript/8859-15.ps share/gnuplot/${V}/PostScript/8859-2.ps +share/gnuplot/${V}/PostScript/8859-9.ps +share/gnuplot/${V}/PostScript/aglfn.txt share/gnuplot/${V}/PostScript/cp1250.ps share/gnuplot/${V}/PostScript/cp437.ps share/gnuplot/${V}/PostScript/cp850.ps @@ -17,6 +19,6 @@ share/gnuplot/${V}/PostScript/cp852.ps share/gnuplot/${V}/PostScript/koi8r.ps share/gnuplot/${V}/PostScript/koi8u.ps share/gnuplot/${V}/PostScript/prologue.ps +share/gnuplot/${V}/PostScript/utf-8.ps share/gnuplot/${V}/gnuplot.gih -share/gnuplot/${V}/patches !%%no_x11%%