Attachment #131491 for bug #175579

View | Details | Raw Unified | Return to bug 175579
Collapse All | Expand All




# Created by: Thomas Gellekum <tg@FreeBSD.org>
# Date created:         03 Oct 1997
# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD: head/math/plplot/Makefile 300896 2012-07-14 13:54:48Z beat $
#

PORTNAME=	plplot
PORTVERSION=	5.9.9

MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Scientific plotting package

LICENSE=	LGPL21 # (or later)
		${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
		freetype.9:${PORTSDIR}/print/freetype2 \
		gd.4:${PORTSDIR}/graphics/gd \
		qhull.5:${PORTSDIR}/math/qhull5
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
		${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf

BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
LIB_DEPENDS=	LASi:${PORTSDIR}/devel/lasi \
		qhull:${PORTSDIR}/math/qhull5 \
		freetype:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
		${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf

OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
OPTIONS_DEFAULT=	THREADS X11

USE_AUTOTOOLS=	libltdl
USE_CMAKE=	yes
USE_PERL5_BUILD=yes
USE_GNOME=	pango
USE_PERL5_BUILD=yes
USE_GHOSTSCRIPT=yes
USE_CMAKE=	yes
CMAKE_ARGS=	-DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
		-DENABLE_pdl:BOOL=OFF -DENABLE_ada:BOOL=OFF \
		-DENABLE_d:BOOL=OFF -DENABLE_ocaml:BOOL=OFF \
		-DENABLE_pyqt4:BOOL=OFF \
		-DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \
		-DPLD_plmeta:BOOL=ON
USE_GMAKE=	yes
USE_AUTOTOOLS=	libltdl
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

MAN1=		plm2gif.1 plpr.1 pltek.1 plrender.1

FREEFONT_DIR=	${LOCALBASE}/lib/X11/fonts/freefont-ttf
CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
.endif

.include <bsd.port.options.mk>
PKGNAMESUFFIX=	-nox11
PLIST_SUB+=	X11="@comment "
.else
USE_XORG=	x11
LIB_DEPENDS+=	LASi.1:${PORTSDIR}/devel/lasi
PLIST_SUB+=	X11=""
.endif

.if ${PORT_OPTIONS:MFORTRAN}
PKGNAMESUFFIX=	-fortran
USE_FORTRAN=	yes
CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
PLIST_SUB+=	FORTRAN=""
.else
CMAKE_ARGS+=	-DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
PLIST_SUB+=	FORTRAN="@comment "
.endif

.if ${PORT_OPTIONS:MGD}
LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
CMAKE_ARGS+=	-DPLD_png:BOOL=ON
PLIST_SUB+=	GD=""
.else 
PLIST_SUB+=	GD="@comment "
.endif

.if ${PORT_OPTIONS:MLUA}
USE_LUA=	yes
CMAKE_ARGS+=	-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
PLIST_SUB+=	LUA="" LUA_MODLIBDIR="${LUA_MODLIBDIR:S,${LUA_PREFIX}/,,}"
.else
CMAKE_ARGS+=	-DENABLE_lua:BOOL=OFF 
PLIST_SUB+=	LUA="@comment "
.endif

.if ${PORT_OPTIONS:MPYTHON}
BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13 \
		${PYNUMPY}
RUN_DEPENDS+=	${PYNUMPY}
USE_PYTHON=	yes
PLIST_SUB+=	PYTHON=""
CONFIGURE_ENV+=	PYTHON_VERSION="${PYTHON_VERSION}"

PLIST_SUB+=	PYTHON="@comment "
.endif

.if ${PORT_OPTIONS:MTCLTK}
.if empty(PORT_OPTIONS:MX11)
IGNORE=		TCLTK needs X11 support
.endif
LIB_DEPENDS+=	itk:${PORTSDIR}/x11-toolkits/itk
USE_TK=		yes
CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
		-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
		-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
		-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
		-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
		-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk3.3" \
		-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
MAN1+=		plserver.1 pltcl.1
PLIST_SUB+=	TCLTK=""
.else
CMAKE_ARGS+=	-DENABLE_tcl:BOOL=OFF
PLIST_SUB+=	TCLTK="@comment "
.endif

.if empty(PORT_OPTIONS:MTHREADS)
CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MQT4}
USE_QT4=	corelib gui svg xml \
		moc_build qmake_build rcc_build uic_build
PLIST_SUB+=	QT4=""
PLIST_SUB+=	QT=""
.else
CMAKE_ARGS+=	-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
PLIST_SUB+=	QT4="@comment "
.endif

.if ${PORT_OPTIONS:MWXGTK}
LIB_DEPENDS+=	agg:${PORTSDIR}/graphics/agg
USE_WX=		2.6+
CMAKE_ARGS+=	-DPLD_wxpng:BOOL=ON \
		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
PLIST_SUB+=	WXGTK=""
.else
CMAKE_ARGS+=	-DENABLE_wxwidgets:BOOL=OFF
PLIST_SUB+=	WXGTK="@comment "
.endif

.if ${PORT_OPTIONS:MX11}
USE_XORG=	ice sm x11 xext
PLIST_SUB+=	X11=""
.else
CMAKE_ARGS+=	-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
PLIST_SUB+=	X11="@comment "
	@${ECHO_MSG} "	WITH_FORTRAN=yes	Turns on Fortran support"
	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python support"
	@${ECHO_MSG} "	WITH_QT=yes		Turns on Qt4 support"
	@${ECHO_MSG} "	WITH_TCLTK=yes		Turns on Tcl/Tk support"
	@${ECHO_MSG} ""

pre-configure:
	${REINPLACE_CMD} -e 's|/usr/share/fonts/truetype/freefont|${LOCALBASE}/lib/X11/fonts/freefont-ttf|'\
		${WRKSRC}/cmake/modules/freetype.cmake
.if defined(WITHOUT_X11)
	${REINPLACE_CMD} -e 's|^find_package(X11)|SET(X11_FOUND "FALSE")|' \
		${WRKSRC}/cmake/modules/plplot.cmake
.endif
.if defined(WITH_TCLTK)
	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \
		s|/usr/include|${LOCALBASE}/include|'		\
		${WRKSRC}/cmake/modules/FindTCL.cmake
	${REINPLACE_CMD} -e 's|%%ITCL_VER%%|${ITCL_VER}|'	\
		${WRKSRC}/cmake/modules/tcl-related.cmake
# To be removed when x11-toolkits/itk will be compatible with tk-8.5
. for fc in TCL Tclsh
	${REINPLACE_CMD} -e 's|8.5||g;s|85||g'	\
		${WRKSRC}/cmake/modules/Find${fc}.cmake
. endfor
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|dl dlopen|c dlopen|' \
		${WRKSRC}/cmake/modules/FindLTDL.cmake
	@${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
		${REINPLACE_CMD} -e \
		's|/usr/local|${LOCALBASE}|g'

.include <bsd.port.mk>




--- bindings/tk-x-plat/plplotter.c.orig
+++ bindings/tk-x-plat/plplotter.c
@@ -463,7 +463,7 @@
     PlPlotterFirstInit( (ClientData) plPlotterPtr );
     Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 );
 
-    interp->result = Tk_PathName( plPlotterPtr->tkwin );
+    Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE);
 
     return TCL_OK;
 }
@@ -2018,7 +2018,7 @@
 //
 // Results:
 //      The return value is a standard Tcl result.  If TCL_ERROR is
-//      returned, then interp->result contains an error message.
+//      returned, then Tcl_GetStringResult(interp) contains an error message.
 //
 // Side effects:
 //      Configuration information, such as text string, colors, font, etc.
@@ -2469,7 +2469,7 @@
         plr->at_bop = 0;
         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plPlotterPtr->bopCmd, interp->result );
+                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) );
     }
 
 // Signal eop if necessary
@@ -2479,7 +2479,7 @@
         plr->at_eop = 0;
         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plPlotterPtr->eopCmd, interp->result );
+                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
     }
 
     return result;
@@ -2491,7 +2491,7 @@
     {
         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plPlotterPtr->eopCmd, interp->result );
+                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
     }
 }
 
@@ -2501,7 +2501,7 @@
     {
         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plPlotterPtr->bopCmd, interp->result );
+                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) );
     }
 }
 
@@ -2536,7 +2536,7 @@
         {
         #endif
             Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n",
-                interp->result, (char *) NULL );
+                Tcl_GetStringResult(interp), (char *) NULL );
             return TCL_ERROR;
         }
 
@@ -3082,7 +3082,7 @@
 
     if ( argc == 0 )
     {
-        interp->result = "report what?";
+        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
         return TCL_ERROR;
     }
 
@@ -3093,7 +3093,7 @@
 
         if ( argc != 3 )
         {
-            interp->result = "Wrong # of args: report wc x y";
+            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
             return TCL_ERROR;
         }
 
@@ -3107,15 +3107,15 @@
 
         if ( plTranslateCursor( gin ) )
         {
-            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
+            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
             return TCL_OK;
         }
 
-        interp->result = "Cannot locate";
+        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
         return TCL_OK;
     }
 
-    interp->result = "nonsensical request.";
+    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
     return TCL_ERROR;
 }
 




--- bindings/tk/plframe.c.orig
+++ bindings/tk/plframe.c
@@ -484,7 +484,7 @@
         Tk_DestroyWindow( plFramePtr->tkwin );
         return TCL_ERROR;
     }
-    interp->result = Tk_PathName( plFramePtr->tkwin );
+    Tcl_SetResult(interp,(char*)Tk_PathName( plFramePtr->tkwin) ,TCL_VOLATILE);
 
     return TCL_OK;
 }
@@ -616,7 +616,7 @@
             {
                 bcb.cmd = PLESC_DOUBLEBUFFERING_QUERY;
                 pl_cmd( PLESC_DOUBLEBUFFERING, &bcb );
-                sprintf( interp->result, "%d", bcb.result );
+                sprintf( Tcl_GetStringResult(interp), "%d", bcb.result );
             }
         }
 
@@ -2215,7 +2215,7 @@
 //
 // Results:
 //	The return value is a standard Tcl result.  If TCL_ERROR is
-//	returned, then interp->result contains an error message.
+//	returned, then Tcl_GetStringResult(interp) contains an error message.
 //
 // Side effects:
 //	Configuration information, such as text string, colors, font, etc.
@@ -2675,7 +2675,7 @@
         plr->at_bop = 0;
         if ( Tcl_Eval( interp, plFramePtr->bopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plFramePtr->bopCmd, interp->result );
+                plFramePtr->bopCmd, Tcl_GetStringResult(interp) );
     }
 
 // Signal eop if necessary
@@ -2685,7 +2685,7 @@
         plr->at_eop = 0;
         if ( Tcl_Eval( interp, plFramePtr->eopCmd ) != TCL_OK )
             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-                plFramePtr->eopCmd, interp->result );
+                plFramePtr->eopCmd, Tcl_GetStringResult(interp) );
     }
 
     return result;
@@ -3275,7 +3275,7 @@
 
     if ( argc == 0 )
     {
-        interp->result = "report what?";
+        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
         return TCL_ERROR;
     }
 
@@ -3286,7 +3286,7 @@
 
         if ( argc != 3 )
         {
-            interp->result = "Wrong # of args: report wc x y";
+            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
             return TCL_ERROR;
         }
 
@@ -3300,15 +3300,15 @@
 
         if ( plTranslateCursor( gin ) )
         {
-            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
+            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
             return TCL_OK;
         }
 
