Description Timur I. Bakeyev 2009-02-27 13:50:01 UTC

	Despite selecting PHP bindings knob in the options menu, there are
	no PHP bindings build.

Fix: Apparently, graphviz configure relies on a check for the old version of
	Swig, which used to have -php5 switch for PHP bindings. for quite a
	while it is just -php, as PHP4 support was dropped.

	There is another fix in the attached patch file, which removes build
	dependency from bash - the only construction, that is bash-specific
	in the configure script is related to Windows version of the program,
	which is useless to FreeBSD anyhow :)

	Regards,
	Timur.



--Nq2Wo0NMKNjxTN9z
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="graphviz.diff"



--Nq2Wo0NMKNjxTN9z----VAJL0PTPr9YOTB3yw0XZLXXF8BwU7X4aPyFVcyzucLRUOfTH
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/graphviz/Makefile,v
retrieving revision 1.111
diff -u -r1.111 Makefile
--- Makefile	23 Feb 2009 14:46:30 -0000	1.111
+++ Makefile	27 Feb 2009 12:10:16 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.20.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -15,7 +15,6 @@
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -400,8 +399,6 @@
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	@${REINPLACE_CMD} -e 's|#include "regex_win32.h"|#include <regex.h>|' \
 		${WRKSRC}/cmd/smyrna/btree.c
-	@${REINPLACE_CMD} -e 's|#! /bin/sh|#! /${LOCALBASE}/bin/bash|g' \
-		${WRKSRC}/configure
 
 .if defined(WITH_TK)
 post-install-script:
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/graphics/graphviz/files/patch-configure,v
retrieving revision 1.7
diff -u -r1.7 patch-configure
--- files/patch-configure	16 Jul 2008 14:27:32 -0000	1.7
+++ files/patch-configure	27 Feb 2009 12:02:13 -0000
@@ -1,6 +1,30 @@
---- configure.orig	2008-07-07 04:27:21.000000000 +0200
-+++ configure	2008-07-11 11:42:18.000000000 +0200
-@@ -6481,6 +6481,9 @@
+--- configure.orig	2009-02-27 12:01:42.000000000 +0000
++++ configure	2009-02-27 12:02:10.000000000 +0000
+@@ -2401,23 +2401,6 @@
+ GRAPHVIZ_VERSION_MICRO=3
+ 
+ 
+-
+-
+-# Windows version numbers
+-# For the build number: months since Jan 2000, day of month from the timestamp
+-# For the revision number: hour, minute from the timestamp
+-
+-if test $GRAPHVIZ_VERSION_MICRO = "0"; then
+-	GRAPHVIZ_VERSION_BUILD=0
+-	GRAPHVIZ_VERSION_REVISION=0
+-else
+-	GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
+-	GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
+-fi
+-
+-
+-
+-
+ # libtool shared library version for main libs (cdt, graph, gvc)
+ #Make m4 grok these VARIABLES
+ 
+@@ -6481,6 +6464,9 @@
  	        *-apple-darwin* )
  	            CFLAGS="${CFLAGS} -fno-common -Wall"
  	            ;;
@@ -10,3 +34,14 @@
  	        *-freebsd* )
  	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
  		    ;;
+@@ -27376,8 +27362,8 @@
+   if test "x$use_swig" != "xYes"; then
+     use_php="No (swig not available)"
+   else
+-    if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then
+-      use_php="No (swig does not support -php5 option)"
++    if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
++      use_php="No (swig does not support -php option)"
+     else
+       # Extract the first word of "php", so it can be a program name with args.
+ set dummy php; ac_word=$2
How-To-Repeat: 	Select PHP in the options and compile the port.