Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 32 insertions, 2 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 379805c593aa..e1690ac9ee1a 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dia
 PORTVERSION=	0.94
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index ed82de0e3e97..d87fce714003 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,33 +1,63 @@
 bin/dia
+lib/dia/libbondgraph_objects.la
 lib/dia/libbondgraph_objects.so
+lib/dia/libcairo_filter.la
 lib/dia/libcairo_filter.so
+lib/dia/libcgm_filter.la
 lib/dia/libcgm_filter.so
+lib/dia/libchronogram_objects.la
 lib/dia/libchronogram_objects.so
+lib/dia/libcustom_objects.la
 lib/dia/libcustom_objects.so
+lib/dia/libdia.la
 lib/dia/libdia.so
+lib/dia/libdxf_filter.la
 lib/dia/libdxf_filter.so
+lib/dia/liber_objects.la
 lib/dia/liber_objects.so
+lib/dia/libflowchart_objects.la
 lib/dia/libflowchart_objects.so
+lib/dia/libfs_objects.la
 lib/dia/libfs_objects.so
+lib/dia/libgrafcet_objects.la
 lib/dia/libgrafcet_objects.so
+lib/dia/libhpgl_filter.la
 lib/dia/libhpgl_filter.so
+lib/dia/libistar_objects.la
 lib/dia/libistar_objects.so
+lib/dia/libjackson_objects.la
 lib/dia/libjackson_objects.so
+lib/dia/libkaos_objects.la
 lib/dia/libkaos_objects.so
+lib/dia/libmetapost_filter.la
 lib/dia/libmetapost_filter.so
+lib/dia/libmisc_objects.la
 lib/dia/libmisc_objects.so
+lib/dia/libnetwork_objects.la
 lib/dia/libnetwork_objects.so
+lib/dia/libpixbuf_filter.la
 lib/dia/libpixbuf_filter.so
+lib/dia/libpstricks_filter.la
 lib/dia/libpstricks_filter.so
+%%PYTHON:%%lib/dia/libpython_plugin.la
 %%PYTHON:%%lib/dia/libpython_plugin.so
+lib/dia/libsadt_objects.la
 lib/dia/libsadt_objects.so
+lib/dia/libshape_filter.la
 lib/dia/libshape_filter.so
+lib/dia/libstandard_objects.la
 lib/dia/libstandard_objects.so
+lib/dia/libsvg_filter.la
 lib/dia/libsvg_filter.so
+lib/dia/libuml_objects.la
 lib/dia/libuml_objects.so
+lib/dia/libwmf_filter.la
 lib/dia/libwmf_filter.so
+lib/dia/libwpg_filter.la
 lib/dia/libwpg_filter.so
+lib/dia/libxfig_filter.la
 lib/dia/libxfig_filter.so
+lib/dia/libxslt_filter.la
 lib/dia/libxslt_filter.so
 share/gnome/applications/dia.desktop
 share/gnome/dia/dia.xpm