Update to 9.4.1.

PR:		ports/47329
Submitted by:	Ports Fury

3 files changed, 28 insertions, 26 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index b25b2ac2f3e0..137be697fbf8 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icon
-PORTVERSION=	9.4.0
+PORTVERSION=	9.4.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}.v${PORTVERSION:S/.//g}src
@@ -16,7 +16,15 @@ MAINTAINER=	ports@FreeBSD.org
 
 ONLY_FOR_ARCHS=	alpha i386
 
-.ifdef WITHOUT_X11
+USE_REINPLACE=	yes
+ALL_TARGET=	All
+
+MAN1=		icont.1
+
+ARCH_NAME=	${OPSYS:L}
+ICONDIR=	${PREFIX}/lib/${PORTNAME}
+
+.if defined(WITHOUT_X11)
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
 .else
@@ -25,47 +33,40 @@ CFLAGS+=	-I${X11BASE}/include
 CONFIG_CMD=	X-Configure
 PLIST_SUB=	WITHOUT_X11=
 .endif
-USE_REINPLACE=	yes
-ALL_TARGET=	All
-
-MAN1=		icont.1
-
-ARCH_NAME=	${ARCH:S/i386/intel/}_${OPSYS:L}
-ICONDIR=	${PREFIX}/lib/${PORTNAME}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
 		 s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \
 		${WRKSRC}/config/unix/${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
 
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${CONFIG_CMD} name=${ARCH_NAME})
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${ICONDIR}/bin
 .for file in icont iconx patchstr
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
-.endfor
-.ifndef WITHOUT_X11
-.for file in colrbook colrpick fontpick ipatch palette vib wevents xgamma
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
 .endfor
-.endif
 .for file in icont iconx
 	@${LN} -sf ${ICONDIR}/bin/${file} ${PREFIX}/bin/${file}
 .endfor
-.ifndef WITHOUT_X11
+	@${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
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
+.endfor
 	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
 .endif
-	@${MKDIR} ${ICONDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${ICONDIR}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 427b91e3fd18..3776419da2a9 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1 +1 @@
-MD5 (icon.v940src.tgz) = 1e4b77ad34af335d8eb5b64f16f7853a
+MD5 (icon.v941src.tgz) = 5ab62c32eb0d20fa6ee5840dd88a09f6
diff --git a/lang/icon/pkg-plist b/lang/icon/pkg-plist
index 9caf0f2f2919..2fe0b315d48f 100644
--- a/lang/icon/pkg-plist
+++ b/lang/icon/pkg-plist
@@ -329,8 +329,6 @@ lib/icon/lib/iscreen.u1
 lib/icon/lib/iscreen.u2
 lib/icon/lib/isdplot.u1
 lib/icon/lib/isdplot.u2
-lib/icon/lib/ispf.u1
-lib/icon/lib/ispf.u2
 lib/icon/lib/iterfncs.u1
 lib/icon/lib/iterfncs.u2
 lib/icon/lib/itlib.u1
@@ -385,6 +383,8 @@ lib/icon/lib/lstfncs.u1
 lib/icon/lib/lstfncs.u2
 lib/icon/lib/lsystem.u1
 lib/icon/lib/lsystem.u2
+lib/icon/lib/lterps.u1
+lib/icon/lib/lterps.u2
 lib/icon/lib/lu.u1
 lib/icon/lib/lu.u2
 lib/icon/lib/maccolor.icn
@@ -481,6 +481,8 @@ lib/icon/lib/plural.u1
 lib/icon/lib/plural.u2
 lib/icon/lib/polynom.u1
 lib/icon/lib/polynom.u2
+lib/icon/lib/polyseq.u1
+lib/icon/lib/polyseq.u2
 lib/icon/lib/polystuf.u1
 lib/icon/lib/polystuf.u2
 lib/icon/lib/popen.u1
@@ -545,8 +547,6 @@ lib/icon/lib/revadd.u1
 lib/icon/lib/revadd.u2
 lib/icon/lib/rewrap.u1
 lib/icon/lib/rewrap.u2
-lib/icon/lib/rexx.u1
-lib/icon/lib/rexx.u2
 lib/icon/lib/rgbcomp.u1
 lib/icon/lib/rgbcomp.u2
 lib/icon/lib/rgbrec.u1
@@ -800,6 +800,7 @@ lib/icon/lib/zipread.u2
 %%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