-        interp->result = "Cannot locate";
+        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
         return TCL_OK;
     }
 
-    interp->result = "nonsensical request.";
+    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
     return TCL_ERROR;
 }
 
@@ -3324,7 +3324,7 @@
 
     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->bopCmd ) != TCL_OK )
         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-            plFramePtr->bopCmd, plFramePtr->interp->result );
+            plFramePtr->bopCmd, Tcl_GetStringResult(plFramePtr->interp) );
 }
 
 //--------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@
 
     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->eopCmd ) != TCL_OK )
         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
-            plFramePtr->eopCmd, plFramePtr->interp->result );
+            plFramePtr->eopCmd, Tcl_GetStringResult(plFramePtr->interp) );
 }
 
 //--------------------------------------------------------------------------




--- bindings/tk/plserver.c.orig
+++ bindings/tk/plserver.c
@@ -126,11 +126,11 @@
     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
              argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
     {
-        fprintf( stderr, "\n(plserver) %s\n\n", interp->result );
+        fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult(interp) );
         fprintf( stderr, "\
 The client_<xxx> and -child options should not be used except via the\n\
 PLplot/Tk driver.\n\n(wish) " );
-        if ( strncmp( interp->result, helpmsg, strlen( helpmsg ) ) )
+        if ( strncmp( Tcl_GetStringResult(interp), helpmsg, strlen( helpmsg ) ) )
             exit( 1 );
     }
 
@@ -158,7 +158,7 @@
 //
 // Results:
 //	Returns a standard Tcl completion code, and leaves an error
-//	message in interp->result if an error occurs.
+//	message in Tcl_GetStringResult(interp) if an error occurs.
 //
 // Side effects:
 //	Depends on the startup script.
@@ -257,8 +257,8 @@
 
 // Print error message if one given
 
-    if ( interp->result != NULL && interp->result[0] != '\0' )
-        fprintf( stderr, "%s\n", interp->result );
+    if ( Tcl_GetStringResult(interp) != NULL && Tcl_GetStringResult(interp)[0] != '\0' )
+        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
 
 // Best to check the syntax before proceeding
 




--- bindings/tk/tkMain.c.orig
+++ bindings/tk/tkMain.c
@@ -85,17 +85,6 @@
 
 // From tclIntDecls.h
 
-#ifndef Tcl_Import_TCL_DECLARED
-EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
-                                     Tcl_Namespace * nsPtr, char * pattern,
-                                     int allowOverwrite ) );
-#endif
-
-#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
-EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
-                                                               Tcl_Interp * interp ) );
-#endif
-
 //
 // Declarations for various library procedures and variables (don't want
 // to include tkInt.h or tkConfig.h here, because people might copy this
@@ -180,7 +169,7 @@
 pltkMain( int argc, const char **argv, char *RcFileName,
           int ( *AppInit )( Tcl_Interp *interp ) )
 {
-    char       *args, *msg;
+    char       *args; const char *msg;
     const char *p;
     char       buf[20];
     int        code;
@@ -202,7 +191,7 @@
     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
          != TCL_OK )
     {
-        fprintf( stderr, "%s\n", interp->result );
+        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
         exit( 1 );
     }
     if ( name == NULL )
@@ -331,7 +320,7 @@
 
     if ( ( *AppInit )( interp ) != TCL_OK )
     {
-        fprintf( stderr, "(*AppInit) failed: %s\n", interp->result );
+        fprintf( stderr, "(*AppInit) failed: %s\n", Tcl_GetStringResult(interp) );
     }
 
     //
@@ -343,7 +332,7 @@
         code = Tcl_VarEval( interp, "wm geometry . ", geometry, (char *) NULL );
         if ( code != TCL_OK )
         {
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
         }
     }
 
@@ -393,7 +382,7 @@
             fullName = Tcl_TildeSubst( interp, RcFileName, &buffer );
             if ( fullName == NULL )
             {
-                fprintf( stderr, "%s\n", interp->result );
+                fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
             }
             else
             {
@@ -403,7 +392,7 @@
                     code = Tcl_EvalFile( interp, fullName );
                     if ( code != TCL_OK )
                     {
-                        fprintf( stderr, "%s\n", interp->result );
+                        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
                     }
                     fclose( f );
                 }
@@ -442,7 +431,7 @@
     msg = (char *) Tcl_GetVar( interp, "errorInfo", TCL_GLOBAL_ONLY );
     if ( msg == NULL )
     {
-        msg = interp->result;
+        msg = Tcl_GetStringResult(interp);
     }
     fprintf( stderr, "%s\n", msg );
     Tcl_Eval( interp, errorExitCmd );
@@ -535,11 +524,11 @@
     Tk_CreateFileHandler( 0, TK_READABLE, StdinProc, (ClientData) 0 );
 #endif
     Tcl_DStringFree( &command );
-    if ( *interp->result != 0 )
+    if ( Tcl_GetStringResult(interp) )
     {
         if ( ( code != TCL_OK ) || ( tty ) )
         {
-            printf( "%s\n", interp->result );
+            printf( "%s\n", Tcl_GetStringResult(interp) );
         }
     }
 
@@ -599,7 +588,7 @@
         {
             Tcl_AddErrorInfo( interp,
                 "\n    (script that generates prompt)" );
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
             goto defaultPrompt;
         }
     }

Line 0 Link Here

(-)math/plplot/files/patch-bindings__tk__tkshell.c (+11 lines)
	1	--- bindings/tk/tkshell.c.orig
	2	+++ bindings/tk/tkshell.c
	3	@@ -115,7 +115,7 @@
	4	if ( Tcl_ExprBoolean( interp, argv[1], &result ) )
	5	{
	6	fprintf( stderr, "wait_until command \"%s\" failed:\n\t %s\n",
	7	- argv[1], interp->result );
	8	+ argv[1], Tcl_GetStringResult(interp) );
	9	break;
	10	}
	11	if ( result )




--- cmake/modules/tcl-related.cmake.orig	2009-09-06 21:04:43.000000000 +0200
+++ cmake/modules/tcl-related.cmake	2009-12-25 17:44:43.000000000 +0100
@@ -98,11 +98,13 @@
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
 	OUTPUT_VARIABLE itcl_library_versions)
         message(STATUS "Looking for itcl.h")
-        find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
+        find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}/../itcl%%ITCL_VER%%)
         if(ITCL_INCLUDE_PATH)
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
 	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
+          find_library(ITCL_LIBRARY itcl PATHS ${TCL_LIBRARY_PATH}
+              PATH_SUFFIXES itcl)
           set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
@@ -158,11 +160,12 @@
     endif(ENABLE_tk)
     if(ENABLE_itk)
       message(STATUS "Looking for itk.h")
-      find_path(ITK_INCLUDE_PATH itk.h ${TK_INCLUDE_PATH})
+      find_path(ITK_INCLUDE_PATH itk.h ${TCL_INCLUDE_PATH}/../itk%%ITCL_VER%%)
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        find_library(ITK_LIBRARY itk PATH_SUFFIXES itk)
+        set(itk_library_versions "" 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
         foreach(version ${itk_library_versions})
           find_library(ITK_LIBRARY itk${version}
             PATH_SUFFIXES itk${version})




--- doc/docbook/src/plplotdoc.texi.orig
+++ doc/docbook/src/plplotdoc.texi
@@ -6722,7 +6722,7 @@
 	if (pm->fdata[i] > max)
 	max = pm->fdata[i];
 
-	sprintf( interp->result, "%f", max );
+	sprintf( Tcl_GetStringResult(interp), "%f", max );
 	return TCL_OK;
 	@}
 
@@ -6735,7 +6735,7 @@
 	if (pm->fdata[i] < min)
 	min = pm->fdata[i];
 
-	sprintf( interp->result, "%f", min );
+	sprintf( Tcl_GetStringResult(interp), "%f", min );
 	return TCL_OK;
 	@}
       




--- doc/docbook/src/tcl.xml.orig
+++ doc/docbook/src/tcl.xml
@@ -576,7 +576,7 @@
 	if (pm->fdata[i] > max)
 	max = pm->fdata[i];
 
-	sprintf( interp->result, "%f", max );
+	sprintf( Tcl_GetStringResult(interp), "%f", max );
 	return TCL_OK;
 	}
 
@@ -589,7 +589,7 @@
 	if (pm->fdata[i] &lt; min)
 	min = pm->fdata[i];
 
-	sprintf( interp->result, "%f", min );
+	sprintf( Tcl_GetStringResult(interp), "%f", min );
 	return TCL_OK;
 	}
       </programlisting>




--- drivers/ntk.c.orig
+++ drivers/ntk.c
@@ -115,7 +115,7 @@
         //
         sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
         if ( Tcl_Eval( interp, scmd ) != TCL_OK )
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
     }
 }
 
@@ -264,7 +264,7 @@
         sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
         if ( Tcl_Eval( interp, cmd ) != TCL_OK )
         {
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
             plexit( "No such tk server." );
         }
     }
@@ -301,7 +301,7 @@
     // Set up device parameters
 
     Tcl_Eval( interp, "tk scaling" ); // pixels per mm
-    ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
+    ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
     plP_setpxl( ppm, ppm );
     plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
 }
@@ -371,11 +371,11 @@
         {
             tk_cmd( "update" );
             tk_cmd( "info exists keypress" );
-            sscanf( interp->result, "%d", &st );
+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
         }
 
         tk_cmd( "set keypress" );
-        sscanf( interp->result, "%d", &key );
+        sscanf( Tcl_GetStringResult(interp), "%d", &key );
 //fprintf(stderr,"\n%d\n", key);fflush(stderr);
         tk_cmd( "unset keypress" );
         st = 0;
@@ -433,7 +433,7 @@
         {
             tk_cmd( "update" );
             tk_cmd( "winfo exists $plf.f2.c$ccanv" );
-            sscanf( interp->result, "%d", &st );
+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
         }
         st = 0;
         // this give a "Segmentation fault", even after checking for the canvas!
@@ -450,16 +450,16 @@
     {
         tk_cmd( "update" );
         tk_cmd( "info exists xloc" );
-        sscanf( interp->result, "%d", &st );
+        sscanf( Tcl_GetStringResult(interp), "%d", &st );
     }
     tk_cmd( "set xloc" );
-    sscanf( interp->result, "%d", &gin.pX );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
     tk_cmd( "set yloc" );
-    sscanf( interp->result, "%d", &gin.pY );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
     tk_cmd( "set bloc" );
-    sscanf( interp->result, "%d", &gin.button );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
     tk_cmd( "set sloc" );
-    sscanf( interp->result, "%d", &gin.state );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
 
     gin.dX = (PLFLT) gin.pX / xmax;
     gin.dY = 1. - (PLFLT) gin.pY / ymax;




--- drivers/tk.c.orig
+++ drivers/tk.c
@@ -764,7 +764,7 @@
 
     if ( Tcl_Init( dev->interp ) != TCL_OK )
     {
-        fprintf( stderr, "%s\n", dev->interp->result );
+        fprintf( stderr, "%s\n", Tcl_GetStringResult(dev->interp) );
         abort_session( pls, "Unable to initialize Tcl" );
     }
 
@@ -1568,7 +1568,7 @@
                  0, 1, ( ClientData ) & iodev->file ) != TCL_OK )
         {
             fprintf( stderr, "Cannot get file info:\n\t %s\n",
-                dev->interp->result );
+                Tcl_GetStringResult(dev->interp) );
             abort_session( pls, "" );
         }
         iodev->fd = fileno( iodev->file );
