- Update afnix to 2.4.0

- Enable stage support

6 files changed, 142 insertions, 45 deletions

diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index bd4b806833b3..bde6a7b7888b 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	afnix
-PORTVERSION=	2.3.1
+PORTVERSION=	2.4.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.afnix.org/ftp/ \
 		ftp://ftp.stack.nl/pub/users/johans/afnix/
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	A multi-threaded functional programming language
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	cnf/bin/afnix-setup
@@ -24,13 +24,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 PORTDOCS=	*
 PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
-MAN1=	afnix::adp.1 afnix::axp.1 axc.1 axd.1 axi.1 axl.1
-MAN3=	afnix::csm.3 afnix::gfx.3 afnix::itu.3 afnix::mth.3 afnix::net.3 \
-	afnix::nwg.3 afnix::sec.3 afnix::sio.3 afnix::sps.3 afnix::sys.3 \
-	afnix::txt.3 afnix::wax.3 afnix::xml.3 afnix::xpe.3
-MAN7=	afnix::guide.7 afnix::license.7 afnix::notes.7 afnix::reference.7
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
@@ -44,8 +37,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(CP)|$$(BSD_INSTALL_PROGRAM)|' \
 		${WRKSRC}/src/*/*/exe/Makefile
 	@${REINPLACE_CMD} -e '/\.rtf/d' ${WRKSRC}/etc/Makefile
-	@${REINPLACE_CMD} -e '/^MANDIR/s/SHRDIR/MANPREFIX/' \
-		${WRKSRC}/cnf/mak/afnix-defs.mak
 	@${REINPLACE_CMD} -e '/uname -r/s/\\\./[.-]/' \
 		${WRKSRC}/cnf/bin/afnix-guess
 
@@ -57,10 +48,10 @@ post-install:
 .if ! ${PORT_OPTIONS:MDOCS}
 . for i in ${MAN1} ${MAN3} ${MAN7}
 	${INSTALL_MAN} ${WRKSRC}/bld/${PORTNAME}-doc-${PORTVERSION}/man/$i \
-		${MANPREFIX}/man/man${i:E}/
+		${STAGEDIR}${MANPREFIX}/man/man${i:E}/
 . endfor
 .else
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} publish
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${GMAKE} publish
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/afnix/distinfo b/lang/afnix/distinfo
index 7cc9c6b54dc5..0f6085a16bea 100644
--- a/lang/afnix/distinfo
+++ b/lang/afnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (afnix-src-2.3.1.tgz) = 0362c127a56ffd2bbd807d213fb95e1268532ac5cfab48bb29ee8a0bf6cf9632
-SIZE (afnix-src-2.3.1.tgz) = 2037185
+SHA256 (afnix-src-2.4.0.tgz) = 59885a5c1b4a211ff38313c22c45c7953711e1267beaa20c244287ad9de28b3c
+SIZE (afnix-src-2.4.0.tgz) = 2112317
diff --git a/lang/afnix/files/patch-cnf_bin_afnix-setup b/lang/afnix/files/patch-cnf_bin_afnix-setup
index 5c7599933f64..b4818f678278 100644
--- a/lang/afnix/files/patch-cnf_bin_afnix-setup
+++ b/lang/afnix/files/patch-cnf_bin_afnix-setup
@@ -1,9 +1,9 @@
---- cnf/bin/afnix-setup.orig	2013-05-04 18:23:38.000000000 +0200
-+++ cnf/bin/afnix-setup	2013-05-04 18:23:42.000000000 +0200
-@@ -364,7 +364,7 @@ do
-     --pkgman=*)    pkgman="$argopt";;
-     --pkgdoc)      preopt=pkgdoc;;
+--- cnf/bin/afnix-setup.orig	2014-01-02 15:24:19.000000000 +0100
++++ cnf/bin/afnix-setup	2014-01-05 21:12:17.000000000 +0100
+@@ -378,7 +378,7 @@ do
      --pkgdoc=*)    pkgdoc="$argopt";;
+     --pkgwww)      preopt=pkgwww;;
+     --pkgwww=*)    pkgwww="$argopt";;
 -    --compiler)    preopt=compiler;;
 +    --compiler)    preopt=ccname;;
      --compiler=*)  ccname="$argopt";;
