- Upgrade to 9.4.3;

Changelog at <http://www.cs.arizona.edu/icon/v943/relnotes.htm>.

- Add a test target.

Note: this port is marked only for alpha and i386, but it should work on
other archs - anyone to test it?

3 files changed, 57 insertions, 29 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index ec693d311900..1242157c9f81 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icon
-PORTVERSION=	9.4.1
+PORTVERSION=	9.4.3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}.v${PORTVERSION:S/.//g}src
@@ -22,9 +22,12 @@ ALL_TARGET=	All
 
 MAN1=		icont.1
 
-ARCH_NAME=	${OPSYS:L}
+ARCH_NAME=	bsd
 ICONDIR=	${PREFIX}/lib/${PORTNAME}
 
+BINS=		icont iconx rtt
+BINXS=		colrbook colrpick fontpick palette vib wevents xgamma
+
 .if defined(WITHOUT_X11)
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
@@ -38,8 +41,10 @@ PLIST_SUB=	WITHOUT_X11=
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
+		 s|/usr/X11R6|${X11BASE}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}| ; \
 		 s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \
-		${WRKSRC}/config/unix/${ARCH_NAME}/Makedefs
+		${WRKSRC}/config/${ARCH_NAME}/Makedefs
 	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
 	@${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \
 		 s|-lc||g' ${WRKSRC}/ipl/cfuncs/mklib.sh
@@ -51,7 +56,7 @@ do-configure:
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${ICONDIR}/bin
-.for file in icont iconx patchstr
+.for file in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
 .endfor
 .for file in icont iconx
@@ -60,7 +65,7 @@ do-install:
 	@${MKDIR} ${ICONDIR}/lib
 	cd ${WRKSRC}/lib; ${INSTALL_DATA} *.* ${ICONDIR}/lib
 .if !defined(WITHOUT_X11)
-.for file in colrbook colrpick fontpick ipatch palette vib wevents xgamma
+.for file in ${BINXS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
 .endfor
 	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
@@ -70,4 +75,10 @@ do-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${DOCSDIR}
 .endif
 
+.if defined(MAINTAINER_MODE)
+test:	install
+	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} Test)
+.endif
+
 .include <bsd.port.mk>
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 9e192a819f7e..93b15642d018 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,3 +1,3 @@
-MD5 (icon.v941src.tgz) = 5ab62c32eb0d20fa6ee5840dd88a09f6
-SHA256 (icon.v941src.tgz) = 1fb63ec98d25511a1010f3543b7c146ecb59e5b75562777163d79ad44de89230
-SIZE (icon.v941src.tgz) = 3249869
+MD5 (icon.v943src.tgz) = 4740b1fc5caf2fe7409367923dffe607
+SHA256 (icon.v943src.tgz) = d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff
+SIZE (icon.v943src.tgz) = 3218627
diff --git a/lang/icon/pkg-plist b/lang/icon/pkg-plist
index 2fe0b315d48f..f4a8483f7050 100644
--- a/lang/icon/pkg-plist
+++ b/lang/icon/pkg-plist
@@ -7,9 +7,8 @@ lib/icon/bin/icont
 lib/icon/bin/iconx
 @exec ln -sf %B/%f %D/bin/%f
 @unexec rm -f %D/bin/%f
-%%WITHOUT_X11%%lib/icon/bin/ipatch
 %%WITHOUT_X11%%lib/icon/bin/palette
-lib/icon/bin/patchstr
+lib/icon/bin/rtt
 %%WITHOUT_X11%%lib/icon/bin/vib
 %%WITHOUT_X11%%@exec ln -sf %B/%f %D/bin/%f
 %%WITHOUT_X11%%@unexec rm -f %D/bin/%f
@@ -65,6 +64,8 @@ lib/icon/lib/bkutil.u1
 lib/icon/lib/bkutil.u2
 lib/icon/lib/bold.u1
 lib/icon/lib/bold.u2
+lib/icon/lib/boolops.u1
+lib/icon/lib/boolops.u2
 lib/icon/lib/bufread.u1
 lib/icon/lib/bufread.u2
 lib/icon/lib/button.u1
@@ -145,6 +146,8 @@ lib/icon/lib/dif.u1
 lib/icon/lib/dif.u2
 lib/icon/lib/digitcnt.u1
 lib/icon/lib/digitcnt.u2
+lib/icon/lib/dijkstra.u1
+lib/icon/lib/dijkstra.u2
 lib/icon/lib/distance.u1
 lib/icon/lib/distance.u2
 lib/icon/lib/divide.u1
@@ -329,6 +332,8 @@ lib/icon/lib/iscreen.u1
 lib/icon/lib/iscreen.u2
 lib/icon/lib/isdplot.u1
 lib/icon/lib/isdplot.u2
+lib/icon/lib/isdxplot.u1
+lib/icon/lib/isdxplot.u2
 lib/icon/lib/iterfncs.u1
 lib/icon/lib/iterfncs.u2
 lib/icon/lib/itlib.u1