@@ -1673,7 +1673,7 @@
         if ( pl_PacketSend( dev->interp, dev->iodev, pls->pdfs ) )
         {
             fprintf( stderr, "Packet send failed:\n\t %s\n",
-                dev->interp->result );
+                Tcl_GetStringResult(dev->interp) );
             abort_session( pls, "" );
         }
         pdfs->bp = 0;
@@ -2131,7 +2131,7 @@
 
     if ( Tk_Init( interp ) )
     {
-        fprintf( stderr, "tk_init:%s\n", interp->result );
+        fprintf( stderr, "tk_init:%s\n", Tcl_GetStringResult(interp) );
         return 1;
     }
 
@@ -2165,7 +2165,7 @@
         if ( Tcl_ExprBoolean( dev->interp, dev->cmdbuf, &result ) )
         {
             fprintf( stderr, "tk_wait command \"%s\" failed:\n\t %s\n",
-                cmd, dev->interp->result );
+                cmd, Tcl_GetStringResult(dev->interp) );
             break;
         }
         if ( result )
@@ -2225,7 +2225,7 @@
     if ( result != TCL_OK )
     {
         fprintf( stderr, "Server command \"%s\" failed:\n\t %s\n",
-            cmd, dev->interp->result );
+            cmd, Tcl_GetStringResult(dev->interp) );
         abort_session( pls, "" );
     }
 }
@@ -2247,7 +2247,7 @@
     if ( Tcl_VarEval( dev->interp, cmd, (char **) NULL ) != TCL_OK )
     {
         fprintf( stderr, "TCL command \"%s\" failed:\n\t %s\n",
-            cmd, dev->interp->result );
+            cmd, Tcl_GetStringResult(dev->interp) );
         abort_session( pls, "" );
     }
 }

Line 0 Link Here

(-)math/plplot/files/patch-examples__python__CMakeLists.txt (+11 lines)
	1	--- examples/python/CMakeLists.txt.orig
	2	+++ examples/python/CMakeLists.txt
	3	@@ -241,7 +241,7 @@
	4	@ONLY
	5	)
	6
	7	- set(python_location1 ${PYTHON_INSTDIR})
	8	+ set(python_location1)
	9	set(python_location2)
	10	set(python_location3)
	11	set(python_location4)

Line 0 Link Here

(-)math/plplot/files/patch-examples__tk__xtk01.c (+11 lines)
	1	--- examples/tk/xtk01.c.orig
	2	+++ examples/tk/xtk01.c
	3	@@ -53,7 +53,7 @@
	4	//
	5	// Results:
	6	// Returns a standard Tcl completion code, and leaves an error
	7	-// message in interp->result if an error occurs.
	8	+// message in Tcl_GetStringResult(interp) if an error occurs.
	9	//
	10	// Side effects:
	11	// Depends on the startup script.




--- examples/tk/xtk02.c.orig
+++ examples/tk/xtk02.c
@@ -49,7 +49,7 @@
         pm->fdata[i] = y;
     }
 
-    interp->result = "Things are cool in gumbyville.";
+    Tcl_SetResult(interp,(char*)"Things are cool in gumbyville.",TCL_VOLATILE);
     return TCL_OK;
 }
 
@@ -82,7 +82,7 @@
 //
 // Results:
 //	Returns a standard Tcl completion code, and leaves an error
-//	message in interp->result if an error occurs.
+//	message in Tcl_GetStringResult(interp) if an error occurs.
 //
 // Side effects:
 //	Depends on the startup script.




--- examples/tk/xtk04.c.orig
+++ examples/tk/xtk04.c
@@ -35,7 +35,7 @@
         if ( pm->fdata[i] > max )
             max = pm->fdata[i];
 
-    sprintf( interp->result, "%f", max );
+    sprintf( Tcl_GetStringResult(interp), "%f", max );
     return TCL_OK;
 }
 
@@ -48,7 +48,7 @@
         if ( pm->fdata[i] < min )
             min = pm->fdata[i];
 
-    sprintf( interp->result, "%f", min );
+    sprintf( Tcl_GetStringResult(interp), "%f", min );
     return TCL_OK;
 }
 
@@ -80,7 +80,7 @@
 //
 // Results:
 //	Returns a standard Tcl completion code, and leaves an error
-//	message in interp->result if an error occurs.
+//	message in Tcl_GetStringResult(interp) if an error occurs.
 //
 // Side effects:
 //	Depends on the startup script.
@@ -158,7 +158,7 @@
 
     if ( pm->dim != 2 )
     {
-        interp->result = "must use 2-d matrix.";
+        Tcl_SetResult(interp,(char*)"must use 2-d matrix.",TCL_VOLATILE);
         return TCL_ERROR;
     }
 




--- plplot_test/CMakeLists.txt.orig
+++ plplot_test/CMakeLists.txt
@@ -387,12 +387,6 @@
       )
   endif(PLD_pdfqt)
 
-  if(PLD_pdf)
-    add_test(examples_pdf
-      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
-      )
-  endif(PLD_pdf)
-
   if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
     configure_file(
       test_diff.sh.in




--- scripts/CMakeLists.txt.orig
+++ scripts/CMakeLists.txt
@@ -28,9 +28,9 @@
     )
   endif(PLD_plmeta)
   if(PLD_pstex)
-    set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
+    set(scripts_SCRIPTS "${scripts_SCRIPTS}" pstex2eps)
   endif(PLD_pstex)
-  if (NOT ${scripts_SCRIPTS} STREQUAL "")
+  if (NOT "${scripts_SCRIPTS}" STREQUAL "")
     install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
   endif (NOT ${scripts_SCRIPTS} STREQUAL "")
 endif(HAVE_BASH)

Line 0 Link Here

(-)math/plplot/files/patch-util__pltcl.c (+11 lines)
	1	--- utils/pltcl.c.orig
	2	+++ utils/pltcl.c
	3	@@ -119,7 +119,7 @@
	4	//
	5	// Results:
	6	// Returns a standard Tcl completion code, and leaves an error
	7	-// message in interp->result if an error occurs.
	8	+// message in Tcl_GetStringResult(interp) if an error occurs.
	9	//
	10	// Side effects:
	11	// Depends on the startup script.

Lines 1-7 Link Here

(-)math/plplot/pkg-plist (-18 / +119 lines)
		1	bin/plm2gif
		2	bin/plpr
		3	bin/plrender
1	%%TCLTK%%bin/plserver	4	%%TCLTK%%bin/plserver
2	%%TCLTK%%bin/pltcl	5	%%TCLTK%%bin/pltcl
3	bin/pltek	6	bin/pltek
4	bin/plrender
5	include/plplot/disptab.h	7	include/plplot/disptab.h
6	include/plplot/drivers.h	8	include/plplot/drivers.h
7	include/plplot/gcw.h	9	include/plplot/gcw.h
Lines 21-27 Link Here
21	include/plplot/plxwd.h	23	include/plplot/plxwd.h
22	include/plplot/qsastime.h	24	include/plplot/qsastime.h
23	include/plplot/qsastimedll.h	25	include/plplot/qsastimedll.h
24	%%QT%%include/plplot/qt.h	26	%%QT4%%include/plplot/qt.h
		27	%%WXGTK%%include/plplot/wxPLplotstream.h
		28	%%WXGTK%%include/plplot/wxPLplotwindow.h
25	%%TCLTK%%include/plplot/tclMatrix.h	29	%%TCLTK%%include/plplot/tclMatrix.h
26	%%FORTRAN%%lib/fortran/modules/plplot/plplot.mod	30	%%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
27	%%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod	31	%%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod
Lines 42-63 Link Here
42	%%FORTRAN%%lib/libplplotf77cd.so.9	46	%%FORTRAN%%lib/libplplotf77cd.so.9
43	%%FORTRAN%%lib/libplplotf77cd.so.9.1.1	47	%%FORTRAN%%lib/libplplotf77cd.so.9.1.1
44	%%FORTRAN%%lib/libplplotf77d.so	48	%%FORTRAN%%lib/libplplotf77d.so
		49	%%FORTRAN%%lib/libplplotf77d.so.9
		50	%%FORTRAN%%lib/libplplotf77d.so.9.1.1
45	%%FORTRAN%%lib/libplplotf95cd.so	51	%%FORTRAN%%lib/libplplotf95cd.so
46	%%FORTRAN%%lib/libplplotf95cd.so.9	52	%%FORTRAN%%lib/libplplotf95cd.so.9
47	%%FORTRAN%%lib/libplplotf95cd.so.9.1.1	53	%%FORTRAN%%lib/libplplotf95cd.so.9.1.1
48	%%FORTRAN%%lib/libplplotf95d.so	54	%%FORTRAN%%lib/libplplotf95d.so
49	%%QT%%lib/libplplotqtd.so	55	%%FORTRAN%%lib/libplplotf95d.so.9
50	%%QT%%lib/libplplotqtd.so.0	56	%%FORTRAN%%lib/libplplotf95d.so.9.1.1
51	%%QT%%lib/libplplotqtd.so.0.0.1	57	%%QT4%%lib/libplplotqtd.so
		58	%%QT4%%lib/libplplotqtd.so.0
		59	%%QT4%%lib/libplplotqtd.so.0.0.1
52	%%TCLTK%%lib/libplplottcltkd.so	60	%%TCLTK%%lib/libplplottcltkd.so
53	%%TCLTK%%lib/libplplottcltkd.so.9	61	%%TCLTK%%lib/libplplottcltkd.so.9
54	%%TCLTK%%lib/libplplottcltkd.so.9.2.0	62	%%TCLTK%%lib/libplplottcltkd.so.9.2.0
		63	%%WXGTK%%lib/libplplotwxwidgetsd.so
		64	%%WXGTK%%lib/libplplotwxwidgetsd.so.0
		65	%%WXGTK%%lib/libplplotwxwidgetsd.so.0.0.0
55	lib/libqsastime.so	66	lib/libqsastime.so
56	lib/libqsastime.so.0	67	lib/libqsastime.so.0
57	lib/libqsastime.so.0.0.1	68	lib/libqsastime.so.0.0.1
58	%%TCLTK%%lib/libtclmatrixd.so	69	%%TCLTK%%lib/libtclmatrixd.so
59	%%TCLTK%%lib/libtclmatrixd.so.9	70	%%TCLTK%%lib/libtclmatrixd.so.9
60	%%TCLTK%%lib/libtclmatrixd.so.9.2.0	71	%%TCLTK%%lib/libtclmatrixd.so.9.2.0
		72	%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
		73	lib/plplot/driversd/cairo.driver_info
		74	lib/plplot/driversd/cairo.so
		75	%%GD%%lib/plplot/driversd/gd.driver_info
		76	%%GD%%lib/plplot/driversd/gd.so
		77	lib/plplot/driversd/mem.driver_info
		78	lib/plplot/driversd/mem.so
		79	lib/plplot/driversd/null.driver_info
		80	lib/plplot/driversd/null.so
		81	lib/plplot/driversd/plmeta.driver_info
		82	lib/plplot/driversd/plmeta.so
		83	lib/plplot/driversd/ps.driver_info
		84	lib/plplot/driversd/ps.so
		85	lib/plplot/driversd/psttf.driver_info
		86	lib/plplot/driversd/psttf.so
		87	%%QT4%%lib/plplot/driversd/qt.driver_info
		88	%%QT4%%lib/plplot/driversd/qt.so
		89	lib/plplot/driversd/svg.driver_info
		90	lib/plplot/driversd/svg.so
		91	%%TCLTK%%lib/plplot/driversd/tk.driver_info
		92	%%TCLTK%%lib/plplot/driversd/tk.so
		93	%%TCLTK%%lib/plplot/driversd/tkwin.driver_info
		94	%%TCLTK%%lib/plplot/driversd/tkwin.so
		95	%%WXGTK%%lib/plplot/driversd/wxwidgets.driver_info
		96	%%WXGTK%%lib/plplot/driversd/wxwidgets.so
		97	lib/plplot/driversd/xfig.driver_info
		98	lib/plplot/driversd/xfig.so
		99	%%X11%%lib/plplot/driversd/xwin.driver_info
		100	%%X11%%lib/plplot/driversd/xwin.so
