3 files changed, 26 insertions, 33 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index ffc78d913832..a38867a056a3 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	icon
-PORTVERSION=	9.5.0
+PORTVERSION=	9.5.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/.//g}src
@@ -11,15 +11,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Icon programming language
 
+USE_GCC=	any
 ALL_TARGET=	All
 MAKE_JOBS_UNSAFE=	yes
-
-.if ${CC} == "clang" || ${CXX} == "clang++"
-BROKEN=		does not pass all tests when compiled with clang
-.endif
-
-MAN1=		icon.1 icont.1
-
 ARCH_NAME=	bsd
 ICONDIR=	${PREFIX}/lib/${PORTNAME}
 
@@ -36,7 +30,6 @@ CONFIG_CMD=	X-Configure
 PLIST_SUB=	WITHOUT_X11=
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
@@ -53,27 +46,27 @@ do-configure:
 		${MAKEFILE} ${MAKE_ARGS} ${CONFIG_CMD} name=${ARCH_NAME})
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/man/man1/icon.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${ICONDIR}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/man1/icon.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${ICONDIR}/bin
 .for file in ${BINS}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${STAGEDIR}${ICONDIR}/bin/${file}
 .endfor
 .for file in icont iconx
-	@${LN} -sf ${ICONDIR}/bin/${file} ${PREFIX}/bin/${file}
+	@${LN} -sf ${ICONDIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
-	@${LN} -sf ${ICONDIR}/bin/icont ${PREFIX}/bin/icon
-	@${MKDIR} ${ICONDIR}/lib
-	cd ${WRKSRC}/lib; ${INSTALL_DATA} *.* ${ICONDIR}/lib
+	@${LN} -sf ${ICONDIR}/bin/icont ${STAGEDIR}${PREFIX}/bin/icon
+	@${MKDIR} ${STAGEDIR}${ICONDIR}/lib
+	cd ${WRKSRC}/lib; ${INSTALL_DATA} *.* ${STAGEDIR}${ICONDIR}/lib
 .if !defined(WITHOUT_X11)
 .for file in ${BINXS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${ICONDIR}/bin/${file}
 .endfor
-	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
+	@${LN} -sf ${ICONDIR}/bin/vib ${STAGEDIR}${PREFIX}/bin/vib
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if defined(MAINTAINER_MODE)
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 4d0c5377f10b..a33cb2901c79 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icon-v950src.tgz) = ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557
-SIZE (icon-v950src.tgz) = 3115766
+SHA256 (icon-v951src.tgz) = 062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9
+SIZE (icon-v951src.tgz) = 3133040
diff --git a/lang/icon/pkg-plist b/lang/icon/pkg-plist
index 7aedbcac6f9e..c62d450ab9c3 100644
--- a/lang/icon/pkg-plist
+++ b/lang/icon/pkg-plist
@@ -1,18 +1,14 @@
+bin/icon
+bin/icont
+bin/iconx
+%%WITHOUT_X11%%bin/vib
 %%WITHOUT_X11%%lib/icon/bin/colrbook
 %%WITHOUT_X11%%lib/icon/bin/colrpick
 %%WITHOUT_X11%%lib/icon/bin/fontpick
 lib/icon/bin/icont
-@exec ln -sf %B/%f %D/bin/%f
-@unexec rm -f %D/bin/%f
-@exec ln -sf %B/%f %D/bin/icon
-@unexec rm -f %D/bin/icon
 lib/icon/bin/iconx
-@exec ln -sf %B/%f %D/bin/%f
-@unexec rm -f %D/bin/%f
 %%WITHOUT_X11%%lib/icon/bin/palette
 %%WITHOUT_X11%%lib/icon/bin/vib
-%%WITHOUT_X11%%@exec ln -sf %B/%f %D/bin/%f
-%%WITHOUT_X11%%@unexec rm -f %D/bin/%f
 %%WITHOUT_X11%%lib/icon/bin/wevents
 %%WITHOUT_X11%%lib/icon/bin/xgamma
 lib/icon/lib/abkform.u1
@@ -163,10 +159,10 @@ lib/icon/lib/drawlab.u1
 lib/icon/lib/drawlab.u2
 lib/icon/lib/dsetup.u1
 lib/icon/lib/dsetup.u2
-lib/icon/lib/echo.u1
-lib/icon/lib/echo.u2
 lib/icon/lib/ebcdic.u1
 lib/icon/lib/ebcdic.u2
+lib/icon/lib/echo.u1
+lib/icon/lib/echo.u2
 lib/icon/lib/empgsup.u1
 lib/icon/lib/empgsup.u2
 lib/icon/lib/emptygen.u1
@@ -366,6 +362,8 @@ lib/icon/lib/lastname.u1
 lib/icon/lib/lastname.u2
 lib/icon/lib/lcseval.u1
 lib/icon/lib/lcseval.u2
+lib/icon/lib/levensht.u1
+lib/icon/lib/levensht.u2
 lib/icon/lib/linddefs.u1
 lib/icon/lib/linddefs.u2
 lib/icon/lib/linddraw.u1
@@ -806,6 +804,8 @@ lib/icon/lib/xutils.u1
 lib/icon/lib/xutils.u2
 lib/icon/lib/zipread.u1
 lib/icon/lib/zipread.u2
+man/man1/icon.1.gz
+man/man1/icont.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/blubordr.gif
 %%PORTDOCS%%%%DOCSDIR%%/build.htm
 %%PORTDOCS%%%%DOCSDIR%%/cfuncs.htm