@@ -392,6 +397,8 @@ lib/icon/lib/makelsys.u1
 lib/icon/lib/makelsys.u2
 lib/icon/lib/mapbit.u1
 lib/icon/lib/mapbit.u2
+lib/icon/lib/mapnav.u1
+lib/icon/lib/mapnav.u2
 lib/icon/lib/mapstr.u1
 lib/icon/lib/mapstr.u2
 lib/icon/lib/matchlib.u1
@@ -400,6 +407,8 @@ lib/icon/lib/math.u1
 lib/icon/lib/math.u2
 lib/icon/lib/matrix.u1
 lib/icon/lib/matrix.u2
+lib/icon/lib/matrix2.u1
+lib/icon/lib/matrix2.u2
 lib/icon/lib/memlog.u1
 lib/icon/lib/memlog.u2
 lib/icon/lib/memrfncs.u1
@@ -420,6 +429,8 @@ lib/icon/lib/namepfx.u1
 lib/icon/lib/namepfx.u2
 lib/icon/lib/navitrix.u1
 lib/icon/lib/navitrix.u2
+lib/icon/lib/nestlist.u1
+lib/icon/lib/nestlist.u2
 lib/icon/lib/ngrams.u1
 lib/icon/lib/ngrams.u2
 lib/icon/lib/noncase.u1
@@ -459,6 +470,8 @@ lib/icon/lib/patch.u1
 lib/icon/lib/patch.u2
 lib/icon/lib/patterns.u1
 lib/icon/lib/patterns.u2
+lib/icon/lib/pattread.u1
+lib/icon/lib/pattread.u2
 lib/icon/lib/patutils.u1
 lib/icon/lib/patutils.u2
 lib/icon/lib/patword.u1
@@ -790,25 +803,29 @@ lib/icon/lib/xutils.u1
 lib/icon/lib/xutils.u2
 lib/icon/lib/zipread.u1
 lib/icon/lib/zipread.u2
-%%PORTDOCS%%share/doc/icon/blubordr.gif
-%%PORTDOCS%%share/doc/icon/build.htm
-%%PORTDOCS%%share/doc/icon/clnroff.sed
-%%PORTDOCS%%share/doc/icon/cube128.gif
-%%PORTDOCS%%share/doc/icon/docguide.htm
-%%PORTDOCS%%share/doc/icon/faq.htm
-%%PORTDOCS%%share/doc/icon/faq.txt
-%%PORTDOCS%%share/doc/icon/files.htm
-%%PORTDOCS%%share/doc/icon/gb80.jpg
-%%PORTDOCS%%share/doc/icon/ib80.jpg
-%%PORTDOCS%%share/doc/icon/icon.txt
-%%PORTDOCS%%share/doc/icon/icont.txt
-%%PORTDOCS%%share/doc/icon/index.htm
-%%PORTDOCS%%share/doc/icon/install.htm
-%%PORTDOCS%%share/doc/icon/istyle.css
-%%PORTDOCS%%share/doc/icon/lb80.jpg
-%%PORTDOCS%%share/doc/icon/relnotes.htm
-%%PORTDOCS%%share/doc/icon/wwwcube.gif
-%%PORTDOCS%%@dirrm share/doc/icon
+%%PORTDOCS%%%%DOCSDIR%%/blubordr.gif
+%%PORTDOCS%%%%DOCSDIR%%/build.htm
+%%PORTDOCS%%%%DOCSDIR%%/clnroff.sed
+%%PORTDOCS%%%%DOCSDIR%%/cube128.gif
+%%PORTDOCS%%%%DOCSDIR%%/cygwin.htm
+%%PORTDOCS%%%%DOCSDIR%%/docguide.htm
+%%PORTDOCS%%%%DOCSDIR%%/faq.htm
+%%PORTDOCS%%%%DOCSDIR%%/faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/files.htm
+%%PORTDOCS%%%%DOCSDIR%%/gb80.jpg
+%%PORTDOCS%%%%DOCSDIR%%/ib80.jpg
+%%PORTDOCS%%%%DOCSDIR%%/icon.txt
+%%PORTDOCS%%%%DOCSDIR%%/icont.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/install.htm
+%%PORTDOCS%%%%DOCSDIR%%/istyle.css
+%%PORTDOCS%%%%DOCSDIR%%/lb80.jpg
+%%PORTDOCS%%%%DOCSDIR%%/macintosh.htm
+%%PORTDOCS%%%%DOCSDIR%%/port.htm
+%%PORTDOCS%%%%DOCSDIR%%/relnotes.htm
+%%PORTDOCS%%%%DOCSDIR%%/shortcut.gif
+%%PORTDOCS%%%%DOCSDIR%%/wwwcube.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/icon/lib
 @dirrm lib/icon/bin
 @dirrm lib/icon