diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index fb8e5dcad56e..c18eb140af39 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -2,45 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	xcircuit
-PORTVERSION=	3.7.51
+PORTVERSION=	3.7.52
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
 		http://fossies.org/unix/misc/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	danilogondolfo@gmail.com
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	X11 circuit schematics drawing program
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 OPTIONS_DEFINE=	EXAMPLES
 
 USE_XORG=	xpm xscrnsaver xt
-USE_TCL=	85
-USE_TCL_BUILD=	85
-USE_TK=		85
-USE_TK_BUILD=	85
+USES=	tk gmake
 USE_GHOSTSCRIPT_RUN=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
-MAN1=		xcircuit.1
-
-DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${DATADIR}/pixmaps/xcircuit.gif" \
+DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${DATADIR}/pixmaps/${PORTNAME}.gif" \
 		"${PORTNAME}" "" "false"
 
 # Restrict to stable (odd) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,odd
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s| == | = |g ; \
 		 s|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"|g ; \
@@ -49,13 +39,11 @@ post-patch:
 		 s|-fpic|-fPIC|g' ${WRKSRC}/configure
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.lgf ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.lps ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.sim ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.lgf ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.lps ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.sim ${STAGEDIR}/${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 46113e04dbc0..9a17983cb642 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcircuit-3.7.51.tgz) = f83c068bcc0e1391cd2f0a6d94ef2deb8b1692acaaf54a7272ee75eaec2d025c
-SIZE (xcircuit-3.7.51.tgz) = 1649228
+SHA256 (xcircuit-3.7.52.tgz) = 5dcc62c3253ef9dadb36431ed95dd681d42d4cfffaa11c5031e4c4610884d6ff
+SIZE (xcircuit-3.7.52.tgz) = 1649240
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 73bc73e2cc05..c043a51372b4 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -1,6 +1,6 @@
-@comment $FreeBSD$
 bin/xcircuit
 lib/X11/app-defaults/XCircuit
+man/man1/xcircuit.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.xcircuitrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FlareLED.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/USAflag.ps
@@ -136,7 +136,7 @@ lib/X11/app-defaults/XCircuit
 %%DATADIR%%/xcircuit.so
 %%DATADIR%%/xcircuit.tcl
 %%DATADIR%%/xcstartup.tcl
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%DATADIR%%/pixmaps
+@dirrmtry %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%