- fix package for option WITH_LUA

132089
Scot Hetzel

- mark options WITH_TCL and WITH_TK as BROKEN
swig does not build valid code any more.

- fix option WITH_PHP

graphics/graphviz/Makefile

@@ -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}/
@@ -118,6 +118,7 @@ PLIST_SUB+=		WITH_TK=""
 PLIST_SUB+=		WITH_TK="@comment "
 .endif
 .if defined(WITH_TCL) || defined(WITH_TK)
+BROKEN=			Swig cant build tcl code
 CPPFLAGS+=		-I${TCL_INCLUDEDIR}
 USE_TCL_BUILD=		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
@@ -345,7 +346,8 @@ USE_LUA=		yes
 .include "${PORTSDIR}/Mk/bsd.lua.mk"
 CFLAGS+=		-I${LUA_INCDIR}
 LDFLAGS+=		-L${LUA_LIBDIR} -lm
-CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
+CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua" \
+			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
 MANN+=			gv_lua.n
 .else
 CONFIGURE_ARGS+=	--disable-lua
@@ -371,7 +373,7 @@ CONFIGURE_ARGS+=	--disable-guile
 PLIST_SUB+=		WITH_GUILE="@comment "
 .endif
 
-pre-patch:
+post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
@@ -400,7 +402,7 @@ pre-patch:
 		${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' \
+	@${REINPLACE_CMD} -e 's|#! /bin/sh|#! ${LOCALBASE}/bin/bash|g' \
 		${WRKSRC}/configure
 
 .if defined(WITH_TK)

graphics/graphviz/files/patch-configure

@@ -1,5 +1,5 @@
---- configure.orig	2008-07-07 04:27:21.000000000 +0200
-+++ configure	2008-07-11 11:42:18.000000000 +0200
+--- configure.orig	2008-10-08 01:54:55.000000000 +0200
++++ configure	2009-02-27 11:12:03.000000000 +0100
 @@ -6481,6 +6481,9 @@
  	        *-apple-darwin* )
  	            CFLAGS="${CFLAGS} -fno-common -Wall"
@@ -10,3 +10,25 @@
  	        *-freebsd* )
  	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
  		    ;;
+@@ -26247,7 +26250,9 @@
+ 
+         LUA_INCLUDES=""
+         LUA_LIBS=""
+-        LUA_INSTALL_DIR=""
++	if test -z "$LUA_INSTALL_DIR" ; then
++	        LUA_INSTALL_DIR=""
++	fi
+ 
+         if test -n "$lua_inc"; then
+            CFLAGS="$CFLAGS -I$lua_inc"
+@@ -27376,8 +27381,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

graphics/graphviz/pkg-plist

@@ -163,6 +163,7 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.a
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.la
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.so
+%%WITH_LUA%%lib/lua/%%LUA_VER%%/gv.so
 %%WITH_PERL%%lib/graphviz/perl/gv.so
 %%WITH_PERL%%lib/graphviz/perl/gv.pm
 %%WITH_PERL%%lib/graphviz/perl/libgv_perl.a