- Prevent bundled libltdl from being installed into PREFIX

- Put pkgconfig files where they belong

  I hope this does not break the functionality.

2 files changed, 11 insertions, 23 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 916070326ce9..aece0755eaea 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -24,8 +25,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
+USE_REINPLACE=	yes
 USE_XPM=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh \
@@ -65,6 +67,9 @@ MYPORTDOCS=	dotguide.pdf dottyguide.pdf leftyguide.pdf \
 USE_GCC=	3.4+
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 0901c533eb10..60962989734c 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -79,71 +79,54 @@ include/graphviz/vmstub.h
 include/graphviz/wbmp.h
 lib/graphviz/config
 lib/graphviz/libagraph.a
-lib/graphviz/libagraph.la
 lib/graphviz/libagraph.so
 lib/graphviz/libagraph.so.1
 lib/graphviz/libcdt.a
-lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.1
 lib/graphviz/libexpr.a
-lib/graphviz/libexpr.la
 lib/graphviz/libexpr.so
 lib/graphviz/libexpr.so.1
 lib/graphviz/libgdtclft.a
-lib/graphviz/libgdtclft.la
 lib/graphviz/libgdtclft.so
 lib/graphviz/libgdtclft.so.0
 lib/graphviz/libgraph.a
-lib/graphviz/libgraph.la
 lib/graphviz/libgraph.so
 lib/graphviz/libgraph.so.1
 lib/graphviz/libgv_tcl.a
-lib/graphviz/libgv_tcl.la
 lib/graphviz/libgv_tcl.so
 lib/graphviz/libgv_tcl.so.0
 lib/graphviz/libgvc.a
-lib/graphviz/libgvc.la
 lib/graphviz/libgvc.so
 lib/graphviz/libgvc.so.1
 lib/graphviz/libgvc_builtins.a
-lib/graphviz/libgvc_builtins.la
 lib/graphviz/libgvc_builtins.so
 lib/graphviz/libgvc_builtins.so.1
 lib/graphviz/libgvgd.a
-lib/graphviz/libgvgd.la
 lib/graphviz/libgvgd.so
 lib/graphviz/libgvgd.so.2
 lib/graphviz/libgvplugin_dot_layout.a
-lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.so
 lib/graphviz/libgvplugin_dot_layout.so.1
 lib/graphviz/libgvplugin_neato_layout.a
-lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.1
 lib/graphviz/libgvplugin_usershape_gd.a
-lib/graphviz/libgvplugin_usershape_gd.la
 lib/graphviz/libgvplugin_usershape_gd.so
 lib/graphviz/libgvplugin_usershape_gd.so.1
 lib/graphviz/libpack.a
-lib/graphviz/libpack.la
 lib/graphviz/libpack.so
 lib/graphviz/libpack.so.1
 lib/graphviz/libpathplan.a
-lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.so
 lib/graphviz/libpathplan.so.1
 lib/graphviz/libtcldot.a
-lib/graphviz/libtcldot.la
 lib/graphviz/libtcldot.so
 lib/graphviz/libtcldot.so.0
 lib/graphviz/libtclplan.a
-lib/graphviz/libtclplan.la
 lib/graphviz/libtclplan.so
 lib/graphviz/libtclplan.so.0
 lib/graphviz/libtkspline.a
-lib/graphviz/libtkspline.la
 lib/graphviz/libtkspline.so
 lib/graphviz/libtkspline.so.0
 lib/graphviz/pkgIndex.tcl
@@ -153,11 +136,11 @@ lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%%%DOCSDIR%%/dottyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/leftyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/neatoguide.pdf
-lib/pkgconfig/libagraph.pc
-lib/pkgconfig/libcdt.pc
-lib/pkgconfig/libgraph.pc
-lib/pkgconfig/libgvc.pc
-lib/pkgconfig/libpathplan.pc
+libdata/pkgconfig/libagraph.pc
+libdata/pkgconfig/libcdt.pc
+libdata/pkgconfig/libgraph.pc
+libdata/pkgconfig/libgvc.pc
+libdata/pkgconfig/libpathplan.pc
 %%DATADIR%%/demo/doted
 %%DATADIR%%/demo/doted.README
 %%DATADIR%%/demo/entities