Date: Tue, 8 Jun 2010 05:32:43 GMT From: Dmitry <dmitry2006@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/147679: math/gnuplot add OPTION X11 CAIRO [PATCH] Message-ID: <201006080532.o585WhVi052352@www.freebsd.org> Resent-Message-ID: <201006080540.o585e46f074730@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147679
>Category: ports
>Synopsis: math/gnuplot add OPTION X11 CAIRO [PATCH]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 08 05:40:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Dmitry
>Release: 8.1-PRERELEASE
>Organization:
>Environment:
FreeBSD *** 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Mon Jun 7 23:27:30 *** 2010 ***:/usr/obj/usr/src/sys/GENERIC_ amd64
>Description:
Add OPTION X11 and CAIRO for better flexibility
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2010-04-26 01:58:06.000000000 +0600
+++ Makefile 2010-06-08 11:17:17.000000000 +0600
@@ -13,7 +13,6 @@
MAINTAINER= glewis@FreeBSD.org
COMMENT= A command-driven interactive function plotting program
-LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-lasergnu \
@@ -21,27 +20,28 @@
--without-linux-vga \
--without-lisp-files \
--without-tutorial
-USE_GNOME= pango
-OPTIONS= GD "Enable GD support" on \
+OPTIONS= X11 "Enable X11 support" on \
+ GD "Enable GD support" on \
GRIDBOX "Use the gridbox optimization for hidden3d" off \
PDF "Enable PDF support" on \
PLOT "Enable plot support" on \
TETEX "Search kpsexpand at run-time" on \
THINSPLINES "Enable thin plate splines for grids in dgrid3d" off \
- WX "Enable WX support" on
+ WX "Enable WX support" on \
+ CAIRO "Enable CAIRO support" on
MAN1= gnuplot.1 lasergnu.1
INFO= gnuplot
.include <bsd.port.options.mk>
-.if !defined(WITHOUT_X11)
-USE_XORG= x11
-PLIST_SUB+= X11=""
-.else
+.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --without-x
PLIST_SUB+= X11="@comment "
+.else
+USE_XORG= x11
+PLIST_SUB+= X11=""
.endif
.if defined(WITHOUT_GD)
@@ -92,6 +92,13 @@
WX_CONF_ARGS= absolute
.endif
+.if defined(WITHOUT_CAIRO)
+CONFIGURE_ARGS+= --without-cairo
+.else
+LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME+= pango
+.endif
+
post-patch:
.if defined(WITHOUT_TETEX)
@${REINPLACE_CMD} -e \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006080532.o585WhVi052352>