- Fix plist and use vars from bsd.tcl.mk in Makefile [1]

- Fix WWW [2]

PR:		ports/97176
Submitted by:	Shaun Amott <shaun@inerd.com> (maintainer) [1]
		Adi Pircalabu <apircalabu@bitdefender.com> [2]
Approved by:	maintainer [2], lawrance (mentor)

3 files changed, 20 insertions, 15 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index a38974e2746d..0ceeb1e7d696 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -22,22 +22,24 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
 		expat.6:${PORTSDIR}/textproc/expat2		\
 		gd.4:${PORTSDIR}/graphics/gd
 
+USE_TCL=	84
+USE_TK=		84
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_XPM=	yes
 USE_AUTOTOOLS=	libltdl:15
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	\
-		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh	\
-		TKCONFIG=${LOCALBASE}/lib/tk8.4/tkConfig.sh	\
+		TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh		\
+		TKCONFIG=${TK_LIBDIR}/tkConfig.sh		\
 		MISSING=${TRUE}
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
 		--enable-dependency-tracking			\
 		--with-iconvlibdir=${LOCALBASE}/lib		\
-		--with-tclsh=${LOCALBASE}/tcl8.4		\
-		--with-wish=${LOCALBASE}/wish8.4		\
+		--with-tclsh=${TCLSH}				\
+		--with-wish=${WISH}				\
 		--with-fontconfigincludedir=${X11BASE}/include	\
 		--with-fontconfiglibdir=${X11BASE}/lib		\
 		--disable-swig --disable-sharp --disable-guile	\
@@ -57,6 +59,10 @@ MLINKS=		dot.1 circo.1		\
 		dot.1 neato.1		\
 		dot.1 twopi.1
 
+PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
+			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
+PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
+
 PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
@@ -68,7 +74,7 @@ USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
-post-patch:
+pre-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}					\
 	  ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'	\
 	                   -e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g"		\
@@ -86,12 +92,6 @@ post-patch:
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-Wno-unused-parameter||g' ${WRKSRC}/configure
 .endif
-	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g' ${WRKSRC}/tclpkg/gv/Makefile.in
-	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g'			\
-	                  -e 's|wish|wish8.4|g'				\
-	                  ${WRKSRC}/tclpkg/tcldot/demo/doted		\
-	                  ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan	\
-	                  ${WRKSRC}/tclpkg/tkspline/demo/spline
 
 post-install-script:
 	${INSTALL_MAN} ${WRKSRC}/tclpkg/gdtclft/gdtclft.n   ${MANNPREFIX}/man/mann
diff --git a/graphics/graphviz/pkg-descr b/graphics/graphviz/pkg-descr
index 20bbf1836e8b..fefbf562142e 100644
--- a/graphics/graphviz/pkg-descr
+++ b/graphics/graphviz/pkg-descr
@@ -1,8 +1,8 @@
 Graph Visualization Software from AT&T Laboratories and
 Bell Laboratories (Lucent Technologies)
 
-These programs licensed under the terms described in the 
-Web page http://www.research.att.com/sw/tools/graphviz/license/.
+These programs licensed under the terms described in the web page at:
+http://www.graphviz.org/License.php
 
 The package contains:
     dotty  - customizable X windows graph viewer written in the Lefty editor
@@ -11,4 +11,4 @@ The package contains:
     neato  - batch program for drawing undirected graphs using Kamada-Kawai
              spring models
 
-WWW: http://www.research.att.com/sw/tools/graphviz/
+WWW: http://www.graphviz.org/
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index a408721172c2..0c14ac87ed2d 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -380,6 +380,11 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pathplan_data
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@exec mkdir -p %D/lib/graphviz/guile
+@exec mkdir -p %D/lib/graphviz/java
+@exec mkdir -p %D/lib/graphviz/ocaml
+@exec mkdir -p %D/lib/graphviz/php
+@exec mkdir -p %D/lib/graphviz/sharp
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected
 @dirrm %%DATADIR%%/graphs