Attachment #161968 for bug #203730

Lines 2-9 Link Here

(-)math/plplot/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= plplot	4	PORTNAME= plplot
5	PORTVERSION= 5.11.0	5	PORTVERSION= 5.11.1
6	PORTREVISION= 1
7	CATEGORIES= math science	6	CATEGORIES= math science
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
9		8

Lines 1-2 Link Here

(-)math/plplot/distinfo (-2 / +2 lines)
1	SHA256 (plplot-5.11.0.tar.gz) = bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e	1	SHA256 (plplot-5.11.1.tar.gz) = 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c
2	SIZE (plplot-5.11.0.tar.gz) = 15892751	2	SIZE (plplot-5.11.1.tar.gz) = 15445404




--- cmake/modules/linuxvga.cmake.orig	2015-04-12 10:08:04 UTC
+++ cmake/modules/linuxvga.cmake
@@ -35,7 +35,6 @@
 # set the environment variable CMAKE_LIBRARY_PATH.
 # See cmake documentation for further details.
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   if(PLD_linuxvga)
     find_package(VGA)
     if(VGA_FOUND)
@@ -50,6 +49,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
       set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
     endif(VGA_FOUND)
   endif(PLD_linuxvga)
-else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
-endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 1-11 Link Here

(-)math/plplot/files/patch-cmake_modules_pkg-config.cmake (-11 lines)
1	--- cmake/modules/pkg-config.cmake.orig 2015-04-12 10:08:04 UTC
2	+++ cmake/modules/pkg-config.cmake
3	@@ -39,7 +39,7 @@ include(FindPkgConfig)
4
5	if(PKG_CONFIG_EXECUTABLE)
6	message(STATUS "Looking for pkg-config - found")
7	- set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
8	+ set(PKG_CONFIG_DIR "${LIB_DIR}data/pkgconfig")
9	set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
10
11	# Will likely need WIN32 and CYGWIN stanzas as well




%%WXGTK%%bin/wxPLViewer
include/plplot/disptab.h
include/plplot/drivers.h
include/plplot/gcw.h
include/plplot/pdf.h
include/plplot/plConfig.h
include/plplot/plDevs.h

include/plplot/plevent.h
include/plplot/plplot.h
include/plplot/plplotP.h
include/plplot/plplotcanvas.h
include/plplot/plstream.h
include/plplot/plstrm.h
%%TCLTK%%include/plplot/pltcl.h

%%FORTRAN%%lib/libplf95demolib.a
lib/libplplot.so
lib/libplplot.so.13
lib/libplplot.so.13.1.2
lib/libplplotcxx.so
lib/libplplotcxx.so.12
lib/libplplotcxx.so.12.0.0

%%TCLTK%%lib/libtclmatrix.so
%%TCLTK%%lib/libtclmatrix.so.10
%%TCLTK%%lib/libtclmatrix.so.10.2.0
lib/pkgconfig/plplot-c++.pc
%%FORTRAN%%lib/pkgconfig/plplot-f95.pc
%%QT4%%lib/pkgconfig/plplot-qt.pc
%%TCLTK%%lib/pkgconfig/plplot-tcl.pc
%%TCLTK%%lib/pkgconfig/plplot-tcl_Main.pc
%%WXGTK%%lib/pkgconfig/plplot-wxwidgets.pc
lib/pkgconfig/plplot.pc
%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
lib/plplot/drivers/cairo.driver_info
lib/plplot/drivers/cairo.so

%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
libdata/pkgconfig/plplot-c++.pc
%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
%%QT4%%libdata/pkgconfig/plplot-qt.pc
%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
%%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc
%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
libdata/pkgconfig/plplot.pc
%%TCLTK%%man/man1/plserver.1.gz
%%TCLTK%%man/man1/pltcl.1.gz
man/man1/pltek.1.gz

Return to bug 203730

Lines 1-17 Link Here