61	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py	101	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
62	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py	102	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
63	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so	103	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
Lines 67-74 Link Here
67	libdata/pkgconfig/plplotd-c++.pc	107	libdata/pkgconfig/plplotd-c++.pc
68	%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc	108	%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc
69	%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc	109	%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc
70	%%QT%%libdata/pkgconfig/plplotd-qt.pc	110	%%QT4%%libdata/pkgconfig/plplotd-qt.pc
71	%%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc	111	%%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
		112	%%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc
72	libdata/pkgconfig/plplotd.pc	113	libdata/pkgconfig/plplotd.pc
73	%%DOCSDIR%%/ABOUT	114	%%DOCSDIR%%/ABOUT
74	%%DOCSDIR%%/AUTHORS	115	%%DOCSDIR%%/AUTHORS
Lines 97-114 Link Here
97	%%DATADIR%%/cmap1_blue_yellow.pal	138	%%DATADIR%%/cmap1_blue_yellow.pal
98	%%DATADIR%%/cmap1_default.pal	139	%%DATADIR%%/cmap1_default.pal
99	%%DATADIR%%/cmap1_gray.pal	140	%%DATADIR%%/cmap1_gray.pal
100	%%DATADIR%%/cmap1_radar.pal
101	%%DATADIR%%/cmap1_highfreq.pal	141	%%DATADIR%%/cmap1_highfreq.pal
102	%%DATADIR%%/cmap1_lowfreq.pal	142	%%DATADIR%%/cmap1_lowfreq.pal
		143	%%DATADIR%%/cmap1_radar.pal
103	%%DATADIR%%/examples/CMakeLists.txt	144	%%DATADIR%%/examples/CMakeLists.txt
104	%%DATADIR%%/examples/Makefile	145	%%DATADIR%%/examples/Makefile
105	%%DATADIR%%/examples/c++/CMakeLists.txt	146	%%DATADIR%%/examples/c++/CMakeLists.txt
106	%%DATADIR%%/examples/c++/Makefile	147	%%DATADIR%%/examples/c++/Makefile
107	%%QT%%%%DATADIR%%/examples/c++/README.qt_example	148	%%QT4%%%%DATADIR%%/examples/c++/README.qt_example
108	%%DATADIR%%/examples/c++/plc++demos.h	149	%%DATADIR%%/examples/c++/plc++demos.h
109	%%QT%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp	150	%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
110	%%QT%%%%DATADIR%%/examples/c++/qt_PlotWindow.h	151	%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
111	%%QT%%%%DATADIR%%/examples/c++/qt_example.cpp	152	%%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
		153	%%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
112	%%DATADIR%%/examples/c++/x01.cc	154	%%DATADIR%%/examples/c++/x01.cc
113	%%DATADIR%%/examples/c++/x01cc.cc	155	%%DATADIR%%/examples/c++/x01cc.cc
114	%%DATADIR%%/examples/c++/x02.cc	156	%%DATADIR%%/examples/c++/x02.cc
Lines 184-195 Link Here
184	%%DATADIR%%/examples/c/x32c.c	226	%%DATADIR%%/examples/c/x32c.c
185	%%DATADIR%%/examples/c/x33c.c	227	%%DATADIR%%/examples/c/x33c.c
186	%%DATADIR%%/examples/c/x34c.c	228	%%DATADIR%%/examples/c/x34c.c
187	%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/CMakeFortranInformation.cmake
188	%%DATADIR%%/examples/cmake/modules/FindPkgConfig.cmake	229	%%DATADIR%%/examples/cmake/modules/FindPkgConfig.cmake
189	%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Cygwin-GNU-Fortran.cmake
190	%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-GNU-Fortran.cmake
191	%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-df.cmake
192	%%FORTRAN%%%%DATADIR%%/examples/cmake/modules/Platform/Windows-f90.cmake
193	%%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake	230	%%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
194	%%DATADIR%%/examples/cmake/modules/export_plplot.cmake	231	%%DATADIR%%/examples/cmake/modules/export_plplot.cmake
195	%%DATADIR%%/examples/cmake/modules/pkg-config.cmake	232	%%DATADIR%%/examples/cmake/modules/pkg-config.cmake
Lines 230-235 Link Here
230	%%FORTRAN%%%%DATADIR%%/examples/f77/x29f.f	267	%%FORTRAN%%%%DATADIR%%/examples/f77/x29f.f
231	%%FORTRAN%%%%DATADIR%%/examples/f77/x30f.f	268	%%FORTRAN%%%%DATADIR%%/examples/f77/x30f.f
232	%%FORTRAN%%%%DATADIR%%/examples/f77/x31f.f	269	%%FORTRAN%%%%DATADIR%%/examples/f77/x31f.f
		270	%%FORTRAN%%%%DATADIR%%/examples/f77/x33f.f
233	%%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt	271	%%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
234	%%FORTRAN%%%%DATADIR%%/examples/f95/Makefile	272	%%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
235	%%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc	273	%%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
Lines 265-273 Link Here
265	%%FORTRAN%%%%DATADIR%%/examples/f95/x29f.f90	303	%%FORTRAN%%%%DATADIR%%/examples/f95/x29f.f90
266	%%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90	304	%%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90
267	%%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90	305	%%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90
		306	%%FORTRAN%%%%DATADIR%%/examples/f95/x33f.f90
268	%%DATADIR%%/examples/lena.pgm	307	%%DATADIR%%/examples/lena.pgm
		308	%%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
		309	%%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
		310	%%LUA%%%%DATADIR%%/examples/lua/x01.lua
		311	%%LUA%%%%DATADIR%%/examples/lua/x02.lua
		312	%%LUA%%%%DATADIR%%/examples/lua/x03.lua
		313	%%LUA%%%%DATADIR%%/examples/lua/x04.lua
		314	%%LUA%%%%DATADIR%%/examples/lua/x05.lua
		315	%%LUA%%%%DATADIR%%/examples/lua/x06.lua
		316	%%LUA%%%%DATADIR%%/examples/lua/x07.lua
		317	%%LUA%%%%DATADIR%%/examples/lua/x08.lua
		318	%%LUA%%%%DATADIR%%/examples/lua/x09.lua
		319	%%LUA%%%%DATADIR%%/examples/lua/x10.lua
		320	%%LUA%%%%DATADIR%%/examples/lua/x11.lua
		321	%%LUA%%%%DATADIR%%/examples/lua/x12.lua
		322	%%LUA%%%%DATADIR%%/examples/lua/x13.lua
		323	%%LUA%%%%DATADIR%%/examples/lua/x14.lua
		324	%%LUA%%%%DATADIR%%/examples/lua/x15.lua
		325	%%LUA%%%%DATADIR%%/examples/lua/x16.lua
		326	%%LUA%%%%DATADIR%%/examples/lua/x17.lua
		327	%%LUA%%%%DATADIR%%/examples/lua/x18.lua
		328	%%LUA%%%%DATADIR%%/examples/lua/x19.lua
		329	%%LUA%%%%DATADIR%%/examples/lua/x20.lua
		330	%%LUA%%%%DATADIR%%/examples/lua/x21.lua
		331	%%LUA%%%%DATADIR%%/examples/lua/x22.lua
		332	%%LUA%%%%DATADIR%%/examples/lua/x23.lua
		333	%%LUA%%%%DATADIR%%/examples/lua/x24.lua
		334	%%LUA%%%%DATADIR%%/examples/lua/x25.lua
		335	%%LUA%%%%DATADIR%%/examples/lua/x26.lua
		336	%%LUA%%%%DATADIR%%/examples/lua/x27.lua
		337	%%LUA%%%%DATADIR%%/examples/lua/x28.lua
		338	%%LUA%%%%DATADIR%%/examples/lua/x29.lua
		339	%%LUA%%%%DATADIR%%/examples/lua/x30.lua
		340	%%LUA%%%%DATADIR%%/examples/lua/x31.lua
		341	%%LUA%%%%DATADIR%%/examples/lua/x33.lua
269	%%DATADIR%%/examples/plplot-test-interactive.sh	342	%%DATADIR%%/examples/plplot-test-interactive.sh
270	%%DATADIR%%/examples/plplot-test.sh	343	%%DATADIR%%/examples/plplot-test.sh
		344	%%PYTHON%%%%DATADIR%%/examples/python/CMakeLists.txt
271	%%PYTHON%%%%DATADIR%%/examples/python/README.logo	345	%%PYTHON%%%%DATADIR%%/examples/python/README.logo
272	%%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos	346	%%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos
273	%%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests	347	%%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests
Lines 276-284 Link Here
276	%%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py	350	%%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py
277	%%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py	351	%%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py
278	%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo	352	%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo
279	%%PYTHON%%%%DATADIR%%/examples/python/svg_760x120_gradient.patch	353	%%PYTHON%%%%DATADIR%%/examples/python/test_axis_precision.py
280	%%PYTHON%%%%DATADIR%%/examples/python/test_circle.py	354	%%PYTHON%%%%DATADIR%%/examples/python/test_circle.py
		355	%%PYTHON%%%%DATADIR%%/examples/python/test_fill.py
		356	%%PYTHON%%%%DATADIR%%/examples/python/test_gradient.py
		357	%%PYTHON%%%%DATADIR%%/examples/python/test_hebrew_diacritic.py
		358	%%PYTHON%%%%DATADIR%%/examples/python/test_plplot_encodings.py
		359	%%PYTHON%%%%DATADIR%%/examples/python/test_plsmem.py
		360	%%PYTHON%%%%DATADIR%%/examples/python/test_style.py
281	%%PYTHON%%%%DATADIR%%/examples/python/test_superscript_subscript.py	361	%%PYTHON%%%%DATADIR%%/examples/python/test_superscript_subscript.py
		362	%%PYTHON%%%%DATADIR%%/examples/python/test_symbol_clip.py
		363	%%PYTHON%%%%DATADIR%%/examples/python/test_type1.py
282	%%PYTHON%%%%DATADIR%%/examples/python/testh.py	364	%%PYTHON%%%%DATADIR%%/examples/python/testh.py
283	%%PYTHON%%%%DATADIR%%/examples/python/x01	365	%%PYTHON%%%%DATADIR%%/examples/python/x01
284	%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py	366	%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py
Lines 330-335 Link Here
330	%%PYTHON%%%%DATADIR%%/examples/python/x29	412	%%PYTHON%%%%DATADIR%%/examples/python/x29
331	%%PYTHON%%%%DATADIR%%/examples/python/x30	413	%%PYTHON%%%%DATADIR%%/examples/python/x30
332	%%PYTHON%%%%DATADIR%%/examples/python/x31	414	%%PYTHON%%%%DATADIR%%/examples/python/x31
		415	%%PYTHON%%%%DATADIR%%/examples/python/x33
