From nobody@FreeBSD.org  Tue Jul  3 23:52:09 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5C61516A469
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  3 Jul 2007 23:52:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CCA813C458
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  3 Jul 2007 23:52:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l63Nq924055330
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 3 Jul 2007 23:52:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l63Nq9uB055329;
	Tue, 3 Jul 2007 23:52:09 GMT
	(envelope-from nobody)
Message-Id: <200707032352.l63Nq9uB055329@www.freebsd.org>
Date: Tue, 3 Jul 2007 23:52:09 GMT
From: "Pedro F. Giffuni" <giffunip@tutopia.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update drivers for math/plplot
X-Send-Pr-Version: www-3.0

>Number:         114273
>Category:       ports
>Synopsis:       Update drivers for math/plplot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 04 00:00:08 GMT 2007
>Closed-Date:    Fri Jul 06 03:50:43 GMT 2007
>Last-Modified:  Fri Jul  6 04:00:11 GMT 2007
>Originator:     Pedro F. Giffuni
>Release:        6.2-Release
>Organization:
>Environment:
FreeBSD kakumen.cable.net.co 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Sat Jun 30 14:14:28 COT 2007     root@kakumen.cable.net.co:/usr/src/sys/amd64/compile/SMP  amd64
>Description:

- Added a dependency to devel/lasi to build the psttf driver on X.
- Added a WITH_GNOME knob to build the gcw driver and examples.
- reorder the pkg-plist a bit
- Buimped the PORTREVISION
>How-To-Repeat:
DISCLAIMER: I don't know much about GNOME.
>Fix:
patch:
diff -ru plplot.orig/Makefile plplot/Makefile
--- plplot.orig/Makefile	Mon Jul  2 22:41:51 2007
+++ plplot/Makefile	Tue Jul  3 14:39:41 2007
@@ -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 @@
 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 @@
 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 @@
 	@${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 -ru plplot.orig/pkg-plist plplot/pkg-plist
--- plplot.orig/pkg-plist	Mon Jul  2 22:41:51 2007
+++ plplot/pkg-plist	Tue Jul  3 14:27:24 2007
@@ -94,15 +94,21 @@
 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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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++


>Release-Note:
>Audit-Trail:

From: <pfgshield-freebsd@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/114273: Update drivers for math/plplot
Date: Wed, 4 Jul 2007 02:23:47 +0200 (CEST)

 Ugh..
 A minor fix.. when GNOME is not chosen, gcw must be disabled, otherwise it will
 build the extra driver upon detecting the gnome components. Here is an updated
 patch.
 
 diff -ru plplot.orig/Makefile plplot/Makefile
 --- plplot.orig/Makefile	Mon Jul  2 22:41:51 2007
 +++ plplot/Makefile	Tue Jul  3 19:16:43 2007
 @@ -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 @@
  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,15 @@
  PLIST_SUB+=	PYTHON="@comment "
  .endif
  
 +.if defined(WITH_GNOME)
 +.undef WITHOUT_X11
 +USE_GNOME=	libgnomeprintui libgnomeui
 +PLIST_SUB+=	GNOME=""
 +.else
 +PLIST_SUB+=	GNOME="@comment "
 +CONFIGURE_ARGS+=	--disable-gcw
 +.endif
 +
  .if defined(WITH_TCLTK)
  .undef WITHOUT_X11
  PKGNAMESUFFIX=	-tcltk
 @@ -102,6 +111,7 @@
  	@${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 -ru plplot.orig/pkg-plist plplot/pkg-plist
 --- plplot.orig/pkg-plist	Mon Jul  2 22:41:51 2007
 +++ plplot/pkg-plist	Tue Jul  3 19:13:07 2007
 @@ -94,15 +94,21 @@
  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 @@
  %%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 @@
  %%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 @@
  %%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 @@
  %%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++
 
 
 ---
      Pedro F. Giffuni
      M. Sc. Industrial Eng. University of Pittsburgh
      Mech. Eng.      Universidad Nacional de Colombia
 ---
 Yahoo is powered by FreeBSD    http://www.FreeBSD.org/
 
 
       ___________________________________ 
 L'email della prossima generazione? Puoi averla con la nuova Yahoo! Mail: http://it.docs.yahoo.com/nowyoucan.html
State-Changed-From-To: open->closed 
State-Changed-By: maho 
State-Changed-When: Fri Jul 6 03:50:29 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=114273 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/114273: commit references a PR
Date: Fri,  6 Jul 2007 03:50:21 +0000 (UTC)

 maho        2007-07-06 03:50:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/plplot          Makefile pkg-plist 
   Log:
   - 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
   
   Revision  Changes    Path
   1.46      +11 -2     ports/math/plplot/Makefile
   1.17      +23 -14    ports/math/plplot/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
