- Added a dependency to devel/lasi to build the psttf driver on X.

- reorder the pkg-plist a bit
- Buimped the PORTREVISION

BTW: WITH_GNOME part is temporary commented out: it is automatically
detected and not easy to remove.
Submitted by:	Pedro F. Giffuni
PR: 114273

2 files changed, 34 insertions, 16 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 5dc231b..6afe2a2 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -49,8 +49,8 @@ CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11="@comment "
 .else
 USE_XLIB=	yes
+LIB_DEPENDS+=	LASi.0:${PORTSDIR}/devel/lasi
 PLIST_SUB+=	X11=""
-#USE_GNOME=	libgnomeui pkgconfig pango
 .endif
 
 .if !defined(WITHOUT_PTHREAD)
@@ -74,6 +74,14 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+#.if defined(WITH_GNOME)
+#.undef WITHOUT_X11
+USE_GNOME=	libgnomeprintui libgnomeui
+PLIST_SUB+=	GNOME=""
+#.else
+#PLIST_SUB+=	GNOME="@comment "
+#.endif
+
 .if defined(WITH_TCLTK)
 .undef WITHOUT_X11
 PKGNAMESUFFIX=	-tcltk
@@ -102,6 +110,7 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_X11=yes		Turns off X11 support"
 	@${ECHO_MSG} "	WITHOUT_PTHREAD=yes	Turns off pthread support"
 	@${ECHO_MSG} "	WITH_SVGALIB=yes	Turns on SVGAlib support"
+#	@${ECHO_MSG} "	WITH_GNOME=yes		Turns on GNOME driver support"
 	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python support"
 	@${ECHO_MSG} "	WITH_TCLTK=yes		Turns on Tcl/Tk support"
 	@${ECHO_MSG} ""
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index 775a966..cda3fa8 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -94,15 +94,21 @@ lib/plplot%%VERSION%%/driversd/plmeta.so
 lib/plplot%%VERSION%%/driversd/ps.la
 lib/plplot%%VERSION%%/driversd/ps.rc
 lib/plplot%%VERSION%%/driversd/ps.so
+lib/plplot%%VERSION%%/driversd/xfig.la
+lib/plplot%%VERSION%%/driversd/xfig.rc
+lib/plplot%%VERSION%%/driversd/xfig.so
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.la
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.rc
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.so
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.la
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.rc
 %%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.so
-lib/plplot%%VERSION%%/driversd/xfig.la
-lib/plplot%%VERSION%%/driversd/xfig.rc
-lib/plplot%%VERSION%%/driversd/xfig.so
+%%GNOME%%lib/plplot%%VERSION%%/driversd/gcw.la
+%%GNOME%%lib/plplot%%VERSION%%/driversd/gcw.rc
+%%GNOME%%lib/plplot%%VERSION%%/driversd/gcw.so
+%%X11%%lib/plplot%%VERSION%%/driversd/psttf.la
+%%X11%%lib/plplot%%VERSION%%/driversd/psttf.rc
+%%X11%%lib/plplot%%VERSION%%/driversd/psttf.so
 %%X11%%lib/plplot%%VERSION%%/driversd/xwin.la
 %%X11%%lib/plplot%%VERSION%%/driversd/xwin.rc
 %%X11%%lib/plplot%%VERSION%%/driversd/xwin.so
@@ -234,6 +240,14 @@ libdata/pkgconfig/plplotd-f95.pc
 %%DATADIR%%%%VERSION%%/examples/f95/Makefile
 %%DATADIR%%%%VERSION%%/examples/test_f95.sh
 %%DATADIR%%%%VERSION%%/examples/plplot-test.sh
+%%DATADIR%%%%VERSION%%/examples/test_c.sh
+%%DATADIR%%%%VERSION%%/examples/test_cxx.sh
+%%DATADIR%%%%VERSION%%/examples/test_f77.sh
+%%DATADIR%%%%VERSION%%/globe.map
+%%DATADIR%%%%VERSION%%/plstnd5.fnt
+%%DATADIR%%%%VERSION%%/plxtnd5.fnt
+%%DATADIR%%%%VERSION%%/usa.map
+%%DATADIR%%%%VERSION%%/usaglobe.map
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/README.plplotcanvas
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/README.pythondemos
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/plplot_python_start.py
@@ -283,6 +297,9 @@ libdata/pkgconfig/plplotd-f95.pc
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/xw19.py
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/xw22.py
 %%PYTHON%%%%DATADIR%%%%VERSION%%/examples/python/xw23.py
+%%PYTHON%%%%DATADIR%%%%VERSION%%/examples/test_python.sh
+%%PYTHON%%@dirrm %%DATADIR%%%%VERSION%%/examples/python
+%%TCLTK%%%%DATADIR%%%%VERSION%%/examples/test_tcl.sh
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tcl/README.tcldemos
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tcl/plgrid.tcl
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tcl/plot.dat
@@ -364,15 +381,7 @@ libdata/pkgconfig/plplotd-f95.pc
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tk/xtk01.c
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tk/xtk02.c
 %%TCLTK%%%%DATADIR%%%%VERSION%%/examples/tk/xtk04.c
-%%DATADIR%%%%VERSION%%/examples/test_c.sh
-%%DATADIR%%%%VERSION%%/examples/test_cxx.sh
-%%DATADIR%%%%VERSION%%/examples/test_f77.sh
-%%PYTHON%%%%DATADIR%%%%VERSION%%/examples/test_python.sh
-%%TCLTK%%%%DATADIR%%%%VERSION%%/examples/test_tcl.sh
-%%DATADIR%%%%VERSION%%/globe.map
 %%TCLTK%%%%DATADIR%%%%VERSION%%/pkgIndex.tcl
-%%DATADIR%%%%VERSION%%/plstnd5.fnt
-%%DATADIR%%%%VERSION%%/plxtnd5.fnt
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/FileSelector.tcl
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/PLWin.itk
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/PLXWin.itk
@@ -396,12 +405,12 @@ libdata/pkgconfig/plplotd-f95.pc
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/pltools.tcl
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/plwidget.tcl
 %%TCLTK%%%%DATADIR%%%%VERSION%%/tcl/tclIndex
-%%DATADIR%%%%VERSION%%/usa.map
-%%DATADIR%%%%VERSION%%/usaglobe.map
 %%TCLTK%%@dirrm %%DATADIR%%%%VERSION%%/tcl
 %%TCLTK%%@dirrm %%DATADIR%%%%VERSION%%/examples/tk
 %%TCLTK%%@dirrm %%DATADIR%%%%VERSION%%/examples/tcl
-%%PYTHON%%@dirrm %%DATADIR%%%%VERSION%%/examples/python
+%%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/README.plplotcanvas
+%%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/plplotcanvas_animation.c
+%%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/plplotcanvas_demo.c
 @dirrm %%DATADIR%%%%VERSION%%/examples/f95
 @dirrm %%DATADIR%%%%VERSION%%/examples/f77
 @dirrm %%DATADIR%%%%VERSION%%/examples/c++