333	%%PYTHON%%%%DATADIR%%/examples/python/xw01.py	416	%%PYTHON%%%%DATADIR%%/examples/python/xw01.py
334	%%PYTHON%%%%DATADIR%%/examples/python/xw02.py	417	%%PYTHON%%%%DATADIR%%/examples/python/xw02.py
335	%%PYTHON%%%%DATADIR%%/examples/python/xw03.py	418	%%PYTHON%%%%DATADIR%%/examples/python/xw03.py
Lines 361-371 Link Here
361	%%PYTHON%%%%DATADIR%%/examples/python/xw29.py	444	%%PYTHON%%%%DATADIR%%/examples/python/xw29.py
362	%%PYTHON%%%%DATADIR%%/examples/python/xw30.py	445	%%PYTHON%%%%DATADIR%%/examples/python/xw30.py
363	%%PYTHON%%%%DATADIR%%/examples/python/xw31.py	446	%%PYTHON%%%%DATADIR%%/examples/python/xw31.py
		447	%%PYTHON%%%%DATADIR%%/examples/python/xw33.py
		448	%%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt
364	%%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos	449	%%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos
365	%%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl	450	%%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl
366	%%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat	451	%%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat
367	%%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl	452	%%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl
368	%%TCLTK%%%%DATADIR%%/examples/tcl/r.dat	453	%%TCLTK%%%%DATADIR%%/examples/tcl/r.dat
		454	%%TCLTK%%%%DATADIR%%/examples/tcl/standard_examples.in
369	%%TCLTK%%%%DATADIR%%/examples/tcl/stats.log	455	%%TCLTK%%%%DATADIR%%/examples/tcl/stats.log
370	%%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex	456	%%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex
371	%%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl	457	%%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl
Lines 431-455 Link Here
431	%%TCLTK%%%%DATADIR%%/examples/tcl/x30.tcl	517	%%TCLTK%%%%DATADIR%%/examples/tcl/x30.tcl
432	%%TCLTK%%%%DATADIR%%/examples/tcl/x31	518	%%TCLTK%%%%DATADIR%%/examples/tcl/x31
433	%%TCLTK%%%%DATADIR%%/examples/tcl/x31.tcl	519	%%TCLTK%%%%DATADIR%%/examples/tcl/x31.tcl
		520	%%TCLTK%%%%DATADIR%%/examples/tcl/x33
		521	%%TCLTK%%%%DATADIR%%/examples/tcl/x33.tcl
434	%%DATADIR%%/examples/test_c.sh	522	%%DATADIR%%/examples/test_c.sh
435	%%DATADIR%%/examples/test_c_interactive.sh	523	%%DATADIR%%/examples/test_c_interactive.sh
436	%%DATADIR%%/examples/test_cxx.sh	524	%%DATADIR%%/examples/test_cxx.sh
437	%%DATADIR%%/examples/test_diff.sh	525	%%DATADIR%%/examples/test_diff.sh
438	%%FORTRAN%%%%DATADIR%%/examples/test_f77.sh	526	%%FORTRAN%%%%DATADIR%%/examples/test_f77.sh
439	%%FORTRAN%%%%DATADIR%%/examples/test_f95.sh	527	%%FORTRAN%%%%DATADIR%%/examples/test_f95.sh
		528	%%LUA%%%%DATADIR%%/examples/test_lua.sh
440	%%PYTHON%%%%DATADIR%%/examples/test_python.sh	529	%%PYTHON%%%%DATADIR%%/examples/test_python.sh
441	%%TCLTK%%%%DATADIR%%/examples/test_tcl.sh	530	%%TCLTK%%%%DATADIR%%/examples/test_tcl.sh
442	%%TCLTK%%%%DATADIR%%/examples/tk/CMakeLists.txt	531	%%TCLTK%%%%DATADIR%%/examples/tk/CMakeLists.txt
443	%%TCLTK%%%%DATADIR%%/examples/tk/Makefile	532	%%TCLTK%%%%DATADIR%%/examples/tk/Makefile
444	%%TCLTK%%%%DATADIR%%/examples/tk/README.tkdemos	533	%%TCLTK%%%%DATADIR%%/examples/tk/README.tkdemos
		534	%%TCLTK%%%%DATADIR%%/examples/tk/plgrid
		535	%%TCLTK%%%%DATADIR%%/examples/tk/plgrid.in
445	%%TCLTK%%%%DATADIR%%/examples/tk/plgrid.tcl	536	%%TCLTK%%%%DATADIR%%/examples/tk/plgrid.tcl
446	%%TCLTK%%%%DATADIR%%/examples/tk/runAllDemos.tcl	537	%%TCLTK%%%%DATADIR%%/examples/tk/runAllDemos.tcl
447	%%TCLTK%%%%DATADIR%%/examples/tk/runExtendedDemos.tcl	538	%%TCLTK%%%%DATADIR%%/examples/tk/runExtendedDemos.tcl
		539	%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples
		540	%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples.in
448	%%TCLTK%%%%DATADIR%%/examples/tk/tclIndex	541	%%TCLTK%%%%DATADIR%%/examples/tk/tclIndex
449	%%TCLTK%%%%DATADIR%%/examples/tk/tk01	542	%%TCLTK%%%%DATADIR%%/examples/tk/tk01
		543	%%TCLTK%%%%DATADIR%%/examples/tk/tk01.in
450	%%TCLTK%%%%DATADIR%%/examples/tk/tk02	544	%%TCLTK%%%%DATADIR%%/examples/tk/tk02
		545	%%TCLTK%%%%DATADIR%%/examples/tk/tk02.in
451	%%TCLTK%%%%DATADIR%%/examples/tk/tk03	546	%%TCLTK%%%%DATADIR%%/examples/tk/tk03
		547	%%TCLTK%%%%DATADIR%%/examples/tk/tk03.in
452	%%TCLTK%%%%DATADIR%%/examples/tk/tk04	548	%%TCLTK%%%%DATADIR%%/examples/tk/tk04
		549	%%TCLTK%%%%DATADIR%%/examples/tk/tk04.in
453	%%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl	550	%%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl
454	%%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl	551	%%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl
455	%%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl	552	%%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl
Lines 481-486 Link Here
481	%%TCLTK%%%%DATADIR%%/examples/tk/x28.tcl	578	%%TCLTK%%%%DATADIR%%/examples/tk/x28.tcl
482	%%TCLTK%%%%DATADIR%%/examples/tk/x29.tcl	579	%%TCLTK%%%%DATADIR%%/examples/tk/x29.tcl
483	%%TCLTK%%%%DATADIR%%/examples/tk/x30.tcl	580	%%TCLTK%%%%DATADIR%%/examples/tk/x30.tcl
		581	%%TCLTK%%%%DATADIR%%/examples/tk/x31.tcl
484	%%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c	582	%%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c
485	%%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c	583	%%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c
486	%%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c	584	%%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c
Lines 517-525 Link Here
517	%%TCLTK%%@dirrm %%DATADIR%%/examples/tk	615	%%TCLTK%%@dirrm %%DATADIR%%/examples/tk
518	%%TCLTK%%@dirrm %%DATADIR%%/examples/tcl	616	%%TCLTK%%@dirrm %%DATADIR%%/examples/tcl
519	%%PYTHON%%@dirrm %%DATADIR%%/examples/python	617	%%PYTHON%%@dirrm %%DATADIR%%/examples/python
		618	%%LUA%%@dirrm %%DATADIR%%/examples/lua
520	%%FORTRAN%%@dirrm %%DATADIR%%/examples/f95	619	%%FORTRAN%%@dirrm %%DATADIR%%/examples/f95
521	%%FORTRAN%%@dirrm %%DATADIR%%/examples/f77	620	%%FORTRAN%%@dirrm %%DATADIR%%/examples/f77
522	%%FORTRAN%%@dirrm %%DATADIR%%/examples/cmake/modules/Platform
523	@dirrm %%DATADIR%%/examples/cmake/modules	621	@dirrm %%DATADIR%%/examples/cmake/modules
524	@dirrm %%DATADIR%%/examples/cmake	622	@dirrm %%DATADIR%%/examples/cmake
525	@dirrm %%DATADIR%%/examples/c++	623	@dirrm %%DATADIR%%/examples/c++
Lines 527-530 Link Here
527	@dirrm %%DATADIR%%/examples	625	@dirrm %%DATADIR%%/examples
528	@dirrm %%DATADIR%%	626	@dirrm %%DATADIR%%
529	@dirrm %%DOCSDIR%%	627	@dirrm %%DOCSDIR%%
		628	@dirrm lib/plplot/driversd
		629	@dirrm lib/plplot
		630	%%LUA%%@dirrm %%LUA_MODLIBDIR%%/plplot
530	@dirrm include/plplot	631	@dirrm include/plplot

Return to bug 175579

Lines 1-9 Link Here