diff --git a/lang/afnix/files/patch-cnf_mak_afnix-defs.mak b/lang/afnix/files/patch-cnf_mak_afnix-defs.mak
new file mode 100644
index 000000000000..4a19aaaaf3c0
--- /dev/null
+++ b/lang/afnix/files/patch-cnf_mak_afnix-defs.mak
@@ -0,0 +1,25 @@
+--- cnf/mak/afnix-defs.mak.orig	2014-01-02 15:24:19.000000000 +0100
++++ cnf/mak/afnix-defs.mak	2014-01-08 15:26:18.000000000 +0100
+@@ -58,14 +58,14 @@ BLDDEB		= $(BLDPKG)/deb/afnix-$(VERSION)
+ # - install path definition                                                  -
+ # ----------------------------------------------------------------------------
+ 
+-BINDIR		= $(PREFIX)/bin
+-LIBDIR		= $(PREFIX)/lib
+-PRJDIR		= $(PREFIX)/lib/afnix
+-HDRDIR		= $(PREFIX)/include/afnix
+-DOCDIR		= $(SHRDIR)/doc/afnix
+-MANDIR		= $(SHRDIR)/man
+-ETCDIR		= $(ALTDIR)/etc/afnix
+-WWWDIR		= $(ALTDIR)/var/www/afnix
++BINDIR		= $(DESTDIR)$(PREFIX)/bin
++LIBDIR		= $(DESTDIR)$(PREFIX)/lib
++PRJDIR		= $(DESTDIR)$(PREFIX)/lib/afnix
++HDRDIR		= $(DESTDIR)$(PREFIX)/include/afnix
++DOCDIR		= $(DESTDIR)$(SHRDIR)/doc/afnix
++MANDIR		= $(DESTDIR)$(MANPREFIX)/man
++ETCDIR		= $(DESTDIR)$(ALTDIR)/etc/afnix
++WWWDIR		= $(DESTDIR)$(ALTDIR)/var/www/afnix
+ 
+ # ----------------------------------------------------------------------------
+ # - other shared commands and scripts                                        -
diff --git a/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak b/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak
index ceeab37f73b0..f0399e30bed7 100644
--- a/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak
+++ b/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak
@@ -27,6 +27,6 @@
  CXXCCFLAGS      = 
 -STDDEFINES      =
 +STDDEFINES      = $(PTHREAD_CFLAGS)
- DBGDEFINES      = -DDEBUG
+ DBGDEFINES      = -DAFNIX_DEBUG
  OPTDEFINES      =
- STDINCLUDE      =
+ PFLDEFINES	= -DAFNIX_DEBUG -DAFNIX_PROFILED
diff --git a/lang/afnix/pkg-plist b/lang/afnix/pkg-plist
index 4d2d81f08a1e..50d71c2a845d 100644
--- a/lang/afnix/pkg-plist
+++ b/lang/afnix/pkg-plist
@@ -11,10 +11,12 @@ include/afnix/csm/Libcsm.hpp
 include/afnix/csm/LocalSpace.hpp
 include/afnix/csm/Predcsm.hpp
 include/afnix/csm/Rco.hpp
+include/afnix/csm/Saas.hpp
 include/afnix/csm/Session.hpp
 include/afnix/csm/SessionSet.hpp
 include/afnix/csm/Slot.hpp
 include/afnix/csm/WorkSpace.hpp
+include/afnix/csm/Xaas.hpp
 include/afnix/eng/ArgsList.hpp
 include/afnix/eng/Builtin.hpp
 include/afnix/eng/Class.hpp
@@ -77,29 +79,38 @@ include/afnix/itu/AsnUtils.hpp
 include/afnix/itu/Libitu.hpp
 include/afnix/itu/Oid.hpp
 include/afnix/itu/Preditu.hpp
-include/afnix/itu/X509.hpp
-include/afnix/itu/Xalgo.hpp
 include/afnix/mth/Algebra.hpp
+include/afnix/mth/Bcs.hpp
+include/afnix/mth/Cgs.hpp
+include/afnix/mth/Direct.hpp
 include/afnix/mth/Ippd.hpp
