diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index ff5ff4c5e519..58948dcc8370 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,73 +1,71 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.62
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PostScript to other vector graphic formats
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 
 OPTIONS_DEFINE=	DOCS EMF EXAMPLES MAGICK MING PLOTUTILS
 OPTIONS_DEFAULT=	EMF MAGICK MING PLOTUTILS
 
 OPTIONS_SUB=	yes
 
 EMF_DESC=	Enable emf interface
 MING_DESC=	Enable swf interface
 PLOTUTILS_DESC=	Enable libplot interface
 
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig libtool
 USE_GHOSTSCRIPT=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
 CPPFLAGS+=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 EMF_LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF__CONFIGURE_OFF=	--without-emf
 
 MAGICK_LIB_DEPENDS=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick
 
 MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
 MING_CONFIGURE_ON=	--with-swf
 MING_CONFIGURE_OFF=	--without-swf
 
 PLOTUTILS_LIB_DEPENDS=	libplotter.so:${PORTSDIR}/graphics/plotutils
 PLOTUTILS_CONFIGURE_ON=	--with-libplot
 PLOTUTILS_CONFIGURE_OFF=	--without-libplot
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \
 		 s|GraphicsMagick|Magick|g ; \
 		 s|=$$OLDCPPFLAGS|=$$CPPFLAGS|g ; \
 		 s|-lstdc++||g ; \
 		 s|-pedantic||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${STAGEDIR}${DOCSDIR}
 
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist
index 127505577dca..c92e47b935ab 100644
--- a/graphics/pstoedit/pkg-plist
+++ b/graphics/pstoedit/pkg-plist
@@ -1,56 +1,50 @@
 bin/pstoedit
 include/pstoedit/base64writer.h
 include/pstoedit/cppcomp.h
 include/pstoedit/drvbase.h
 include/pstoedit/drvfuncs.h
 include/pstoedit/genericints.h
 include/pstoedit/miscutil.h
 include/pstoedit/ordlist.h
 include/pstoedit/papersizes.h
 include/pstoedit/poptions.h
 include/pstoedit/psimage.h
 include/pstoedit/pstoedit.h
 include/pstoedit/pstoeditoptions.h
 include/pstoedit/pstoeditoutputlib.h
 include/pstoedit/pstoedll.h
-lib/libpstoedit.a
-lib/libpstoedit.la
 lib/libpstoedit.so
 lib/libpstoedit.so.0
-%%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.a
-%%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.la
+lib/libpstoedit.so.0.0.0
 %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so
 %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0
-%%MAGICK%%lib/pstoedit/libp2edrvmagick++.a
-%%MAGICK%%lib/pstoedit/libp2edrvmagick++.la
+%%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0.0.0
 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so
 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0
-lib/pstoedit/libp2edrvstd.a
-lib/pstoedit/libp2edrvstd.la
+%%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0.0.0
 lib/pstoedit/libp2edrvstd.so
 lib/pstoedit/libp2edrvstd.so.0
-%%MING%%lib/pstoedit/libp2edrvswf.a
-%%MING%%lib/pstoedit/libp2edrvswf.la
+lib/pstoedit/libp2edrvstd.so.0.0.0
 %%MING%%lib/pstoedit/libp2edrvswf.so
 %%MING%%lib/pstoedit/libp2edrvswf.so.0
-%%EMF%%lib/pstoedit/libp2edrvwmf.a
-%%EMF%%lib/pstoedit/libp2edrvwmf.la
+%%MING%%lib/pstoedit/libp2edrvswf.so.0.0.0
 %%EMF%%lib/pstoedit/libp2edrvwmf.so
 %%EMF%%lib/pstoedit/libp2edrvwmf.so.0
+%%EMF%%lib/pstoedit/libp2edrvwmf.so.0.0.0
 libdata/pkgconfig/pstoedit.pc
 man/man1/pstoedit.1.gz
 share/aclocal/pstoedit.m4
 %%DATADIR%%/drvhpgl.pencolors
 %%DATADIR%%/examplefigmap.fmp
 %%DATADIR%%/latex2e.fmp
 %%DATADIR%%/mpost.fmp
 %%DATADIR%%/safer.ps
 %%DATADIR%%/svg.fmp
 %%DATADIR%%/swffonts/default.fdb
 %%DATADIR%%/unix.fmp
 %%DATADIR%%/wemf.fmp
 %%DATADIR%%/windows.fmp
 @dirrm %%DATADIR%%/swffonts
 @dirrm %%DATADIR%%
 @dirrm lib/pstoedit
 @dirrm include/pstoedit