(-)math/plplot/Makefile (-94 / +97 lines)
1	# New ports collection makefile for: plplot	1	# Created by: Thomas Gellekum <tg@FreeBSD.org>
2	# Date created: 03 Oct 1997
3	# Whom: Thomas Gellekum <tg@FreeBSD.org>
4	#
5	# $FreeBSD: head/math/plplot/Makefile 300896 2012-07-14 13:54:48Z beat $	2	# $FreeBSD: head/math/plplot/Makefile 300896 2012-07-14 13:54:48Z beat $
6	#
7		3
8	PORTNAME= plplot	4	PORTNAME= plplot
9	PORTVERSION= 5.9.9	5	PORTVERSION= 5.9.9
Lines 12-73 Link Here
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
13		9
14	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
15	COMMENT= A scientific plotting package	11	COMMENT= Scientific plotting package
16		12
17	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \	13	LICENSE= LGPL21 # (or later)
18	${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
19	LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
20	freetype.9:${PORTSDIR}/print/freetype2 \
21	gd.4:${PORTSDIR}/graphics/gd \
22	qhull.5:${PORTSDIR}/math/qhull5
23	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
24	${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
25		14
26	BROKEN= does not configure	15	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
		16	${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
		17	LIB_DEPENDS= LASi:${PORTSDIR}/devel/lasi \
		18	qhull:${PORTSDIR}/math/qhull5 \
		19	freetype:${PORTSDIR}/print/freetype2
		20	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
		21	${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
		22
		23	OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
		24	OPTIONS_DEFAULT= THREADS X11
27		25
28	USE_AUTOTOOLS= libltdl
29	USE_CMAKE= yes
30	USE_PERL5_BUILD=yes
31	USE_GNOME= pango	26	USE_GNOME= pango
		27	USE_PERL5_BUILD=yes
32	USE_GHOSTSCRIPT=yes	28	USE_GHOSTSCRIPT=yes
33	CONFIGURE_ENV+= WITH_FREETYPE=ON	29	USE_CMAKE= yes
34	CPPFLAGS+= -I${LOCALBASE}/include	30	CMAKE_ARGS= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
35	LDFLAGS+= -L${LOCALBASE}/lib	31	-DENABLE_pdl:BOOL=OFF -DENABLE_ada:BOOL=OFF \
36	CMAKE_ARGS+= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \	32	-DENABLE_d:BOOL=OFF -DENABLE_ocaml:BOOL=OFF \
37	-DENABLE_ada:BOOL=OFF -DENABLE_d:BOOL=OFF \	33	-DENABLE_pyqt4:BOOL=OFF \
38	-DPLD_plmeta=ON	34	-DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \
39		35	-DPLD_plmeta:BOOL=ON
		36	USE_GMAKE= yes
		37	USE_AUTOTOOLS= libltdl
40	USE_LDCONFIG= yes	38	USE_LDCONFIG= yes
		39	MAKE_JOBS_SAFE= yes
41		40
42	MAN1= plm2gif.1 plpr.1 pltek.1 plrender.1	41	MAN1= plm2gif.1 plpr.1 pltek.1 plrender.1
43		42
44	.if !defined(WITHOUT_PTHREAD)	43	FREEFONT_DIR= ${LOCALBASE}/lib/X11/fonts/freefont-ttf
45	CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
46	.endif
47		44
48	.if defined(WITHOUT_X11)	45	.include <bsd.port.options.mk>
49	PKGNAMESUFFIX= -nox11
50	PLIST_SUB+= X11="@comment "
51	.else
52	USE_XORG= x11
53	LIB_DEPENDS+= LASi.1:${PORTSDIR}/devel/lasi
54	PLIST_SUB+= X11=""
55	.endif
56		46
57	.if defined(WITH_FORTRAN)	47	.if ${PORT_OPTIONS:MFORTRAN}
58	PKGNAMESUFFIX= -fortran
59	USE_FORTRAN= yes	48	USE_FORTRAN= yes
60	CONFIGURE_ENV+= CMAKE_Fortran_COMPILER=${FC}	49	CONFIGURE_ENV+= CMAKE_Fortran_COMPILER="${FC}"
61	PLIST_SUB+= FORTRAN=""	50	PLIST_SUB+= FORTRAN=""
62	.else	51	.else
63	CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF	52	CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
64	PLIST_SUB+= FORTRAN="@comment "	53	PLIST_SUB+= FORTRAN="@comment "
65	.endif	54	.endif
66		55
67	.if defined(WITH_PYTHON)	56	.if ${PORT_OPTIONS:MGD}
68	BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 \	57	LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd
69	f2py:${PORTSDIR}/math/py-numpy	58	CMAKE_ARGS+= -DPLD_png:BOOL=ON
70	RUN_DEPENDS+= f2py:${PORTSDIR}/math/py-numpy	59	PLIST_SUB+= GD=""
		60	.else
		61	PLIST_SUB+= GD="@comment "
		62	.endif
		63
		64	.if ${PORT_OPTIONS:MLUA}
		65	USE_LUA= yes
		66	CMAKE_ARGS+= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
		67	PLIST_SUB+= LUA="" LUA_MODLIBDIR="${LUA_MODLIBDIR:S,${LUA_PREFIX}/,,}"
		68	.else
		69	CMAKE_ARGS+= -DENABLE_lua:BOOL=OFF
		70	PLIST_SUB+= LUA="@comment "
		71	.endif
		72
		73	.if ${PORT_OPTIONS:MPYTHON}
		74	BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 \
		75	${PYNUMPY}
		76	RUN_DEPENDS+= ${PYNUMPY}
71	USE_PYTHON= yes	77	USE_PYTHON= yes
72	PLIST_SUB+= PYTHON=""	78	PLIST_SUB+= PYTHON=""
73	CONFIGURE_ENV+= PYTHON_VERSION="${PYTHON_VERSION}"	79	CONFIGURE_ENV+= PYTHON_VERSION="${PYTHON_VERSION}"
Lines 76-142 Link Here
76	PLIST_SUB+= PYTHON="@comment "	82	PLIST_SUB+= PYTHON="@comment "
77	.endif	83	.endif
78		84
79	.if defined(WITH_TCLTK)	85	.if ${PORT_OPTIONS:MTCLTK}
80	.undef WITHOUT_X11	86	.if empty(PORT_OPTIONS:MX11)
81	PKGNAMESUFFIX= -tcltk	87	IGNORE= TCLTK needs X11 support
82	LIB_DEPENDS+= itk.3:${PORTSDIR}/x11-toolkits/itk	88	.endif
83	USE_TK= 84	89	LIB_DEPENDS+= itk:${PORTSDIR}/x11-toolkits/itk
84	ITCL_VER= 3.3	90	USE_TK= yes
85	CONFIGURE_ENV+= ENABLE_tcl=TRUE ENABLE_tk=TRUE \	91	CMAKE_ARGS+= -DTCL_TCLSH:FILEPATH="${TCLSH}" \
86	ENABLE_itcl=TRUE ENABLE_itk=TRUE	92	-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
		93	-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
		94	-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
		95	-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
		96	-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk3.3" \
		97	-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
87	MAN1+= plserver.1 pltcl.1	98	MAN1+= plserver.1 pltcl.1
88	PLIST_SUB+= TCLTK=""	99	PLIST_SUB+= TCLTK=""
89	.else	100	.else
90	CMAKE_ARGS+= -DENABLE_tk:BOOL=OFF	101	CMAKE_ARGS+= -DENABLE_tcl:BOOL=OFF
91	PLIST_SUB+= TCLTK="@comment "	102	PLIST_SUB+= TCLTK="@comment "
92	.endif	103	.endif
93		104
94	.if defined(WITH_QT)	105	.if empty(PORT_OPTIONS:MTHREADS)
95	.undef WITHOUT_X11	106	CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
96	PKGNAMESUFFIX= -qt	107	.endif
97	USE_QT4= assistant assistantclient clucene corelib dbus \	108
98	designer doc gui help help-tools linguist moc \	109	.if ${PORT_OPTIONS:MQT4}
99	network opengl phonon qmake qt3support qtestlib \	110	USE_QT4= corelib gui svg xml \
100	rcc script scripttools sql svg uic uic3 webkit \	111	moc_build qmake_build rcc_build uic_build
101	xml xmlpatterns	112	PLIST_SUB+= QT4=""
102	PLIST_SUB+= QT=""
103	.else	113	.else
104	CMAKE_ARGS+= -DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON	114	CMAKE_ARGS+= -DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
105	PLIST_SUB+= QT="@comment "	115	PLIST_SUB+= QT4="@comment "
106	.endif	116	.endif
107		117
108	.include <bsd.port.pre.mk>	118	.if ${PORT_OPTIONS:MWXGTK}
		119	LIB_DEPENDS+= agg:${PORTSDIR}/graphics/agg
		120	USE_WX= 2.6+
		121	CMAKE_ARGS+= -DPLD_wxpng:BOOL=ON \
		122	-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
		123	PLIST_SUB+= WXGTK=""
		124	.else
		125	CMAKE_ARGS+= -DENABLE_wxwidgets:BOOL=OFF
		126	PLIST_SUB+= WXGTK="@comment "
		127	.endif
109		128
110	pre-everything::	129	.if ${PORT_OPTIONS:MX11}
111	@${ECHO_MSG} ""	130	USE_XORG= ice sm x11 xext
112	@${ECHO_MSG} "PLplot has the following tunable options:"	131	PLIST_SUB+= X11=""
113	@${ECHO_MSG} ""	132	.else
114	@${ECHO_MSG} " WITHOUT_PTHREAD=yes Turns off pthread support"	133	CMAKE_ARGS+= -DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
115	@${ECHO_MSG} " WITHOUT_X11=yes Turns off X11 support"	134	PLIST_SUB+= X11="@comment "
116	@${ECHO_MSG} " WITH_FORTRAN=yes Turns on Fortran support"
117	@${ECHO_MSG} " WITH_PYTHON=yes Turns on Python support"
118	@${ECHO_MSG} " WITH_QT=yes Turns on Qt4 support"
119	@${ECHO_MSG} " WITH_TCLTK=yes Turns on Tcl/Tk support"
120	@${ECHO_MSG} ""
121
122	pre-configure:
123	${REINPLACE_CMD} -e 's\|/usr/share/fonts/truetype/freefont\|${LOCALBASE}/lib/X11/fonts/freefont-ttf\|'\
124	${WRKSRC}/cmake/modules/freetype.cmake
125	.if defined(WITHOUT_X11)
126	${REINPLACE_CMD} -e 's\|^find_package(X11)\|SET(X11_FOUND "FALSE")\|' \
127	${WRKSRC}/cmake/modules/plplot.cmake
128	.endif
129	.if defined(WITH_TCLTK)
130	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|; \
131	s\|/usr/include\|${LOCALBASE}/include\|' \
132	${WRKSRC}/cmake/modules/FindTCL.cmake
133	${REINPLACE_CMD} -e 's\|%%ITCL_VER%%\|${ITCL_VER}\|' \
134	${WRKSRC}/cmake/modules/tcl-related.cmake
135	# To be removed when x11-toolkits/itk will be compatible with tk-8.5
136	. for fc in TCL Tclsh
137	${REINPLACE_CMD} -e 's\|8.5\|\|g;s\|85\|\|g' \
138	${WRKSRC}/cmake/modules/Find${fc}.cmake
139	. endfor
140	.endif	135	.endif
141		136
142	.include <bsd.port.post.mk>	137	post-patch:
		138	@${REINPLACE_CMD} -e \
		139	's\|dl dlopen\|c dlopen\|' \
		140	${WRKSRC}/cmake/modules/FindLTDL.cmake
		141	@${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules \| ${XARGS} \
		142	${REINPLACE_CMD} -e \
		143	's\|/usr/local\|${LOCALBASE}\|g'
		144
		145	.include <bsd.port.mk>

Line 0 Link Here

(-)math/plplot/files/patch-bindings__tk-x-plat__plolotter.c (+102 lines)
		1	--- bindings/tk-x-plat/plplotter.c.orig
		2	+++ bindings/tk-x-plat/plplotter.c
		3	@@ -463,7 +463,7 @@
		4	PlPlotterFirstInit( (ClientData) plPlotterPtr );
		5	Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 );
		6
		7	- interp->result = Tk_PathName( plPlotterPtr->tkwin );
		8	+ Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE);
		9
		10	return TCL_OK;
		11	}
		12	@@ -2018,7 +2018,7 @@
		13	//
		14	// Results:
		15	// The return value is a standard Tcl result. If TCL_ERROR is
		16	-// returned, then interp->result contains an error message.
		17	+// returned, then Tcl_GetStringResult(interp) contains an error message.
		18	//
		19	// Side effects:
		20	// Configuration information, such as text string, colors, font, etc.
		21	@@ -2469,7 +2469,7 @@
		22	plr->at_bop = 0;
		23	if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
		24	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		25	- plPlotterPtr->bopCmd, interp->result );
		26	+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) );
		27	}
		28
		29	// Signal eop if necessary
		30	@@ -2479,7 +2479,7 @@
		31	plr->at_eop = 0;
		32	if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
		33	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		34	- plPlotterPtr->eopCmd, interp->result );
		35	+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
		36	}
		37
		38	return result;
		39	@@ -2491,7 +2491,7 @@
		40	{
		41	if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
		42	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		43	- plPlotterPtr->eopCmd, interp->result );
		44	+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
		45	}
		46	}
		47
		48	@@ -2501,7 +2501,7 @@
		49	{
		50	if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
		51	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		52	- plPlotterPtr->bopCmd, interp->result );
		53	+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) );
		54	}
		55	}
		56
		57	@@ -2536,7 +2536,7 @@
		58	{
		59	#endif
		60	Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n",
		61	- interp->result, (char *) NULL );
		62	+ Tcl_GetStringResult(interp), (char *) NULL );
		63	return TCL_ERROR;
		64	}