-include/afnix/mth/Krylov.hpp
+include/afnix/mth/Iterative.hpp
 include/afnix/mth/Libmth.hpp
 include/afnix/mth/Linear.hpp
+include/afnix/mth/LinearFactory.hpp
 include/afnix/mth/Mpia.hpp
-include/afnix/mth/MthCalls.hpp
 include/afnix/mth/Newton.hpp
+include/afnix/mth/Parallel.hpp
 include/afnix/mth/Predmth.hpp
 include/afnix/mth/Primality.hpp
+include/afnix/mth/Qr.hpp
 include/afnix/mth/Random.hpp
+include/afnix/mth/Rblock.hpp
 include/afnix/mth/Rfi.hpp
 include/afnix/mth/Rfunction.hpp
+include/afnix/mth/Rgivens.hpp
 include/afnix/mth/Rmatrix.hpp
 include/afnix/mth/Rmd.hpp
 include/afnix/mth/Rmi.hpp
 include/afnix/mth/Rni.hpp
+include/afnix/mth/Rpi.hpp
 include/afnix/mth/Rpolynom.hpp
 include/afnix/mth/Rsamples.hpp
 include/afnix/mth/Rvector.hpp
 include/afnix/mth/Rvi.hpp
+include/afnix/mth/Solver.hpp
+include/afnix/mth/SolverFactory.hpp
+include/afnix/mth/Tqmr.hpp
 include/afnix/net/Address.hpp
 include/afnix/net/Datagram.hpp
 include/afnix/net/Libnet.hpp
@@ -204,6 +215,7 @@ include/afnix/sps/Record.hpp
 include/afnix/sps/Sheet.hpp
 include/afnix/sps/SpsCalls.hpp
 include/afnix/sps/Xref.hpp
+include/afnix/std/AliasTable.hpp
 include/afnix/std/Ascii.hpp
 include/afnix/std/Bitset.hpp
 include/afnix/std/BlockBuffer.hpp
@@ -314,6 +326,19 @@ include/afnix/svg/Transform.hpp
 include/afnix/sys/Libsys.hpp
 include/afnix/sys/Predsys.hpp
 include/afnix/sys/SysCalls.hpp
+include/afnix/tls/Libtls.hpp
+include/afnix/tls/Predtls.hpp
+include/afnix/tls/TlsHandshake.hpp
+include/afnix/tls/TlsHeader.hpp
+include/afnix/tls/TlsMessage.hpp
+include/afnix/tls/TlsRecord.hpp
+include/afnix/tls/TlsServer.hpp
+include/afnix/tls/TlsSocket.hpp
+include/afnix/tls/X509.hpp
+include/afnix/tls/Xalgo.hpp
+include/afnix/tls/Xextn.hpp
+include/afnix/tls/Xkey.hpp
+include/afnix/tls/Xoid.hpp
 include/afnix/txt/Lexeme.hpp
 include/afnix/txt/Lexicon.hpp
 include/afnix/txt/Libtxt.hpp
@@ -418,6 +443,7 @@ include/afnix/xpe/XmlPrintTable.hpp
 include/afnix/xpe/XmlProcessor.hpp
 lib/afnix/afnix-std-adp.axl
 lib/afnix/afnix-std-axp.axl
+lib/afnix/afnix-std-tls.axl
 lib/libafnix-csm.a
 lib/libafnix-csm.so
 lib/libafnix-csm.so.2
@@ -463,6 +489,9 @@ lib/libafnix-svg.so.2
 lib/libafnix-sys.a
 lib/libafnix-sys.so
 lib/libafnix-sys.so.2
+lib/libafnix-tls.a
+lib/libafnix-tls.so
+lib/libafnix-tls.so.2
 lib/libafnix-txt.a
 lib/libafnix-txt.so
 lib/libafnix-txt.so.2
@@ -475,24 +504,76 @@ lib/libafnix-xml.so.2
 lib/libafnix-xpe.a
 lib/libafnix-xpe.so
 lib/libafnix-xpe.so.2
