Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 May 2013 18:26:22 +0000 (UTC)
From:      Greg Larkin <glarkin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317538 - head/math/ggobi
Message-ID:  <201305061826.r46IQMNZ009078@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glarkin
Date: Mon May  6 18:26:22 2013
New Revision: 317538
URL: http://svnweb.freebsd.org/changeset/ports/317538

Log:
  - Fix build problem with graphics/graphviz already installed [1]
  - Trim Makefile header [1]
  - Use DOCSDIR in pkg-plist
  
  PR:		ports/178185
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer) [1]

Modified:
  head/math/ggobi/Makefile
  head/math/ggobi/pkg-plist

Modified: head/math/ggobi/Makefile
==============================================================================
--- head/math/ggobi/Makefile	Mon May  6 18:14:33 2013	(r317537)
+++ head/math/ggobi/Makefile	Mon May  6 18:26:22 2013	(r317538)
@@ -1,9 +1,5 @@
-# Ports collection makefile for:   ggobi
-# Date created:        31 January 2010
-# Whom:                rhurlin
-#
+# Created by: Rainer Hurling <rhurlin@gwdg.de>
 # $FreeBSD$
-#
 
 PORTNAME=	ggobi
 PORTVERSION=	2.1.9
@@ -33,6 +29,15 @@ post-patch:
 		${WRKSRC}/src/ggobi-renderer-factory.c \
 		${WRKSRC}/src/ggobi-renderer.c
 
+post-configure:
+# build gets irritated by the presence of an external graphviz version
+	@${REINPLACE_CMD} -e 's|#define HAVE_LIBGVC 1|/* #define HAVE_LIBGVC 1 */|' \
+		${WRKSRC}/plugins/GraphLayout/config.h
+	@${REINPLACE_CMD} -e 's|LIBGVC_CFLAGS = -I${LOCALBASE}/include/graphviz|LIBGVC_CFLAGS =|' \
+		${WRKSRC}/plugins/GraphLayout/Makefile
+	@${REINPLACE_CMD} -e 's|LIBGVC_LIBS = -L${LOCALBASE}/lib/graphviz -lgvc -lgraph -lcdt|LIBGVC_LIBS =|' \
+		${WRKSRC}/plugins/GraphLayout/Makefile
+
 post-install:
 	${MKDIR} ${PREFIX}/etc/xdg/ggobi
 	${INSTALL_DATA} ${WRKSRC}/ggobirc ${PREFIX}/etc/xdg/ggobi/ggobirc.sample

Modified: head/math/ggobi/pkg-plist
==============================================================================
--- head/math/ggobi/pkg-plist	Mon May  6 18:14:33 2013	(r317537)
+++ head/math/ggobi/pkg-plist	Mon May  6 18:26:22 2013	(r317538)
@@ -129,9 +129,9 @@ share/pixmaps/ggobi.png
 @unexec if cmp -s %D/etc/xdg/ggobi/ggobirc.sample %D/etc/xdg/ggobi/ggobirc; then rm -f %D/etc/xdg/ggobi/ggobirc; fi
 etc/xdg/ggobi/ggobirc.sample
 @exec if [ ! -f %B/ggobirc ]; then cp -p %D/%F %B/ggobirc; fi
-share/doc/ggobi/XML.pdf
-share/doc/ggobi/manual.pdf
-@dirrm share/doc/ggobi
+%%DOCSDIR%%/XML.pdf
+%%DOCSDIR%%/manual.pdf
+@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry etc/xdg/ggobi
 @dirrmtry etc/xdg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305061826.r46IQMNZ009078>