65
66	@@ -3082,7 +3082,7 @@
67
68	if ( argc == 0 )
69	{
70	- interp->result = "report what?";
71	+ Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
72	return TCL_ERROR;
73	}
74
75	@@ -3093,7 +3093,7 @@
76
77	if ( argc != 3 )
78	{
79	- interp->result = "Wrong # of args: report wc x y";
80	+ Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
81	return TCL_ERROR;
82	}
83
84	@@ -3107,15 +3107,15 @@
85
86	if ( plTranslateCursor( gin ) )
87	{
88	- sprintf( interp->result, "%f %f", gin->wX, gin->wY );
89	+ sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
90	return TCL_OK;
91	}
92
93	- interp->result = "Cannot locate";
94	+ Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
95	return TCL_OK;
96	}
97
98	- interp->result = "nonsensical request.";
99	+ Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
100	return TCL_ERROR;
101	}
102

Line 0 Link Here

(-)math/plplot/files/patch-bindings__tk__plframe.c (+102 lines)
		1	--- bindings/tk/plframe.c.orig
		2	+++ bindings/tk/plframe.c
		3	@@ -484,7 +484,7 @@
		4	Tk_DestroyWindow( plFramePtr->tkwin );
		5	return TCL_ERROR;
		6	}
		7	- interp->result = Tk_PathName( plFramePtr->tkwin );
		8	+ Tcl_SetResult(interp,(char*)Tk_PathName( plFramePtr->tkwin) ,TCL_VOLATILE);
		9
		10	return TCL_OK;
		11	}
		12	@@ -616,7 +616,7 @@
		13	{
		14	bcb.cmd = PLESC_DOUBLEBUFFERING_QUERY;
		15	pl_cmd( PLESC_DOUBLEBUFFERING, &bcb );
		16	- sprintf( interp->result, "%d", bcb.result );
		17	+ sprintf( Tcl_GetStringResult(interp), "%d", bcb.result );
		18	}
		19	}
		20
		21	@@ -2215,7 +2215,7 @@
		22	//
		23	// Results:
		24	// The return value is a standard Tcl result. If TCL_ERROR is
		25	-// returned, then interp->result contains an error message.
		26	+// returned, then Tcl_GetStringResult(interp) contains an error message.
		27	//
		28	// Side effects:
		29	// Configuration information, such as text string, colors, font, etc.
		30	@@ -2675,7 +2675,7 @@
		31	plr->at_bop = 0;
		32	if ( Tcl_Eval( interp, plFramePtr->bopCmd ) != TCL_OK )
		33	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		34	- plFramePtr->bopCmd, interp->result );
		35	+ plFramePtr->bopCmd, Tcl_GetStringResult(interp) );
		36	}
		37
		38	// Signal eop if necessary
		39	@@ -2685,7 +2685,7 @@
		40	plr->at_eop = 0;
		41	if ( Tcl_Eval( interp, plFramePtr->eopCmd ) != TCL_OK )
		42	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
		43	- plFramePtr->eopCmd, interp->result );
		44	+ plFramePtr->eopCmd, Tcl_GetStringResult(interp) );
		45	}
		46
		47	return result;
		48	@@ -3275,7 +3275,7 @@
		49
		50	if ( argc == 0 )
		51	{
		52	- interp->result = "report what?";
		53	+ Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
		54	return TCL_ERROR;
		55	}
		56
		57	@@ -3286,7 +3286,7 @@
		58
		59	if ( argc != 3 )
		60	{
		61	- interp->result = "Wrong # of args: report wc x y";
		62	+ Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
		63	return TCL_ERROR;
		64	}
65
66	@@ -3300,15 +3300,15 @@
67
68	if ( plTranslateCursor( gin ) )
69	{
70	- sprintf( interp->result, "%f %f", gin->wX, gin->wY );
71	+ sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
72	return TCL_OK;
73	}
74
75	- interp->result = "Cannot locate";
76	+ Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
77	return TCL_OK;
78	}
79
80	- interp->result = "nonsensical request.";
81	+ Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
82	return TCL_ERROR;
83	}
84
85	@@ -3324,7 +3324,7 @@
86
87	if ( Tcl_Eval( plFramePtr->interp, plFramePtr->bopCmd ) != TCL_OK )
88	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
89	- plFramePtr->bopCmd, plFramePtr->interp->result );
90	+ plFramePtr->bopCmd, Tcl_GetStringResult(plFramePtr->interp) );
91	}
92
93	//--------------------------------------------------------------------------
94	@@ -3339,7 +3339,7 @@
95
96	if ( Tcl_Eval( plFramePtr->interp, plFramePtr->eopCmd ) != TCL_OK )
97	fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
98	- plFramePtr->eopCmd, plFramePtr->interp->result );
99	+ plFramePtr->eopCmd, Tcl_GetStringResult(plFramePtr->interp) );
100	}
101
102	//--------------------------------------------------------------------------

Line 0 Link Here

(-)math/plplot/files/patch-bindings__tk__plserver.c (+36 lines)
	1	--- bindings/tk/plserver.c.orig
	2	+++ bindings/tk/plserver.c
	3	@@ -126,11 +126,11 @@
	4	if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
	5	argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
	6	{
	7	- fprintf( stderr, "\n(plserver) %s\n\n", interp->result );
	8	+ fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult(interp) );
	9	fprintf( stderr, "\
	10	The client_<xxx> and -child options should not be used except via the\n\
	11	PLplot/Tk driver.\n\n(wish) " );
	12	- if ( strncmp( interp->result, helpmsg, strlen( helpmsg ) ) )
	13	+ if ( strncmp( Tcl_GetStringResult(interp), helpmsg, strlen( helpmsg ) ) )
	14	exit( 1 );
	15	}
	16
	17	@@ -158,7 +158,7 @@
	18	//
	19	// Results:
	20	// Returns a standard Tcl completion code, and leaves an error
	21	-// message in interp->result if an error occurs.
	22	+// message in Tcl_GetStringResult(interp) if an error occurs.
	23	//
	24	// Side effects:
	25	// Depends on the startup script.
	26	@@ -257,8 +257,8 @@
	27
	28	// Print error message if one given
	29
	30	- if ( interp->result != NULL && interp->result[0] != '\0' )
	31	- fprintf( stderr, "%s\n", interp->result );
	32	+ if ( Tcl_GetStringResult(interp) != NULL && Tcl_GetStringResult(interp)[0] != '\0' )
	33	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
	34
	35	// Best to check the syntax before proceeding
	36

Line 0 Link Here

(-)math/plplot/files/patch-bindings__tk__tkMain.c (+106 lines)
		1	--- bindings/tk/tkMain.c.orig
		2	+++ bindings/tk/tkMain.c
		3	@@ -85,17 +85,6 @@
		4
		5	// From tclIntDecls.h
		6
		7	-#ifndef Tcl_Import_TCL_DECLARED
		8	-EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
		9	- Tcl_Namespace * nsPtr, char * pattern,
		10	- int allowOverwrite ) );
		11	-#endif
		12	-
		13	-#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
		14	-EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
		15	- Tcl_Interp * interp ) );
		16	-#endif
		17	-
		18	//
		19	// Declarations for various library procedures and variables (don't want
		20	// to include tkInt.h or tkConfig.h here, because people might copy this
		21	@@ -180,7 +169,7 @@
		22	pltkMain( int argc, const char *argv, char RcFileName,
		23	int ( AppInit )( Tcl_Interp interp ) )
		24	{
		25	- char args, msg;
		26	+ char args; const char msg;
		27	const char *p;
		28	char buf[20];
		29	int code;
		30	@@ -202,7 +191,7 @@
		31	if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
		32	!= TCL_OK )
		33	{
		34	- fprintf( stderr, "%s\n", interp->result );
		35	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
		36	exit( 1 );
		37	}
		38	if ( name == NULL )
		39	@@ -331,7 +320,7 @@
		40
		41	if ( ( *AppInit )( interp ) != TCL_OK )
		42	{
		43	- fprintf( stderr, "(*AppInit) failed: %s\n", interp->result );
		44	+ fprintf( stderr, "(*AppInit) failed: %s\n", Tcl_GetStringResult(interp) );
		45	}
		46
		47	//
		48	@@ -343,7 +332,7 @@
		49	code = Tcl_VarEval( interp, "wm geometry . ", geometry, (char *) NULL );
		50	if ( code != TCL_OK )
		51	{
		52	- fprintf( stderr, "%s\n", interp->result );
		53	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
		54	}
		55	}
		56
		57	@@ -393,7 +382,7 @@
		58	fullName = Tcl_TildeSubst( interp, RcFileName, &buffer );
		59	if ( fullName == NULL )
		60	{
		61	- fprintf( stderr, "%s\n", interp->result );
		62	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
		63	}
		64	else
65	{
66	@@ -403,7 +392,7 @@
67	code = Tcl_EvalFile( interp, fullName );
68	if ( code != TCL_OK )
69	{
70	- fprintf( stderr, "%s\n", interp->result );
71	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
72	}
73	fclose( f );
74	}
75	@@ -442,7 +431,7 @@
76	msg = (char *) Tcl_GetVar( interp, "errorInfo", TCL_GLOBAL_ONLY );
77	if ( msg == NULL )
78	{
79	- msg = interp->result;
80	+ msg = Tcl_GetStringResult(interp);
81	}
82	fprintf( stderr, "%s\n", msg );
83	Tcl_Eval( interp, errorExitCmd );
84	@@ -535,11 +524,11 @@
85	Tk_CreateFileHandler( 0, TK_READABLE, StdinProc, (ClientData) 0 );
86	#endif
87	Tcl_DStringFree( &command );
88	- if ( *interp->result != 0 )
89	+ if ( Tcl_GetStringResult(interp) )
90	{
91	if ( ( code != TCL_OK ) \|\| ( tty ) )
92	{
93	- printf( "%s\n", interp->result );
94	+ printf( "%s\n", Tcl_GetStringResult(interp) );
95	}
96	}
97
98	@@ -599,7 +588,7 @@
99	{
100	Tcl_AddErrorInfo( interp,
101	"\n (script that generates prompt)" );
102	- fprintf( stderr, "%s\n", interp->result );
103	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
104	goto defaultPrompt;
105	}
106	}

Lines 1-32 Link Here

(-)math/plplot/files/patch-cmake_modules_tcl-related.cmake (-32 lines)
1	--- cmake/modules/tcl-related.cmake.orig 2009-09-06 21:04:43.000000000 +0200
2	+++ cmake/modules/tcl-related.cmake 2009-12-25 17:44:43.000000000 +0100
3	@@ -98,11 +98,13 @@
4	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
5	OUTPUT_VARIABLE itcl_library_versions)
6	message(STATUS "Looking for itcl.h")
7	- find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
8	+ find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}/../itcl%%ITCL_VER%%)
9	if(ITCL_INCLUDE_PATH)
10	message(STATUS "Looking for itcl.h - found")
11	message(STATUS "Looking for itcl library")
12	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
13	+ find_library(ITCL_LIBRARY itcl PATHS ${TCL_LIBRARY_PATH}
14	+ PATH_SUFFIXES itcl)
15	set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
16	foreach(version ${itcl_library_versions})
17	find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
18	@@ -158,11 +160,12 @@
19	endif(ENABLE_tk)
20	if(ENABLE_itk)
21	message(STATUS "Looking for itk.h")
22	- find_path(ITK_INCLUDE_PATH itk.h ${TK_INCLUDE_PATH})
23	+ find_path(ITK_INCLUDE_PATH itk.h ${TCL_INCLUDE_PATH}/../itk%%ITCL_VER%%)
24	if(ITK_INCLUDE_PATH)
25	message(STATUS "Looking for itk.h - found")
26	message(STATUS "Looking for itk library")
27	- set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
28	+ find_library(ITK_LIBRARY itk PATH_SUFFIXES itk)
29	+ set(itk_library_versions "" 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
30	foreach(version ${itk_library_versions})
31	find_library(ITK_LIBRARY itk${version}
32	PATH_SUFFIXES itk${version})

Line 0 Link Here

(-)math/plplot/files/patch-doc__docbook__src__plplotdoc.texi (+20 lines)
	1	--- doc/docbook/src/plplotdoc.texi.orig
	2	+++ doc/docbook/src/plplotdoc.texi
	3	@@ -6722,7 +6722,7 @@
	4	if (pm->fdata[i] > max)
	5	max = pm->fdata[i];
	6
	7	- sprintf( interp->result, "%f", max );
	8	+ sprintf( Tcl_GetStringResult(interp), "%f", max );
	9	return TCL_OK;
	10	@}
	11
	12	@@ -6735,7 +6735,7 @@
	13	if (pm->fdata[i] < min)
	14	min = pm->fdata[i];
	15
	16	- sprintf( interp->result, "%f", min );
	17	+ sprintf( Tcl_GetStringResult(interp), "%f", min );
	18	return TCL_OK;
	19	@}
	20