-@dirrm include/afnix/csm
-@dirrm include/afnix/eng
-@dirrm include/afnix/gfx
-@dirrm include/afnix/itu
-@dirrm include/afnix/mth
-@dirrm include/afnix/net
-@dirrm include/afnix/nwg
-@dirrm include/afnix/phy
-@dirrm include/afnix/plt
-@dirrm include/afnix/sec
-@dirrm include/afnix/sio
-@dirrm include/afnix/sps
-@dirrm include/afnix/std
-@dirrm include/afnix/svg
-@dirrm include/afnix/sys
-@dirrm include/afnix/txt
-@dirrm include/afnix/wax
-@dirrm include/afnix/xml
+man/man1/afnix::adp.1.gz
+man/man1/afnix::axp.1.gz
+man/man1/axc.1.gz
+man/man1/axd.1.gz
+man/man1/axi.1.gz
+man/man1/axl.1.gz
+man/man3/afnix::csm.3.gz
+man/man3/afnix::gfx.3.gz
+man/man3/afnix::itu.3.gz
+man/man3/afnix::mth.3.gz
+man/man3/afnix::net.3.gz
+man/man3/afnix::nwg.3.gz
+man/man3/afnix::sec.3.gz
+man/man3/afnix::sio.3.gz
+man/man3/afnix::sps.3.gz
+man/man3/afnix::sys.3.gz
+man/man3/afnix::txt.3.gz
+man/man3/afnix::wax.3.gz
+man/man3/afnix::xml.3.gz
+man/man3/afnix::xpe.3.gz
+man/man7/afnix::guide.7.gz
+man/man7/afnix::license.7.gz
+man/man7/afnix::notes.7.gz
+man/man7/afnix::reference.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/adp.xht
+%%PORTDOCS%%%%DOCSDIR%%/afnix.png
+%%PORTDOCS%%%%DOCSDIR%%/axc.xht
+%%PORTDOCS%%%%DOCSDIR%%/axd.xht
+%%PORTDOCS%%%%DOCSDIR%%/axi.xht
+%%PORTDOCS%%%%DOCSDIR%%/axl.xht
+%%PORTDOCS%%%%DOCSDIR%%/axp.xht
+%%PORTDOCS%%%%DOCSDIR%%/csm.xht
+%%PORTDOCS%%%%DOCSDIR%%/eul.xht
+%%PORTDOCS%%%%DOCSDIR%%/gfx.xht
+%%PORTDOCS%%%%DOCSDIR%%/itu.xht
+%%PORTDOCS%%%%DOCSDIR%%/mth.xht
+%%PORTDOCS%%%%DOCSDIR%%/net.xht
+%%PORTDOCS%%%%DOCSDIR%%/nwg.xht
+%%PORTDOCS%%%%DOCSDIR%%/sec.xht
+%%PORTDOCS%%%%DOCSDIR%%/sio.xht
+%%PORTDOCS%%%%DOCSDIR%%/sps.xht
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/sys.xht
+%%PORTDOCS%%%%DOCSDIR%%/txt.xht
+%%PORTDOCS%%%%DOCSDIR%%/vol-0.xht
+%%PORTDOCS%%%%DOCSDIR%%/vol-1.xht
+%%PORTDOCS%%%%DOCSDIR%%/vol-2.xht
+%%PORTDOCS%%%%DOCSDIR%%/wax.xht
+%%PORTDOCS%%%%DOCSDIR%%/xml.xht
+%%PORTDOCS%%%%DOCSDIR%%/xpe.xht
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/afnix
 @dirrm include/afnix/xpe
+@dirrm include/afnix/xml
+@dirrm include/afnix/wax
+@dirrm include/afnix/txt
+@dirrm include/afnix/tls
+@dirrm include/afnix/sys
+@dirrm include/afnix/svg
+@dirrm include/afnix/std
+@dirrm include/afnix/sps
+@dirrm include/afnix/sio
+@dirrm include/afnix/sec
+@dirrm include/afnix/plt
+@dirrm include/afnix/phy
+@dirrm include/afnix/nwg
+@dirrm include/afnix/net
+@dirrm include/afnix/mth
+@dirrm include/afnix/itu
+@dirrm include/afnix/gfx
+@dirrm include/afnix/eng
+@dirrm include/afnix/csm
 @dirrm include/afnix
-@dirrm lib/afnix