(-)math/plplot/files/patch-cmake_modules_linuxvga.cmake (-17 lines)
1	--- cmake/modules/linuxvga.cmake.orig 2015-04-12 10:08:04 UTC
2	+++ cmake/modules/linuxvga.cmake
3	@@ -35,7 +35,6 @@
4	# set the environment variable CMAKE_LIBRARY_PATH.
5	# See cmake documentation for further details.
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	if(PLD_linuxvga)
9	find_package(VGA)
10	if(VGA_FOUND)
11	@@ -50,6 +49,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
12	set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)
13	endif(VGA_FOUND)
14	endif(PLD_linuxvga)
15	-else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
16	- set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)
17	-endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 4-10 Link Here

(-)math/plplot/pkg-plist (-10 / +8 lines)
4	%%WXGTK%%bin/wxPLViewer	4	%%WXGTK%%bin/wxPLViewer
5	include/plplot/disptab.h	5	include/plplot/disptab.h
6	include/plplot/drivers.h	6	include/plplot/drivers.h
7	include/plplot/gcw.h
8	include/plplot/pdf.h	7	include/plplot/pdf.h
9	include/plplot/plConfig.h	8	include/plplot/plConfig.h
10	include/plplot/plDevs.h	9	include/plplot/plDevs.h
Lines 13-19 Link Here
13	include/plplot/plevent.h	12	include/plplot/plevent.h
14	include/plplot/plplot.h	13	include/plplot/plplot.h
15	include/plplot/plplotP.h	14	include/plplot/plplotP.h
16	include/plplot/plplotcanvas.h
17	include/plplot/plstream.h	15	include/plplot/plstream.h
18	include/plplot/plstrm.h	16	include/plplot/plstrm.h
19	%%TCLTK%%include/plplot/pltcl.h	17	%%TCLTK%%include/plplot/pltcl.h
Lines 44-50 Link Here
44	%%FORTRAN%%lib/libplf95demolib.a	42	%%FORTRAN%%lib/libplf95demolib.a
45	lib/libplplot.so	43	lib/libplplot.so
46	lib/libplplot.so.13	44	lib/libplplot.so.13
47	lib/libplplot.so.13.0.1	45	lib/libplplot.so.13.1.2
48	lib/libplplotcxx.so	46	lib/libplplotcxx.so
49	lib/libplplotcxx.so.12	47	lib/libplplotcxx.so.12
50	lib/libplplotcxx.so.12.0.0	48	lib/libplplotcxx.so.12.0.0
Lines 72-77 Link Here
72	%%TCLTK%%lib/libtclmatrix.so	70	%%TCLTK%%lib/libtclmatrix.so
73	%%TCLTK%%lib/libtclmatrix.so.10	71	%%TCLTK%%lib/libtclmatrix.so.10
74	%%TCLTK%%lib/libtclmatrix.so.10.2.0	72	%%TCLTK%%lib/libtclmatrix.so.10.2.0
		73	lib/pkgconfig/plplot-c++.pc
		74	%%FORTRAN%%lib/pkgconfig/plplot-f95.pc
		75	%%QT4%%lib/pkgconfig/plplot-qt.pc
		76	%%TCLTK%%lib/pkgconfig/plplot-tcl.pc
		77	%%TCLTK%%lib/pkgconfig/plplot-tcl_Main.pc
		78	%%WXGTK%%lib/pkgconfig/plplot-wxwidgets.pc
		79	lib/pkgconfig/plplot.pc
75	%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so	80	%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
76	lib/plplot/drivers/cairo.driver_info	81	lib/plplot/drivers/cairo.driver_info
77	lib/plplot/drivers/cairo.so	82	lib/plplot/drivers/cairo.so
Lines 107-119 Link Here
107	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py	112	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
108	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so	113	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so
109	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py	114	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
110	libdata/pkgconfig/plplot-c++.pc
111	%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
112	%%QT4%%libdata/pkgconfig/plplot-qt.pc
113	%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
114	%%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc
115	%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
116	libdata/pkgconfig/plplot.pc
117	%%TCLTK%%man/man1/plserver.1.gz	115	%%TCLTK%%man/man1/plserver.1.gz
118	%%TCLTK%%man/man1/pltcl.1.gz	116	%%TCLTK%%man/man1/pltcl.1.gz
119	man/man1/pltek.1.gz	117	man/man1/pltek.1.gz