Line 0 Link Here

(-)math/plplot/files/patch-doc__docbook__src__tcl.xml (+20 lines)
	1	--- doc/docbook/src/tcl.xml.orig
	2	+++ doc/docbook/src/tcl.xml
	3	@@ -576,7 +576,7 @@
	4	if (pm->fdata[i] > max)
	5	max = pm->fdata[i];
	6
	7	- sprintf( interp->result, "%f", max );
	8	+ sprintf( Tcl_GetStringResult(interp), "%f", max );
	9	return TCL_OK;
	10	}
	11
	12	@@ -589,7 +589,7 @@
	13	if (pm->fdata[i] < min)
	14	min = pm->fdata[i];
	15
	16	- sprintf( interp->result, "%f", min );
	17	+ sprintf( Tcl_GetStringResult(interp), "%f", min );
	18	return TCL_OK;
	19	}
	20	</programlisting>

Line 0 Link Here

(-)math/plplot/files/patch-drivers__ntk.c (+74 lines)
		1	--- drivers/ntk.c.orig
		2	+++ drivers/ntk.c
		3	@@ -115,7 +115,7 @@
		4	//
		5	sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
		6	if ( Tcl_Eval( interp, scmd ) != TCL_OK )
		7	- fprintf( stderr, "%s\n", interp->result );
		8	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
		9	}
		10	}
		11
		12	@@ -264,7 +264,7 @@
		13	sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
		14	if ( Tcl_Eval( interp, cmd ) != TCL_OK )
		15	{
		16	- fprintf( stderr, "%s\n", interp->result );
		17	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
		18	plexit( "No such tk server." );
		19	}
		20	}
		21	@@ -301,7 +301,7 @@
		22	// Set up device parameters
		23
		24	Tcl_Eval( interp, "tk scaling" ); // pixels per mm
		25	- ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
		26	+ ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
		27	plP_setpxl( ppm, ppm );
		28	plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
		29	}
		30	@@ -371,11 +371,11 @@
		31	{
		32	tk_cmd( "update" );
		33	tk_cmd( "info exists keypress" );
		34	- sscanf( interp->result, "%d", &st );
		35	+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
		36	}
		37
		38	tk_cmd( "set keypress" );
		39	- sscanf( interp->result, "%d", &key );
		40	+ sscanf( Tcl_GetStringResult(interp), "%d", &key );
		41	//fprintf(stderr,"\n%d\n", key);fflush(stderr);
		42	tk_cmd( "unset keypress" );
		43	st = 0;
		44	@@ -433,7 +433,7 @@
		45	{
		46	tk_cmd( "update" );
		47	tk_cmd( "winfo exists $plf.f2.c$ccanv" );
		48	- sscanf( interp->result, "%d", &st );
		49	+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
		50	}
		51	st = 0;
		52	// this give a "Segmentation fault", even after checking for the canvas!
		53	@@ -450,16 +450,16 @@
		54	{
		55	tk_cmd( "update" );
		56	tk_cmd( "info exists xloc" );
		57	- sscanf( interp->result, "%d", &st );
		58	+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
		59	}
		60	tk_cmd( "set xloc" );
		61	- sscanf( interp->result, "%d", &gin.pX );
		62	+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
		63	tk_cmd( "set yloc" );
		64	- sscanf( interp->result, "%d", &gin.pY );
65	+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
66	tk_cmd( "set bloc" );
67	- sscanf( interp->result, "%d", &gin.button );
68	+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
69	tk_cmd( "set sloc" );
70	- sscanf( interp->result, "%d", &gin.state );
71	+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
72
73	gin.dX = (PLFLT) gin.pX / xmax;
74	gin.dY = 1. - (PLFLT) gin.pY / ymax;

Line 0 Link Here

(-)math/plplot/files/patch-drivers__tk.c (+65 lines)
		1	--- drivers/tk.c.orig
		2	+++ drivers/tk.c
		3	@@ -764,7 +764,7 @@
		4
		5	if ( Tcl_Init( dev->interp ) != TCL_OK )
		6	{
		7	- fprintf( stderr, "%s\n", dev->interp->result );
		8	+ fprintf( stderr, "%s\n", Tcl_GetStringResult(dev->interp) );
		9	abort_session( pls, "Unable to initialize Tcl" );
		10	}
		11
		12	@@ -1568,7 +1568,7 @@
		13	0, 1, ( ClientData ) & iodev->file ) != TCL_OK )
		14	{
		15	fprintf( stderr, "Cannot get file info:\n\t %s\n",
		16	- dev->interp->result );
		17	+ Tcl_GetStringResult(dev->interp) );
		18	abort_session( pls, "" );
		19	}
		20	iodev->fd = fileno( iodev->file );
		21	@@ -1673,7 +1673,7 @@
		22	if ( pl_PacketSend( dev->interp, dev->iodev, pls->pdfs ) )
		23	{
		24	fprintf( stderr, "Packet send failed:\n\t %s\n",
		25	- dev->interp->result );
		26	+ Tcl_GetStringResult(dev->interp) );
		27	abort_session( pls, "" );
		28	}
		29	pdfs->bp = 0;
		30	@@ -2131,7 +2131,7 @@
		31
		32	if ( Tk_Init( interp ) )
		33	{
		34	- fprintf( stderr, "tk_init:%s\n", interp->result );
		35	+ fprintf( stderr, "tk_init:%s\n", Tcl_GetStringResult(interp) );
		36	return 1;
		37	}
		38
		39	@@ -2165,7 +2165,7 @@
		40	if ( Tcl_ExprBoolean( dev->interp, dev->cmdbuf, &result ) )
		41	{
		42	fprintf( stderr, "tk_wait command \"%s\" failed:\n\t %s\n",
		43	- cmd, dev->interp->result );
		44	+ cmd, Tcl_GetStringResult(dev->interp) );
		45	break;
		46	}
		47	if ( result )
		48	@@ -2225,7 +2225,7 @@
		49	if ( result != TCL_OK )
		50	{
		51	fprintf( stderr, "Server command \"%s\" failed:\n\t %s\n",
		52	- cmd, dev->interp->result );
		53	+ cmd, Tcl_GetStringResult(dev->interp) );
		54	abort_session( pls, "" );
		55	}
		56	}
		57	@@ -2247,7 +2247,7 @@
		58	if ( Tcl_VarEval( dev->interp, cmd, (char **) NULL ) != TCL_OK )
		59	{
		60	fprintf( stderr, "TCL command \"%s\" failed:\n\t %s\n",
		61	- cmd, dev->interp->result );
		62	+ cmd, Tcl_GetStringResult(dev->interp) );
		63	abort_session( pls, "" );
		64	}
65	}

Line 0 Link Here

(-)math/plplot/files/patch-examples__tk__xtk02.c (+20 lines)
	1	--- examples/tk/xtk02.c.orig
	2	+++ examples/tk/xtk02.c
	3	@@ -49,7 +49,7 @@
	4	pm->fdata[i] = y;
	5	}
	6
	7	- interp->result = "Things are cool in gumbyville.";
	8	+ Tcl_SetResult(interp,(char*)"Things are cool in gumbyville.",TCL_VOLATILE);
	9	return TCL_OK;
	10	}
	11
	12	@@ -82,7 +82,7 @@
	13	//
	14	// Results:
	15	// Returns a standard Tcl completion code, and leaves an error
	16	-// message in interp->result if an error occurs.
	17	+// message in Tcl_GetStringResult(interp) if an error occurs.
	18	//
	19	// Side effects:
	20	// Depends on the startup script.

Line 0 Link Here

(-)math/plplot/files/patch-examples__tk__xtk04.c (+38 lines)
	1	--- examples/tk/xtk04.c.orig
	2	+++ examples/tk/xtk04.c
	3	@@ -35,7 +35,7 @@
	4	if ( pm->fdata[i] > max )
	5	max = pm->fdata[i];
	6
	7	- sprintf( interp->result, "%f", max );
	8	+ sprintf( Tcl_GetStringResult(interp), "%f", max );
	9	return TCL_OK;
	10	}
	11
	12	@@ -48,7 +48,7 @@
	13	if ( pm->fdata[i] < min )
	14	min = pm->fdata[i];
	15
	16	- sprintf( interp->result, "%f", min );
	17	+ sprintf( Tcl_GetStringResult(interp), "%f", min );
	18	return TCL_OK;
	19	}
	20
	21	@@ -80,7 +80,7 @@
	22	//
	23	// Results:
	24	// Returns a standard Tcl completion code, and leaves an error
	25	-// message in interp->result if an error occurs.
	26	+// message in Tcl_GetStringResult(interp) if an error occurs.
	27	//
	28	// Side effects:
	29	// Depends on the startup script.
	30	@@ -158,7 +158,7 @@
	31
	32	if ( pm->dim != 2 )
	33	{
	34	- interp->result = "must use 2-d matrix.";
	35	+ Tcl_SetResult(interp,(char*)"must use 2-d matrix.",TCL_VOLATILE);
	36	return TCL_ERROR;
	37	}
	38

Line 0 Link Here

(-)math/plplot/files/patch-plplot_test__CMakeLists.txt (+15 lines)
	1	--- plplot_test/CMakeLists.txt.orig
	2	+++ plplot_test/CMakeLists.txt
	3	@@ -387,12 +387,6 @@
	4	)
	5	endif(PLD_pdfqt)
	6
	7	- if(PLD_pdf)
	8	- add_test(examples_pdf
	9	- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
	10	- )
	11	- endif(PLD_pdf)
	12	-
	13	if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
	14	configure_file(
	15	test_diff.sh.in

Line 0 Link Here

(-)math/plplot/files/patch-scripts__CMakeLists.txt (+14 lines)
	1	--- scripts/CMakeLists.txt.orig
	2	+++ scripts/CMakeLists.txt
	3	@@ -28,9 +28,9 @@
	4	)
	5	endif(PLD_plmeta)
	6	if(PLD_pstex)
	7	- set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
	8	+ set(scripts_SCRIPTS "${scripts_SCRIPTS}" pstex2eps)
	9	endif(PLD_pstex)
	10	- if (NOT ${scripts_SCRIPTS} STREQUAL "")
	11	+ if (NOT "${scripts_SCRIPTS}" STREQUAL "")
	12	install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
	13	endif (NOT ${scripts_SCRIPTS} STREQUAL "")
	14	endif(HAVE_BASH)