From owner-svn-ports-head@FreeBSD.ORG  Thu Mar  6 15:04:24 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 93CD89BB;
 Thu,  6 Mar 2014 15:04:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 813BDF7B;
 Thu,  6 Mar 2014 15:04:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26F4Og3050221;
 Thu, 6 Mar 2014 15:04:24 GMT (envelope-from thierry@svn.freebsd.org)
Received: (from thierry@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26F4O7k050219;
 Thu, 6 Mar 2014 15:04:24 GMT (envelope-from thierry@svn.freebsd.org)
Message-Id: <201403061504.s26F4O7k050219@svn.freebsd.org>
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Thu, 6 Mar 2014 15:04:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347247 - in head/math/plplot: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 15:04:24 -0000

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
+