svn commit: r347247 - in head/math/plplot: . files

[Thierry Thomas]

Author: thierry
Date: Thu Mar  6 15:04:23 2014
New Revision: 347247
URL: http://svnweb.freebsd.org/changeset/ports/347247
QAT: https://qat.redports.org/buildarchive/r347247/

Log:
  If another port defines HAVE_CONFIG_H and includes plConfig.h, this
  tries to bring plplot_config.h, which is not installed, but
  plplot_config.h is required when we build plplot.
  
  E.g. science/gnudatalanguage does that.

Added:
  head/math/plplot/files/patch-include_plConfig.h   (contents, props changed)
Modified:
  head/math/plplot/Makefile

Modified: head/math/plplot/Makefile
==============================================================================
--- head/math/plplot/Makefile	Thu Mar  6 15:04:07 2014	(r347246)
+++ head/math/plplot/Makefile	Thu Mar  6 15:04:23 2014	(r347247)
@@ -3,6 +3,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.10.0
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -32,6 +33,7 @@ CMAKE_ARGS=	-DENABLE_java:BOOL=OFF -DENA
 		-DENABLE_pyqt4:BOOL=OFF \
 		-DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \
 		-DPLD_plmeta:BOOL=OFF
+CFLAGS+=	-D_IS_BUILDING_PLPLOT_PORT_
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
 

Added: head/math/plplot/files/patch-include_plConfig.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/plplot/files/patch-include_plConfig.h	Thu Mar  6 15:04:23 2014	(r347247)
@@ -0,0 +1,12 @@
+--- include/plConfig.h.in.orig	2013-12-29 21:11:07.000000000 +0100
++++ include/plConfig.h.in	2014-03-06 15:35:44.000000000 +0100
+@@ -44,7 +44,8 @@
+ #ifndef __PLCONFIG_H__
+ #define __PLCONFIG_H__
+ 
+-#ifdef HAVE_CONFIG_H
++// plplot_config.h won't be installed: don't let it be used by consumers
++#if defined(HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_)
+ #  include <plplot_config.h>
+ #endif
+