36 files changed, 295 insertions, 983 deletions

diff --git a/MOVED b/MOVED
index d4a1444da054..34913916c095 100644
--- a/MOVED
+++ b/MOVED
@@ -1390,3 +1390,4 @@ x11-themes/lila-xfce4-panel||2005-02-02|don't work with new xfce4
 print/teTeX-latex2e||2005-02-06|obsolete by new teTeX-texmf
 emulators/qcl|science/qcl|2005-02-10|moved to better category
 security/rng_82802||2005-02-14|obsolete
+lang/aleph|lang/afnix|2005-02-19|project renamed
diff --git a/lang/Makefile b/lang/Makefile
index 088a165c5db9..9d9291507796 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -7,7 +7,7 @@
     SUBDIR += STk
     SUBDIR += Sather
     SUBDIR += TenDRA
-    SUBDIR += aleph
+    SUBDIR += afnix
     SUBDIR += alisp
     SUBDIR += asn1c
     SUBDIR += atlast
diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index 9b3bab06ad12..baffbe4b59f5 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -6,31 +6,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	aleph
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTNAME=	afnix
+PORTVERSION=	1.0.0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.aleph-lang.org/ftp/%SUBDIR%/
+MASTER_SITES=	http://www.afnix.org/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION:S,.,-,g}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION:S,.,-,g}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	A multi-threaded functional programming language
 
 USE_GMAKE=	yes
-MAKE_ARGS=	CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
-		DYNCCFLAGS="-fPIC -DPIC" DEBUGFLAGS="" DBGDEFINES="" \
-		STDDEFINES="${PTHREAD_CFLAGS}" EXELDFLAGS="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
-MAN1=	aleph.1 axc.1 axl.1
+MAN1=	afnix.1 axc.1 axd.1 axl.1
+
+.include <bsd.port.pre.mk>
 
 do-configure:
-	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
+	@${WRKSRC}/cnf/bin/${PORTNAME}-setup -o
+	@rm ${WRKSRC}/src/lib/txt/lib/Digest.[ch]pp
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/aleph
+	@${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/afnix/distinfo b/lang/afnix/distinfo
index bc09392fa8e5..60330a25b230 100644
--- a/lang/afnix/distinfo
+++ b/lang/afnix/distinfo
@@ -1,2 +1,2 @@
-MD5 (aleph-src-0-9-0.tar.gz) = 4c9120034832444bda87c0023365f624
-SIZE (aleph-src-0-9-0.tar.gz) = 463853
+MD5 (afnix-src-1-0-0.tgz) = 57260a0d02f64da0d3c6e23e041dcbbf
+SIZE (afnix-src-1-0-0.tgz) = 524526
diff --git a/lang/afnix/files/patch-cnf_bin_afnix-guess b/lang/afnix/files/patch-cnf_bin_afnix-guess
new file mode 100644
index 000000000000..e0b9521c4794
--- /dev/null
+++ b/lang/afnix/files/patch-cnf_bin_afnix-guess
@@ -0,0 +1,10 @@
+--- cnf/bin/afnix-guess.orig	Wed Jan 12 06:05:00 2005
++++ cnf/bin/afnix-guess	Wed Feb 16 19:18:04 2005
+@@ -113,6 +113,7 @@
+     mips)     proc_name=mips;;
+     mipsel)   proc_name=mipsel;;    
+     parisc*)  proc_name=pa64;;
++    amd64)    proc_name=amd64;;
+     ia64)     proc_name=ia64;;
+     s390*)    proc_name=s390;;
+     x86_64)   proc_name=x64;;
diff --git a/lang/afnix/files/patch-cnf_bin_aleph-guess b/lang/afnix/files/patch-cnf_bin_aleph-guess
deleted file mode 100644
index b2336fe2517f..000000000000
--- a/lang/afnix/files/patch-cnf_bin_aleph-guess
+++ /dev/null
@@ -1,10 +0,0 @@
---- cnf/bin/aleph-guess.orig	Tue Feb  8 21:33:40 2005
-+++ cnf/bin/aleph-guess	Tue Feb  8 21:33:37 2005
-@@ -113,6 +113,7 @@
-     mips)     proc_name=mips;;
-     mipsel)   proc_name=mipsel;;    
-     parisc64) proc_name=pa64;;
-+    amd64)    proc_name=amd64;;
-     ia64)     proc_name=ia64;;
-     s390)     proc_name=s390;;
-     esac
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..8cc443ae4270
--- /dev/null
+++ b/lang/afnix/files/patch-cnf_mak_afnix-defs.mak
@@ -0,0 +1,16 @@
+--- cnf/mak/afnix-defs.mak.orig	Wed Feb 16 19:35:18 2005
++++ cnf/mak/afnix-defs.mak	Wed Feb 16 19:37:55 2005
+@@ -58,10 +58,10 @@
+ BINDIR		= $(PREFIX)/bin
+ LIBDIR		= $(PREFIX)/lib
+ SHARED		= $(PREFIX)/share
+-HDRDIR		= $(SHARED)/include/afnix
++HDRDIR		= $(PREFIX)/include/afnix
+ DOCDIR		= $(SHARED)/doc/afnix
+-MANDIR		= $(SHARED)/man
+-ETCDIR		= $(SHARED)/etc/afnix
++MANDIR		= $(PREFIX)/man
++ETCDIR		= $(SHARED)/doc/afnix
+ 
+ # ----------------------------------------------------------------------------
+ # - other shared commands and scripts                                        -
diff --git a/lang/aleph/files/patch-cnf_mak_aleph-gcc-3.mak b/lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak
index 5f907e0011d1..59febb7c64b8 100644
--- a/lang/aleph/files/patch-cnf_mak_aleph-gcc-3.mak
+++ b/lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak
@@ -1,11 +1,11 @@
---- cnf/mak/aleph-gcc-3.mak.orig	Tue Feb  8 21:55:12 2005
-+++ cnf/mak/aleph-gcc-3.mak	Tue Feb  8 21:43:13 2005
-@@ -43,7 +43,7 @@ ALPCPPVERS	= 3
+--- cnf/mak/afnix-gcc-3.mak.orig	Wed Jan 12 06:05:00 2005
++++ cnf/mak/afnix-gcc-3.mak	Wed Feb 16 19:18:04 2005
+@@ -43,7 +43,7 @@
  # - compiler dependant libraries                                             -
  # ----------------------------------------------------------------------------
  
--ALPCPPLIBS	= -lsupc++
-+ALPCPPLIBS	=
+-AFXCPPLIBS	= -lsupc++
++AFXCPPLIBS	= -lstdc++
  
  # ----------------------------------------------------------------------------
  # - platform dependant linking flags                                         -
diff --git a/lang/afnix/files/patch-cnf::mak::aleph-rule.mak b/lang/afnix/files/patch-cnf_mak_afnix-rule.mak
index ad62af26242a..d93beadbac85 100644
--- a/lang/afnix/files/patch-cnf::mak::aleph-rule.mak
+++ b/lang/afnix/files/patch-cnf_mak_afnix-rule.mak
@@ -1,5 +1,5 @@
---- cnf/mak/aleph-rule.mak.orig	Thu Mar  8 14:59:08 2001
-+++ cnf/mak/aleph-rule.mak	Sat Apr 14 05:43:10 2001
+--- cnf/mak/afnix-rule.mak.orig	Wed Jan 12 06:05:00 2005
++++ cnf/mak/afnix-rule.mak	Wed Feb 16 19:18:04 2005
 @@ -62,8 +62,8 @@
  endif
  
diff --git a/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak b/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak
deleted file mode 100644
index 5f907e0011d1..000000000000
--- a/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- cnf/mak/aleph-gcc-3.mak.orig	Tue Feb  8 21:55:12 2005
-+++ cnf/mak/aleph-gcc-3.mak	Tue Feb  8 21:43:13 2005
-@@ -43,7 +43,7 @@ ALPCPPVERS	= 3
- # - compiler dependant libraries                                             -
- # ----------------------------------------------------------------------------
- 
--ALPCPPLIBS	= -lsupc++
-+ALPCPPLIBS	=
- 
- # ----------------------------------------------------------------------------
- # - platform dependant linking flags                                         -
diff --git a/lang/afnix/files/patch-src::plt::lib::cclk.cxx b/lang/afnix/files/patch-src::plt::lib::cclk.cxx
deleted file mode 100644
index e680e3173619..000000000000
--- a/lang/afnix/files/patch-src::plt::lib::cclk.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/plt/lib/cclk.cxx.orig	Fri Nov 29 13:10:11 2002
-+++ src/plt/lib/cclk.cxx	Fri Nov 29 13:15:05 2002
-@@ -53,7 +53,8 @@
-   s_tinfo* c_getlocal (const long tclk) {
-     // extract time info
-     struct tm* tval;
--    if ((tval = localtime (&tclk)) == NULL) return 0;
-+    time_t t = tclk;
-+    if (t != tclk || (tval = localtime (&t)) == NULL) return 0;
-     // fill in the data structure
-     s_tinfo* tinfo = new s_tinfo;
-     tinfo->d_secs = tval->tm_sec;
-@@ -72,7 +73,8 @@
-   s_tinfo* c_getutc (const long tclk) {
-     // extract time info
-     struct tm* tval;
--    if ((tval = gmtime (&tclk)) == NULL) return 0;
-+    time_t t = tclk;
-+    if (t != tclk || (tval = gmtime (&t)) == NULL) return 0;
-     // fill in the data structure
-     s_tinfo* tinfo = new s_tinfo;
-     tinfo->d_secs = tval->tm_sec;
diff --git a/lang/afnix/files/patch-src_lib_txt_lib_PrintTable.cpp b/lang/afnix/files/patch-src_lib_txt_lib_PrintTable.cpp
deleted file mode 100644
index 7121f5292769..000000000000
--- a/lang/afnix/files/patch-src_lib_txt_lib_PrintTable.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- src/lib/txt/lib/PrintTable.cpp.orig	Sun Aug 22 21:13:07 2004
-+++ src/lib/txt/lib/PrintTable.cpp	Sun Aug 22 21:13:50 2004
-@@ -85,7 +85,7 @@
-     d_cols = 1;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -107,7 +107,7 @@
-     d_cols = cols;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -129,7 +129,7 @@
-     d_cols = cols;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -362,7 +362,7 @@
-       return;
-     }
-     // create a new table
--    String** data = new (String*) [size];
-+    String** data = new String* [size];
-     for (long i = 0;      i < d_rows; i++) data[i] = p_data[i];
-     for (long i = d_rows; i < size;   i++) data[i] = nilp;
-     // update table and remove old one
diff --git a/lang/afnix/files/patch-src_plt_acf_ccnf.cpp b/lang/afnix/files/patch-src_plt_acf_ccnf.cpp
index 2f35454f60c2..162375105ba8 100644
--- a/lang/afnix/files/patch-src_plt_acf_ccnf.cpp
+++ b/lang/afnix/files/patch-src_plt_acf_ccnf.cpp
@@ -1,37 +1,37 @@
---- src/plt/acf/ccnf.cpp.orig	Tue Feb  8 21:37:05 2005
-+++ src/plt/acf/ccnf.cpp	Tue Feb  8 21:38:33 2005
-@@ -41,6 +41,7 @@
- #define ALEPH_PROCTYPE_PA64      9
- #define ALEPH_PROCTYPE_IA64     10
- #define ALEPH_PROCTYPE_S390     11
-+#define ALEPH_PROCTYPE_AMD64    12
+--- src/plt/acf/ccnf.cpp.orig	Wed Jan 12 06:05:00 2005
++++ src/plt/acf/ccnf.cpp	Wed Feb 16 19:18:04 2005
+@@ -42,6 +42,7 @@
+ #define AFNIX_PROCTYPE_IA64     10
+ #define AFNIX_PROCTYPE_S390     11
+ #define AFNIX_PROCTYPE_X64      12
++#define AFNIX_PROCTYPE_AMD64    12
  
  // recognized processor name
- #define ALEPH_PROCNAME_IA        "ia"
-@@ -54,6 +55,7 @@
- #define ALEPH_PROCNAME_PA64      "pa64"
- #define ALEPH_PROCNAME_IA64      "ia64"
- #define ALEPH_PROCNAME_S390      "s390"
-+#define ALEPH_PROCNAME_AMD64     "amd64"
+ #define AFNIX_PROCNAME_UNKNOWN   "unknown"
+@@ -57,6 +58,7 @@
+ #define AFNIX_PROCNAME_IA64      "ia64"
+ #define AFNIX_PROCNAME_S390      "s390"
+ #define AFNIX_PROCNAME_X64       "x64"
++#define AFNIX_PROCNAME_AMD64     "amd64"
  
  // force size type with S390
  #if defined(__s390__)
-@@ -114,6 +116,9 @@
+@@ -117,6 +119,9 @@
    // s390
-   if (strcmp (proc, ALEPH_PROCNAME_S390) == 0)
-     return ALEPH_PROCTYPE_S390;
+   if (strcmp (proc, AFNIX_PROCNAME_S390) == 0)
+     return AFNIX_PROCTYPE_S390;
 +  // amd64
-+  if (strcmp (proc, ALEPH_PROCNAME_AMD64) == 0)
-+    return ALEPH_PROCTYPE_AMD64;
-   // unknown
-   return ALEPH_PROCTYPE_UNKNOWN;
- }
-@@ -228,6 +233,8 @@
- 	   ALEPH_PROCTYPE_IA64);
-   fprintf (stdout, "#define  ALEPH_PROCTYPE_S390      %d\n",
- 	   ALEPH_PROCTYPE_S390);
-+  fprintf (stdout, "#define  ALEPH_PROCTYPE_AMD64     %d\n",
-+	   ALEPH_PROCTYPE_AMD64);
++  if (strcmp (proc, AFNIX_PROCNAME_AMD64) == 0)
++    return AFNIX_PROCTYPE_AMD64;
+   // x86-64
+   if (strcmp (proc, AFNIX_PROCNAME_X64) == 0) {
+     switch (sizeof(void*)) {
+@@ -260,6 +265,8 @@
+ 	   AFNIX_PROCTYPE_IA64);
+   fprintf (stdout, "#define  AFNIX_PROCTYPE_S390      %d\n",
+ 	   AFNIX_PROCTYPE_S390);
++  fprintf (stdout, "#define  AFNIX_PROCTYPE_AMD64     %d\n",
++	   AFNIX_PROCTYPE_AMD64);
+   fprintf (stdout, "#define  AFNIX_PROCTYPE_X64       %d\n",
+ 	   AFNIX_PROCTYPE_X64);
    fprintf (stdout, "\n");
- 
-   // install the config names
diff --git a/lang/aleph/files/patch-src::plt::lib::cclk.cxx b/lang/afnix/files/patch-src_plt_lib_cclk.cxx
index e680e3173619..eeb4caa1971f 100644
--- a/lang/aleph/files/patch-src::plt::lib::cclk.cxx
+++ b/lang/afnix/files/patch-src_plt_lib_cclk.cxx
@@ -1,5 +1,5 @@
---- src/plt/lib/cclk.cxx.orig	Fri Nov 29 13:10:11 2002
-+++ src/plt/lib/cclk.cxx	Fri Nov 29 13:15:05 2002
+--- src/plt/lib/cclk.cxx.orig	Wed Jan 12 06:05:00 2005
++++ src/plt/lib/cclk.cxx	Wed Feb 16 19:18:04 2005
 @@ -53,7 +53,8 @@
    s_tinfo* c_getlocal (const long tclk) {
      // extract time info
diff --git a/lang/afnix/files/patch-src::plt::lib::cdir.cxx b/lang/afnix/files/patch-src_plt_lib_cdir.cxx
index decc8b5ac5a8..8bcc8b3ea3fd 100644
--- a/lang/afnix/files/patch-src::plt::lib::cdir.cxx
+++ b/lang/afnix/files/patch-src_plt_lib_cdir.cxx
@@ -1,7 +1,7 @@
---- src/plt/lib/cdir.cxx.orig	Tue Oct  7 16:39:01 2003
-+++ src/plt/lib/cdir.cxx	Tue Oct  7 16:39:21 2003
+--- src/plt/lib/cdir.cxx.orig	Wed Jan 12 06:05:00 2005
++++ src/plt/lib/cdir.cxx	Wed Feb 16 19:05:03 2005
 @@ -14,6 +14,7 @@
- // - copyright (c) 1999-2003 amaury darsch                                   -
+ // - copyright (c) 1999-2005 amaury darsch                                   -
  // ---------------------------------------------------------------------------
  
 +#include <stdio.h>
diff --git a/lang/afnix/files/patch-src_std_lib_Finalize.cpp b/lang/afnix/files/patch-src_std_lib_Finalize.cpp
deleted file mode 100644
index 77086392d4bd..000000000000
--- a/lang/afnix/files/patch-src_std_lib_Finalize.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Finalize.cpp.orig	Sun Aug 22 21:06:42 2004
-+++ src/std/lib/Finalize.cpp	Sun Aug 22 21:06:51 2004
-@@ -27,7 +27,7 @@
-     d_size = FIFO_SIZE;
-     d_pos  = FIFO_SIZE-1;
-     d_lock = false;
--    p_fifo = new (Object*)[d_size];
-+    p_fifo = new Object*[d_size];
-     for (long i = 0; i < d_size; i++) p_fifo[i] = nilp;
-   }
- 
diff --git a/lang/afnix/files/patch-src_std_lib_HashTable.cpp b/lang/afnix/files/patch-src_std_lib_HashTable.cpp
deleted file mode 100644
index deb2811cf641..000000000000
--- a/lang/afnix/files/patch-src_std_lib_HashTable.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/HashTable.cpp.orig	Sun Aug 22 21:07:04 2004
-+++ src/std/lib/HashTable.cpp	Sun Aug 22 21:07:46 2004
-@@ -90,7 +90,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_bucket*)[d_size];
-+    p_table  = new s_bucket*[d_size];
-     
-     // initialize the table with null pointers
-     for (long i = 0; i < d_size; i++)
-@@ -104,7 +104,7 @@
-     d_size   = c_prime (size);
-     d_thrs   = (size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_bucket*)[d_size];
-+    p_table  = new s_bucket*[d_size];
-     
-     // initialize the table with null pointers
-     for (long i = 0; i < d_size; i++)
-@@ -248,7 +248,7 @@
-     if (size < d_size) return;
- 
-     // initialize the new table
--    s_bucket** table = new (s_bucket*)[size];
-+    s_bucket** table = new s_bucket*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
- 
-     // rebuild the table
diff --git a/lang/afnix/files/patch-src_std_lib_QuarkTable.cpp b/lang/afnix/files/patch-src_std_lib_QuarkTable.cpp
deleted file mode 100644
index f97031cf3266..000000000000
--- a/lang/afnix/files/patch-src_std_lib_QuarkTable.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/QuarkTable.cpp.orig	Sun Aug 22 21:08:41 2004
-+++ src/std/lib/QuarkTable.cpp	Sun Aug 22 21:09:12 2004
-@@ -86,7 +86,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_quanode*)[d_size];
-+    p_table  = new s_quanode*[d_size];
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-   }
-   
-@@ -97,7 +97,7 @@
-     d_size   = c_prime (size);
-     d_thrs   = (size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_quanode*)[d_size];    
-+    p_table  = new s_quanode*[d_size];    
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-   }
-   
-@@ -251,7 +251,7 @@
-     if (size < d_size) return;
- 
-     // initialize the new table
--    s_quanode** table = new (s_quanode*)[size];
-+    s_quanode** table = new s_quanode*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
- 
-     // rebuild the table
diff --git a/lang/afnix/files/patch-src_std_lib_Reactor.cpp b/lang/afnix/files/patch-src_std_lib_Reactor.cpp
deleted file mode 100644
index d4ca10188ea3..000000000000
--- a/lang/afnix/files/patch-src_std_lib_Reactor.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Reactor.cpp.orig	Sun Aug 22 21:09:53 2004
-+++ src/std/lib/Reactor.cpp	Sun Aug 22 21:10:10 2004
-@@ -60,7 +60,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_qnode*)[d_size];
-+    p_table  = new s_qnode*[d_size];
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-     p_vector = new Strvec (d_size);
-     p_vector->add ("");
-@@ -111,7 +111,7 @@
-     // check for the size
-     if (size < d_size) return;
-     // initialize the table
--    s_qnode** table = new (s_qnode*)[size];
-+    s_qnode** table = new s_qnode*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
-     // rebuild the table
-     for (long i = 0; i < d_size; i++) {
diff --git a/lang/afnix/files/patch-src_std_lib_Vector.cpp b/lang/afnix/files/patch-src_std_lib_Vector.cpp
deleted file mode 100644
index e8bf9859d942..000000000000
--- a/lang/afnix/files/patch-src_std_lib_Vector.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Vector.cpp.orig	Sun Aug 22 21:10:59 2004
-+++ src/std/lib/Vector.cpp	Sun Aug 22 21:11:43 2004
-@@ -56,7 +56,7 @@
-     if (size < 0) throw Exception ("size-error","in vector constructor");
-     d_size   = size;
-     d_length = 0;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_size; i++) p_vector[i] = nilp;
-   }
-   
-@@ -65,7 +65,7 @@
-   Vector::Vector (const Vector& that) {
-     d_size   = that.d_size;
-     d_length = that.d_length;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_length; i++)
-       p_vector[i] = Object::iref (that.p_vector[i]);
-   }
-@@ -100,7 +100,7 @@
-     // copy old to new
-     d_size   = that.d_size;
-     d_length = that.d_length;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_length; i++)
-     p_vector[i] = Object::iref (that.p_vector[i]);
-     return *this;
-@@ -170,7 +170,7 @@
-       // check if we have to resize the vector
-       if (d_length >= d_size) {
- 	long size = (d_size <= 0) ? 1 : d_size * 2;
--	Object** vector = new (Object*)[size];
-+	Object** vector = new Object*[size];
- 	for (long i = 0; i < d_length; i++)
- 	  vector[i] = p_vector[i];
- 	delete [] p_vector;
diff --git a/lang/afnix/pkg-descr b/lang/afnix/pkg-descr
index 99e080372e36..6d653f5c314e 100644
--- a/lang/afnix/pkg-descr
+++ b/lang/afnix/pkg-descr
@@ -1,10 +1,10 @@
-Aleph is a multi-threaded functional programming language with dynamic
-symbol bindings that support the object oriented paradigm. Aleph features
-a state of the art runtime engine that supports both 32 and 64 bits
-platforms. Aleph comes with a rich set of libraries that are designed to
-be platform independent.
+Afnix (formerly known as Aleph) is a multi-threaded functional programming
+language with dynamic symbol bindings that support the object oriented
+paradigm. Afnix features a state of the art runtime engine that supports
+both 32 and 64 bits platforms. Afnix comes with a rich set of libraries
+that are designed to be platform independent.
 
-The Aleph engine is written in C++ and provides runtime compatibility with
+The Afnix engine is written in C++ and provides runtime compatibility with
 it. Such compatibility includes the ability to instantiate C++ classes,
 use virtual methods and raise or catch exceptions. A comprehensive API has
 been designed to ease the integration of foreign libraries. 
@@ -15,4 +15,4 @@ been designed to ease the integration of foreign libraries.
    - Multi-threaded engine
    - condition objects. 
 
-WWW: http://www.aleph-lang.org/
+WWW: http://www.afnix.org/
diff --git a/lang/afnix/pkg-plist b/lang/afnix/pkg-plist
index 2a624873edcd..d3929a594128 100644
--- a/lang/afnix/pkg-plist
+++ b/lang/afnix/pkg-plist
@@ -1,185 +1,208 @@
-bin/aleph
-bin/aod
+bin/afnix
 bin/axc
 bin/axd
 bin/axl
-etc/aleph/license.txt
-@dirrm etc/aleph
-include/aleph/eng/Argument.hpp
-include/aleph/eng/Builtin.hpp
-include/aleph/eng/Class.hpp
-include/aleph/eng/Closure.hpp
-include/aleph/eng/Constant.hpp
-include/aleph/eng/Engsid.hpp
-include/aleph/eng/Enum.hpp
-include/aleph/eng/Extracter.hpp
-include/aleph/eng/Form.hpp
-include/aleph/eng/Former.hpp
-include/aleph/eng/Function.hpp
-include/aleph/eng/Globalset.hpp
-include/aleph/eng/Instance.hpp
-include/aleph/eng/Interp.hpp
-include/aleph/eng/Item.hpp
-include/aleph/eng/Lexer.hpp
-include/aleph/eng/Lexical.hpp
-include/aleph/eng/Localset.hpp
-include/aleph/eng/Meta.hpp
-include/aleph/eng/Module.hpp
-include/aleph/eng/Nameset.hpp
-include/aleph/eng/Options.hpp
-include/aleph/eng/Printer.hpp
-include/aleph/eng/Promise.hpp
-include/aleph/eng/Qualified.hpp
-include/aleph/eng/Reader.hpp
-include/aleph/eng/Reserved.hpp
-include/aleph/eng/Resolver.hpp
-include/aleph/eng/Return.hpp
-include/aleph/eng/Symbol.hpp
-include/aleph/eng/Token.hpp
-include/aleph/net/Address.hpp
-include/aleph/net/Datagram.hpp
-include/aleph/net/Libanet.hpp
-include/aleph/net/Mail.hpp
-include/aleph/net/Multicast.hpp
-include/aleph/net/Netcalls.hpp
-include/aleph/net/Predanet.hpp
-include/aleph/net/Socket.hpp
-include/aleph/net/TcpClient.hpp
-include/aleph/net/TcpServer.hpp
-include/aleph/net/TcpSocket.hpp
-include/aleph/net/UdpClient.hpp
-include/aleph/net/UdpServer.hpp
-include/aleph/net/UdpSocket.hpp
-include/aleph/odb/Cell.hpp
-include/aleph/odb/Collection.hpp
-include/aleph/odb/Libaodb.hpp
-include/aleph/odb/Odbcalls.hpp
-include/aleph/odb/Odbsid.hpp
-include/aleph/odb/Persist.hpp
-include/aleph/odb/Record.hpp
-include/aleph/odb/Table.hpp
-include/aleph/plt/cclk.hpp
-include/aleph/plt/ccnf.hpp
-include/aleph/plt/ccnv.hpp
-include/aleph/plt/cdir.hpp
-include/aleph/plt/cerr.hpp
-include/aleph/plt/cmem.hpp
-include/aleph/plt/cmth.hpp
-include/aleph/plt/cnet.hpp
-include/aleph/plt/cshl.hpp
-include/aleph/plt/csio.hpp
-include/aleph/plt/cstr.hpp
-include/aleph/plt/csys.hpp
-include/aleph/plt/cthr.hpp
-include/aleph/plt/ctrm.hpp
-include/aleph/sio/Directory.hpp
-include/aleph/sio/Libasio.hpp
-include/aleph/sio/Pathasio.hpp
-include/aleph/sio/Predasio.hpp
-include/aleph/sio/Selector.hpp
-include/aleph/std/BitSet.hpp
-include/aleph/std/Boolean.hpp
-include/aleph/std/Buffer.hpp
-include/aleph/std/Character.hpp
-include/aleph/std/Cilo.hpp
-include/aleph/std/Condvar.hpp
-include/aleph/std/Cons.hpp
-include/aleph/std/Cursor.hpp
-include/aleph/std/Exception.hpp
-include/aleph/std/Finalize.hpp
-include/aleph/std/Graph.hpp
-include/aleph/std/HashTable.hpp
-include/aleph/std/Input.hpp
-include/aleph/std/InputFile.hpp
-include/aleph/std/InputMapped.hpp
-include/aleph/std/InputString.hpp
-include/aleph/std/InputTerm.hpp
-include/aleph/std/Integer.hpp
-include/aleph/std/Iterable.hpp
-include/aleph/std/Iterator.hpp
-include/aleph/std/Librarian.hpp
-include/aleph/std/Library.hpp
-include/aleph/std/List.hpp
-include/aleph/std/Literal.hpp
-include/aleph/std/Lockrw.hpp
-include/aleph/std/Method.hpp
-include/aleph/std/Monitor.hpp
-include/aleph/std/Mutex.hpp
-include/aleph/std/NameTable.hpp
-include/aleph/std/Object.hpp
-include/aleph/std/Output.hpp
-include/aleph/std/OutputFile.hpp
-include/aleph/std/OutputString.hpp
-include/aleph/std/OutputTerm.hpp
-include/aleph/std/Qarray.hpp
-include/aleph/std/QuarkTable.hpp
-include/aleph/std/Queue.hpp
-include/aleph/std/Reactor.hpp
-include/aleph/std/Real.hpp
-include/aleph/std/Recycle.hpp
-include/aleph/std/Regex.hpp
-include/aleph/std/Relatif.hpp
-include/aleph/std/Runnable.hpp
-include/aleph/std/Serial.hpp
-include/aleph/std/Stack.hpp
-include/aleph/std/String.hpp
-include/aleph/std/Strvec.hpp
-include/aleph/std/System.hpp
-include/aleph/std/Terminal.hpp
-include/aleph/std/Thread.hpp
-include/aleph/std/Thrmap.hpp
-include/aleph/std/Vector.hpp
-include/aleph/sys/Libasys.hpp
-include/aleph/sys/Predasys.hpp
-include/aleph/sys/Syscalls.hpp
-include/aleph/sys/Time.hpp
-include/aleph/txt/Digest.hpp
-include/aleph/txt/Libatxt.hpp
-include/aleph/txt/Predatxt.hpp
-include/aleph/txt/PrintTable.hpp
-include/aleph/txt/Sort.hpp
-include/aleph/txt/Txtcalls.hpp
-include/aleph/www/CgiQuery.hpp
-include/aleph/www/Cookie.hpp
-include/aleph/www/HtmlPage.hpp
-include/aleph/www/Libawww.hpp
-include/aleph/www/Predawww.hpp
-include/aleph/www/Url.hpp
-include/aleph/www/XHtmlPage.hpp
-@dirrm include/aleph/eng
-@dirrm include/aleph/net
-@dirrm include/aleph/odb
-@dirrm include/aleph/plt
-@dirrm include/aleph/sio
-@dirrm include/aleph/std
-@dirrm include/aleph/sys
-@dirrm include/aleph/txt
-@dirrm include/aleph/www
-@dirrm include/aleph
-lib/libaleph-eng.a
-lib/libaleph-eng.so
-lib/libaleph-eng.so.%%PORTVER%%
-lib/libaleph-net.a
-lib/libaleph-net.so
-lib/libaleph-net.so.%%PORTVER%%
-lib/libaleph-odb.a
-lib/libaleph-odb.so
-lib/libaleph-odb.so.%%PORTVER%%
-lib/libaleph-plt.a
-lib/libaleph-plt.so
-lib/libaleph-plt.so.%%PORTVER%%
-lib/libaleph-sio.a
-lib/libaleph-sio.so
-lib/libaleph-sio.so.%%PORTVER%%
-lib/libaleph-std.a
-lib/libaleph-std.so
-lib/libaleph-std.so.%%PORTVER%%
-lib/libaleph-sys.a
-lib/libaleph-sys.so
-lib/libaleph-sys.so.%%PORTVER%%
-lib/libaleph-txt.a
-lib/libaleph-txt.so
-lib/libaleph-txt.so.%%PORTVER%%
-lib/libaleph-www.a
-lib/libaleph-www.so
-lib/libaleph-www.so.%%PORTVER%%
+bin/axo
+share/doc/afnix/afnix-gud.el
+share/doc/afnix/afnix-mode.el
+share/doc/afnix/license.txt
+share/doc/afnix/what-long.txt
+share/doc/afnix/what-short.txt
+@dirrm share/doc/afnix
+include/afnix/eng/Argument.hpp
+include/afnix/eng/Builtin.hpp
+include/afnix/eng/Class.hpp
+include/afnix/eng/Closure.hpp
+include/afnix/eng/Constant.hpp
+include/afnix/eng/Engsid.hpp
+include/afnix/eng/Enum.hpp
+include/afnix/eng/Extracter.hpp
+include/afnix/eng/Form.hpp
+include/afnix/eng/Former.hpp
+include/afnix/eng/Function.hpp
+include/afnix/eng/Globalset.hpp
+include/afnix/eng/Instance.hpp
+include/afnix/eng/Interp.hpp
+include/afnix/eng/Item.hpp
+include/afnix/eng/Lexer.hpp
+include/afnix/eng/Lexical.hpp
+include/afnix/eng/Localset.hpp
+include/afnix/eng/Meta.hpp
+include/afnix/eng/Module.hpp
+include/afnix/eng/Nameset.hpp
+include/afnix/eng/Options.hpp
+include/afnix/eng/Printer.hpp
+include/afnix/eng/Promise.hpp
+include/afnix/eng/Qualified.hpp
+include/afnix/eng/Reader.hpp
+include/afnix/eng/Reserved.hpp
+include/afnix/eng/Resolver.hpp
+include/afnix/eng/Return.hpp
+include/afnix/eng/Symbol.hpp
+include/afnix/eng/Token.hpp
+include/afnix/net/Address.hpp
+include/afnix/net/Datagram.hpp
+include/afnix/net/Libanet.hpp
+include/afnix/net/Mail.hpp
+include/afnix/net/Multicast.hpp
+include/afnix/net/Netcalls.hpp
+include/afnix/net/Predanet.hpp
+include/afnix/net/Socket.hpp
+include/afnix/net/TcpClient.hpp
+include/afnix/net/TcpServer.hpp
+include/afnix/net/TcpSocket.hpp
+include/afnix/net/UdpClient.hpp
+include/afnix/net/UdpServer.hpp
+include/afnix/net/UdpSocket.hpp
+include/afnix/odc/Cell.hpp
+include/afnix/odc/Collection.hpp
+include/afnix/odc/Importer.hpp
+include/afnix/odc/Libaodc.hpp
+include/afnix/odc/Odccalls.hpp
+include/afnix/odc/Odcsid.hpp
+include/afnix/odc/Persist.hpp
+include/afnix/odc/Predaodc.hpp
+include/afnix/odc/Record.hpp
+include/afnix/odc/Table.hpp
+include/afnix/plt/cclk.hpp
+include/afnix/plt/ccnf.hpp
+include/afnix/plt/ccnv.hpp
+include/afnix/plt/cdir.hpp
+include/afnix/plt/cerr.hpp
+include/afnix/plt/cmem.hpp
+include/afnix/plt/cmth.hpp
+include/afnix/plt/cnet.hpp
+include/afnix/plt/cshl.hpp
+include/afnix/plt/csio.hpp
+include/afnix/plt/cstr.hpp
+include/afnix/plt/csys.hpp
+include/afnix/plt/cthr.hpp
+include/afnix/plt/ctrm.hpp
+include/afnix/sci/Digest.hpp
+include/afnix/sci/Md5.hpp
+include/afnix/sci/Sha1.hpp
+include/afnix/sio/Directory.hpp
+include/afnix/sio/Libasio.hpp
+include/afnix/sio/Pathasio.hpp
+include/afnix/sio/Predasio.hpp
+include/afnix/sio/Selector.hpp
+include/afnix/std/BitSet.hpp
+include/afnix/std/Boolean.hpp
+include/afnix/std/Buffer.hpp
+include/afnix/std/Character.hpp
+include/afnix/std/Cilo.hpp
+include/afnix/std/Condvar.hpp
+include/afnix/std/Cons.hpp
+include/afnix/std/Cursor.hpp
+include/afnix/std/Exception.hpp
+include/afnix/std/Finalize.hpp
+include/afnix/std/Graph.hpp
+include/afnix/std/HashTable.hpp
+include/afnix/std/Input.hpp
+include/afnix/std/InputFile.hpp
+include/afnix/std/InputMapped.hpp
+include/afnix/std/InputString.hpp
+include/afnix/std/InputTerm.hpp
+include/afnix/std/Integer.hpp
+include/afnix/std/Iterable.hpp
+include/afnix/std/Iterator.hpp
+include/afnix/std/Librarian.hpp
+include/afnix/std/Library.hpp
+include/afnix/std/List.hpp
+include/afnix/std/Literal.hpp
+include/afnix/std/Lockrw.hpp
+include/afnix/std/Method.hpp
+include/afnix/std/Monitor.hpp
+include/afnix/std/Mutex.hpp
+include/afnix/std/NameTable.hpp
+include/afnix/std/Object.hpp
+include/afnix/std/Output.hpp
+include/afnix/std/OutputFile.hpp
+include/afnix/std/OutputString.hpp
+include/afnix/std/OutputTerm.hpp
+include/afnix/std/PrintTable.hpp
+include/afnix/std/Qarray.hpp
+include/afnix/std/QuarkTable.hpp
+include/afnix/std/Queue.hpp
+include/afnix/std/Reactor.hpp
+include/afnix/std/Real.hpp
+include/afnix/std/Recycle.hpp
+include/afnix/std/Regex.hpp
+include/afnix/std/Relatif.hpp
+include/afnix/std/Runnable.hpp
+include/afnix/std/Serial.hpp
+include/afnix/std/Sorter.hpp
+include/afnix/std/Stack.hpp
+include/afnix/std/String.hpp
+include/afnix/std/Strvec.hpp
+include/afnix/std/System.hpp
+include/afnix/std/Terminal.hpp
+include/afnix/std/Thread.hpp
+include/afnix/std/Thrmap.hpp
+include/afnix/std/Time.hpp
+include/afnix/std/Vector.hpp
+include/afnix/sys/Libasys.hpp
+include/afnix/sys/Predasys.hpp
+include/afnix/sys/Syscalls.hpp
+include/afnix/txt/Hasher.hpp
+include/afnix/txt/Lexeme.hpp
+include/afnix/txt/Libatxt.hpp
+include/afnix/txt/Literate.hpp
+include/afnix/txt/Pattern.hpp
+include/afnix/txt/Predatxt.hpp
+include/afnix/txt/Scanner.hpp
+include/afnix/txt/Sort.hpp
+include/afnix/txt/Txtcalls.hpp
+include/afnix/www/CgiQuery.hpp
+include/afnix/www/Cookie.hpp
+include/afnix/www/HtmlDiv.hpp
+include/afnix/www/HtmlElement.hpp
+include/afnix/www/HtmlPage.hpp
+include/afnix/www/HtmlRef.hpp
+include/afnix/www/HtmlTable.hpp
+include/afnix/www/HtmlTag.hpp
+include/afnix/www/Libawww.hpp
+include/afnix/www/Predawww.hpp
+include/afnix/www/Url.hpp
+include/afnix/www/XHtmlPage.hpp
+@dirrm include/afnix/eng
+@dirrm include/afnix/net
+@dirrm include/afnix/odc
+@dirrm include/afnix/plt
+@dirrm include/afnix/sci
+@dirrm include/afnix/sio
+@dirrm include/afnix/std
+@dirrm include/afnix/sys
+@dirrm include/afnix/txt
+@dirrm include/afnix/www
+@dirrm include/afnix
+lib/libafnix-eng.a
+lib/libafnix-eng.so
+lib/libafnix-eng.so.%%PORTVER%%
+lib/libafnix-net.a
+lib/libafnix-net.so
+lib/libafnix-net.so.%%PORTVER%%
+lib/libafnix-odc.a
+lib/libafnix-odc.so
+lib/libafnix-odc.so.%%PORTVER%%
+lib/libafnix-plt.a
+lib/libafnix-plt.so
+lib/libafnix-plt.so.%%PORTVER%%
+lib/libafnix-sci.a
+lib/libafnix-sci.so
+lib/libafnix-sci.so.%%PORTVER%%
+lib/libafnix-sio.a
+lib/libafnix-sio.so
+lib/libafnix-sio.so.%%PORTVER%%
+lib/libafnix-std.a
+lib/libafnix-std.so
+lib/libafnix-std.so.%%PORTVER%%
+lib/libafnix-sys.a
+lib/libafnix-sys.so
+lib/libafnix-sys.so.%%PORTVER%%
+lib/libafnix-txt.a
+lib/libafnix-txt.so
+lib/libafnix-txt.so.%%PORTVER%%
+lib/libafnix-www.a
+lib/libafnix-www.so
+lib/libafnix-www.so.%%PORTVER%%
diff --git a/lang/aleph/Makefile b/lang/aleph/Makefile
deleted file mode 100644
index 9b3bab06ad12..000000000000
--- a/lang/aleph/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	aleph
-# Date created:			Mar 7, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	aleph
-PORTVERSION=	0.9.0
-PORTREVISION=	1
-CATEGORIES=	lang
-MASTER_SITES=	http://www.aleph-lang.org/ftp/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION:S,.,-,g}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION:S,.,-,g}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multi-threaded functional programming language
-
-USE_GMAKE=	yes
-MAKE_ARGS=	CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
-		DYNCCFLAGS="-fPIC -DPIC" DEBUGFLAGS="" DBGDEFINES="" \
-		STDDEFINES="${PTHREAD_CFLAGS}" EXELDFLAGS="${PTHREAD_LIBS}"
-INSTALLS_SHLIB=	yes
-
-PLIST_SUB=	PORTVER=${PORTVERSION:R}
-
-MAN1=	aleph.1 axc.1 axl.1
-
-do-configure:
-	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
-
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/aleph
-
-.include <bsd.port.mk>
diff --git a/lang/aleph/distinfo b/lang/aleph/distinfo
deleted file mode 100644
index bc09392fa8e5..000000000000
--- a/lang/aleph/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (aleph-src-0-9-0.tar.gz) = 4c9120034832444bda87c0023365f624
-SIZE (aleph-src-0-9-0.tar.gz) = 463853
diff --git a/lang/aleph/files/patch-cnf::mak::aleph-rule.mak b/lang/aleph/files/patch-cnf::mak::aleph-rule.mak
deleted file mode 100644
index ad62af26242a..000000000000
--- a/lang/aleph/files/patch-cnf::mak::aleph-rule.mak
+++ /dev/null
@@ -1,31 +0,0 @@
---- cnf/mak/aleph-rule.mak.orig	Thu Mar  8 14:59:08 2001
-+++ cnf/mak/aleph-rule.mak	Sat Apr 14 05:43:10 2001
-@@ -62,8 +62,8 @@
- endif
- 
- ifeq ($(LKMODE),soname)
--SONAME		= $(SOLIB).$(MAJOR).$(MINOR)
--SOVERS		= $(SOLIB).$(MAJOR).$(MINOR).$(PATCH)
-+SONAME		= $(SOLIB).$(MAJOR)
-+SOVERS		= $(SOLIB).$(MAJOR)
- endif
- 
- # ----------------------------------------------------------------------------
-@@ -124,17 +124,13 @@
- $(SOLIB) : $(SOVERS)
- 	@$(MKDIR)        $(BLDLIB)
- 	@$(CP) $(SOVERS) $(BLDLIB)
--	@$(RM) $(BLDLIB)/$(SOLIB)
- 	@$(RM) $(BLDLIB)/$(SONAME)
--	@$(LN) $(SOVERS) $(BLDLIB)/$(SONAME)
- 	@$(LN) $(SONAME) $(BLDLIB)/$(SOLIB)
- 
- install-solib : $(SOVERS)
- 	@$(MKDIR)        $(LIBDIR)
- 	@$(CP) $(SOVERS) $(LIBDIR)
--	@$(RM) $(LIBDIR)/$(SONAME)
- 	@$(RM) $(LIBDIR)/$(SOLIB)
--	@$(LN) $(SOVERS) $(LIBDIR)/$(SONAME)
- 	@$(LN) $(SONAME) $(LIBDIR)/$(SOLIB)
- .PHONY: install-solib
- endif
diff --git a/lang/aleph/files/patch-cnf_bin_aleph-guess b/lang/aleph/files/patch-cnf_bin_aleph-guess
deleted file mode 100644
index b2336fe2517f..000000000000
--- a/lang/aleph/files/patch-cnf_bin_aleph-guess
+++ /dev/null
@@ -1,10 +0,0 @@
---- cnf/bin/aleph-guess.orig	Tue Feb  8 21:33:40 2005
-+++ cnf/bin/aleph-guess	Tue Feb  8 21:33:37 2005
-@@ -113,6 +113,7 @@
-     mips)     proc_name=mips;;
-     mipsel)   proc_name=mipsel;;    
-     parisc64) proc_name=pa64;;
-+    amd64)    proc_name=amd64;;
-     ia64)     proc_name=ia64;;
-     s390)     proc_name=s390;;
-     esac
diff --git a/lang/aleph/files/patch-src::plt::lib::cdir.cxx b/lang/aleph/files/patch-src::plt::lib::cdir.cxx
deleted file mode 100644
index decc8b5ac5a8..000000000000
--- a/lang/aleph/files/patch-src::plt::lib::cdir.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plt/lib/cdir.cxx.orig	Tue Oct  7 16:39:01 2003
-+++ src/plt/lib/cdir.cxx	Tue Oct  7 16:39:21 2003
-@@ -14,6 +14,7 @@
- // - copyright (c) 1999-2003 amaury darsch                                   -
- // ---------------------------------------------------------------------------
- 
-+#include <stdio.h>
- #include "cdir.hpp"
- #include "cstr.hpp"
- #include "cdir.hxx"
diff --git a/lang/aleph/files/patch-src_lib_txt_lib_PrintTable.cpp b/lang/aleph/files/patch-src_lib_txt_lib_PrintTable.cpp
deleted file mode 100644
index 7121f5292769..000000000000
--- a/lang/aleph/files/patch-src_lib_txt_lib_PrintTable.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- src/lib/txt/lib/PrintTable.cpp.orig	Sun Aug 22 21:13:07 2004
-+++ src/lib/txt/lib/PrintTable.cpp	Sun Aug 22 21:13:50 2004
-@@ -85,7 +85,7 @@
-     d_cols = 1;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -107,7 +107,7 @@
-     d_cols = cols;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -129,7 +129,7 @@
-     d_cols = cols;
-     d_rows = 0;
-     // initialize the data table
--    p_data = new (String*)[d_size];
-+    p_data = new String*[d_size];
-     for (long i = 0; i < d_size; i++) p_data[i] = nilp;
-     // initialize the format size and column width
-     p_csiz = new long [d_cols];
-@@ -362,7 +362,7 @@
-       return;
-     }
-     // create a new table
--    String** data = new (String*) [size];
-+    String** data = new String* [size];
-     for (long i = 0;      i < d_rows; i++) data[i] = p_data[i];
-     for (long i = d_rows; i < size;   i++) data[i] = nilp;
-     // update table and remove old one
diff --git a/lang/aleph/files/patch-src_plt_acf_ccnf.cpp b/lang/aleph/files/patch-src_plt_acf_ccnf.cpp
deleted file mode 100644
index 2f35454f60c2..000000000000
--- a/lang/aleph/files/patch-src_plt_acf_ccnf.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/plt/acf/ccnf.cpp.orig	Tue Feb  8 21:37:05 2005
-+++ src/plt/acf/ccnf.cpp	Tue Feb  8 21:38:33 2005
-@@ -41,6 +41,7 @@
- #define ALEPH_PROCTYPE_PA64      9
- #define ALEPH_PROCTYPE_IA64     10
- #define ALEPH_PROCTYPE_S390     11
-+#define ALEPH_PROCTYPE_AMD64    12
- 
- // recognized processor name
- #define ALEPH_PROCNAME_IA        "ia"
-@@ -54,6 +55,7 @@
- #define ALEPH_PROCNAME_PA64      "pa64"
- #define ALEPH_PROCNAME_IA64      "ia64"
- #define ALEPH_PROCNAME_S390      "s390"
-+#define ALEPH_PROCNAME_AMD64     "amd64"
- 
- // force size type with S390
- #if defined(__s390__)
-@@ -114,6 +116,9 @@
-   // s390
-   if (strcmp (proc, ALEPH_PROCNAME_S390) == 0)
-     return ALEPH_PROCTYPE_S390;
-+  // amd64
-+  if (strcmp (proc, ALEPH_PROCNAME_AMD64) == 0)
-+    return ALEPH_PROCTYPE_AMD64;
-   // unknown
-   return ALEPH_PROCTYPE_UNKNOWN;
- }
-@@ -228,6 +233,8 @@
- 	   ALEPH_PROCTYPE_IA64);
-   fprintf (stdout, "#define  ALEPH_PROCTYPE_S390      %d\n",
- 	   ALEPH_PROCTYPE_S390);
-+  fprintf (stdout, "#define  ALEPH_PROCTYPE_AMD64     %d\n",
-+	   ALEPH_PROCTYPE_AMD64);
-   fprintf (stdout, "\n");
- 
-   // install the config names
diff --git a/lang/aleph/files/patch-src_std_lib_Finalize.cpp b/lang/aleph/files/patch-src_std_lib_Finalize.cpp
deleted file mode 100644
index 77086392d4bd..000000000000
--- a/lang/aleph/files/patch-src_std_lib_Finalize.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Finalize.cpp.orig	Sun Aug 22 21:06:42 2004
-+++ src/std/lib/Finalize.cpp	Sun Aug 22 21:06:51 2004
-@@ -27,7 +27,7 @@
-     d_size = FIFO_SIZE;
-     d_pos  = FIFO_SIZE-1;
-     d_lock = false;
--    p_fifo = new (Object*)[d_size];
-+    p_fifo = new Object*[d_size];
-     for (long i = 0; i < d_size; i++) p_fifo[i] = nilp;
-   }
- 
diff --git a/lang/aleph/files/patch-src_std_lib_HashTable.cpp b/lang/aleph/files/patch-src_std_lib_HashTable.cpp
deleted file mode 100644
index deb2811cf641..000000000000
--- a/lang/aleph/files/patch-src_std_lib_HashTable.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/HashTable.cpp.orig	Sun Aug 22 21:07:04 2004
-+++ src/std/lib/HashTable.cpp	Sun Aug 22 21:07:46 2004
-@@ -90,7 +90,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_bucket*)[d_size];
-+    p_table  = new s_bucket*[d_size];
-     
-     // initialize the table with null pointers
-     for (long i = 0; i < d_size; i++)
-@@ -104,7 +104,7 @@
-     d_size   = c_prime (size);
-     d_thrs   = (size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_bucket*)[d_size];
-+    p_table  = new s_bucket*[d_size];
-     
-     // initialize the table with null pointers
-     for (long i = 0; i < d_size; i++)
-@@ -248,7 +248,7 @@
-     if (size < d_size) return;
- 
-     // initialize the new table
--    s_bucket** table = new (s_bucket*)[size];
-+    s_bucket** table = new s_bucket*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
- 
-     // rebuild the table
diff --git a/lang/aleph/files/patch-src_std_lib_QuarkTable.cpp b/lang/aleph/files/patch-src_std_lib_QuarkTable.cpp
deleted file mode 100644
index f97031cf3266..000000000000
--- a/lang/aleph/files/patch-src_std_lib_QuarkTable.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/QuarkTable.cpp.orig	Sun Aug 22 21:08:41 2004
-+++ src/std/lib/QuarkTable.cpp	Sun Aug 22 21:09:12 2004
-@@ -86,7 +86,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_quanode*)[d_size];
-+    p_table  = new s_quanode*[d_size];
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-   }
-   
-@@ -97,7 +97,7 @@
-     d_size   = c_prime (size);
-     d_thrs   = (size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_quanode*)[d_size];    
-+    p_table  = new s_quanode*[d_size];    
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-   }
-   
-@@ -251,7 +251,7 @@
-     if (size < d_size) return;
- 
-     // initialize the new table
--    s_quanode** table = new (s_quanode*)[size];
-+    s_quanode** table = new s_quanode*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
- 
-     // rebuild the table
diff --git a/lang/aleph/files/patch-src_std_lib_Reactor.cpp b/lang/aleph/files/patch-src_std_lib_Reactor.cpp
deleted file mode 100644
index d4ca10188ea3..000000000000
--- a/lang/aleph/files/patch-src_std_lib_Reactor.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Reactor.cpp.orig	Sun Aug 22 21:09:53 2004
-+++ src/std/lib/Reactor.cpp	Sun Aug 22 21:10:10 2004
-@@ -60,7 +60,7 @@
-     d_size   = c_prime (0);
-     d_thrs   = (d_size * 7) / 10;
-     d_count  = 0;
--    p_table  = new (s_qnode*)[d_size];
-+    p_table  = new s_qnode*[d_size];
-     for (long i = 0; i < d_size; i++) p_table[i] = nilp;
-     p_vector = new Strvec (d_size);
-     p_vector->add ("");
-@@ -111,7 +111,7 @@
-     // check for the size
-     if (size < d_size) return;
-     // initialize the table
--    s_qnode** table = new (s_qnode*)[size];
-+    s_qnode** table = new s_qnode*[size];
-     for (long i = 0; i < size; i++) table[i] = nilp;
-     // rebuild the table
-     for (long i = 0; i < d_size; i++) {
diff --git a/lang/aleph/files/patch-src_std_lib_Vector.cpp b/lang/aleph/files/patch-src_std_lib_Vector.cpp
deleted file mode 100644
index e8bf9859d942..000000000000
--- a/lang/aleph/files/patch-src_std_lib_Vector.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- src/std/lib/Vector.cpp.orig	Sun Aug 22 21:10:59 2004
-+++ src/std/lib/Vector.cpp	Sun Aug 22 21:11:43 2004
-@@ -56,7 +56,7 @@
-     if (size < 0) throw Exception ("size-error","in vector constructor");
-     d_size   = size;
-     d_length = 0;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_size; i++) p_vector[i] = nilp;
-   }
-   
-@@ -65,7 +65,7 @@
-   Vector::Vector (const Vector& that) {
-     d_size   = that.d_size;
-     d_length = that.d_length;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_length; i++)
-       p_vector[i] = Object::iref (that.p_vector[i]);
-   }
-@@ -100,7 +100,7 @@
-     // copy old to new
-     d_size   = that.d_size;
-     d_length = that.d_length;
--    p_vector = new (Object*)[d_size];
-+    p_vector = new Object*[d_size];
-     for (long i = 0; i < d_length; i++)
-     p_vector[i] = Object::iref (that.p_vector[i]);
-     return *this;
-@@ -170,7 +170,7 @@
-       // check if we have to resize the vector
-       if (d_length >= d_size) {
- 	long size = (d_size <= 0) ? 1 : d_size * 2;
--	Object** vector = new (Object*)[size];
-+	Object** vector = new Object*[size];
- 	for (long i = 0; i < d_length; i++)
- 	  vector[i] = p_vector[i];
- 	delete [] p_vector;
diff --git a/lang/aleph/pkg-descr b/lang/aleph/pkg-descr
deleted file mode 100644
index 99e080372e36..000000000000
--- a/lang/aleph/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Aleph is a multi-threaded functional programming language with dynamic
-symbol bindings that support the object oriented paradigm. Aleph features
-a state of the art runtime engine that supports both 32 and 64 bits
-platforms. Aleph comes with a rich set of libraries that are designed to
-be platform independent.
-
-The Aleph engine is written in C++ and provides runtime compatibility with
-it. Such compatibility includes the ability to instantiate C++ classes,
-use virtual methods and raise or catch exceptions. A comprehensive API has
-been designed to ease the integration of foreign libraries. 
-
-   - Builtin objects
-   - Functional programming
-   - Object oriented
-   - Multi-threaded engine
-   - condition objects. 
-
-WWW: http://www.aleph-lang.org/
diff --git a/lang/aleph/pkg-plist b/lang/aleph/pkg-plist
deleted file mode 100644
index 2a624873edcd..000000000000
--- a/lang/aleph/pkg-plist
+++ /dev/null
@@ -1,185 +0,0 @@
-bin/aleph
-bin/aod
-bin/axc
-bin/axd
-bin/axl
-etc/aleph/license.txt
-@dirrm etc/aleph
-include/aleph/eng/Argument.hpp
-include/aleph/eng/Builtin.hpp
-include/aleph/eng/Class.hpp
-include/aleph/eng/Closure.hpp
-include/aleph/eng/Constant.hpp
-include/aleph/eng/Engsid.hpp
-include/aleph/eng/Enum.hpp
-include/aleph/eng/Extracter.hpp
-include/aleph/eng/Form.hpp
-include/aleph/eng/Former.hpp
-include/aleph/eng/Function.hpp
-include/aleph/eng/Globalset.hpp
-include/aleph/eng/Instance.hpp
-include/aleph/eng/Interp.hpp
-include/aleph/eng/Item.hpp
-include/aleph/eng/Lexer.hpp
-include/aleph/eng/Lexical.hpp
-include/aleph/eng/Localset.hpp
-include/aleph/eng/Meta.hpp
-include/aleph/eng/Module.hpp
-include/aleph/eng/Nameset.hpp
-include/aleph/eng/Options.hpp
-include/aleph/eng/Printer.hpp
-include/aleph/eng/Promise.hpp
-include/aleph/eng/Qualified.hpp
-include/aleph/eng/Reader.hpp
-include/aleph/eng/Reserved.hpp
-include/aleph/eng/Resolver.hpp
-include/aleph/eng/Return.hpp
-include/aleph/eng/Symbol.hpp
-include/aleph/eng/Token.hpp
-include/aleph/net/Address.hpp
-include/aleph/net/Datagram.hpp
-include/aleph/net/Libanet.hpp
-include/aleph/net/Mail.hpp
-include/aleph/net/Multicast.hpp
-include/aleph/net/Netcalls.hpp
-include/aleph/net/Predanet.hpp
-include/aleph/net/Socket.hpp
-include/aleph/net/TcpClient.hpp
-include/aleph/net/TcpServer.hpp
-include/aleph/net/TcpSocket.hpp
-include/aleph/net/UdpClient.hpp
-include/aleph/net/UdpServer.hpp
-include/aleph/net/UdpSocket.hpp
-include/aleph/odb/Cell.hpp
-include/aleph/odb/Collection.hpp
-include/aleph/odb/Libaodb.hpp
-include/aleph/odb/Odbcalls.hpp
-include/aleph/odb/Odbsid.hpp
-include/aleph/odb/Persist.hpp
-include/aleph/odb/Record.hpp
-include/aleph/odb/Table.hpp
-include/aleph/plt/cclk.hpp
-include/aleph/plt/ccnf.hpp
-include/aleph/plt/ccnv.hpp
-include/aleph/plt/cdir.hpp
-include/aleph/plt/cerr.hpp
-include/aleph/plt/cmem.hpp
-include/aleph/plt/cmth.hpp
-include/aleph/plt/cnet.hpp
-include/aleph/plt/cshl.hpp
-include/aleph/plt/csio.hpp
-include/aleph/plt/cstr.hpp
-include/aleph/plt/csys.hpp
-include/aleph/plt/cthr.hpp
-include/aleph/plt/ctrm.hpp
-include/aleph/sio/Directory.hpp
-include/aleph/sio/Libasio.hpp
-include/aleph/sio/Pathasio.hpp
-include/aleph/sio/Predasio.hpp
-include/aleph/sio/Selector.hpp
-include/aleph/std/BitSet.hpp
-include/aleph/std/Boolean.hpp
-include/aleph/std/Buffer.hpp
-include/aleph/std/Character.hpp
-include/aleph/std/Cilo.hpp
-include/aleph/std/Condvar.hpp
-include/aleph/std/Cons.hpp
-include/aleph/std/Cursor.hpp
-include/aleph/std/Exception.hpp
-include/aleph/std/Finalize.hpp
-include/aleph/std/Graph.hpp
-include/aleph/std/HashTable.hpp
-include/aleph/std/Input.hpp
-include/aleph/std/InputFile.hpp
-include/aleph/std/InputMapped.hpp
-include/aleph/std/InputString.hpp
-include/aleph/std/InputTerm.hpp
-include/aleph/std/Integer.hpp
-include/aleph/std/Iterable.hpp
-include/aleph/std/Iterator.hpp
-include/aleph/std/Librarian.hpp
-include/aleph/std/Library.hpp
-include/aleph/std/List.hpp
-include/aleph/std/Literal.hpp
-include/aleph/std/Lockrw.hpp
-include/aleph/std/Method.hpp
-include/aleph/std/Monitor.hpp
-include/aleph/std/Mutex.hpp
-include/aleph/std/NameTable.hpp
-include/aleph/std/Object.hpp
-include/aleph/std/Output.hpp
-include/aleph/std/OutputFile.hpp
-include/aleph/std/OutputString.hpp
-include/aleph/std/OutputTerm.hpp
-include/aleph/std/Qarray.hpp
-include/aleph/std/QuarkTable.hpp
-include/aleph/std/Queue.hpp
-include/aleph/std/Reactor.hpp
-include/aleph/std/Real.hpp
-include/aleph/std/Recycle.hpp
-include/aleph/std/Regex.hpp
-include/aleph/std/Relatif.hpp
-include/aleph/std/Runnable.hpp
-include/aleph/std/Serial.hpp
-include/aleph/std/Stack.hpp
-include/aleph/std/String.hpp
-include/aleph/std/Strvec.hpp
-include/aleph/std/System.hpp
-include/aleph/std/Terminal.hpp
-include/aleph/std/Thread.hpp
-include/aleph/std/Thrmap.hpp
-include/aleph/std/Vector.hpp
-include/aleph/sys/Libasys.hpp
-include/aleph/sys/Predasys.hpp
-include/aleph/sys/Syscalls.hpp
-include/aleph/sys/Time.hpp
-include/aleph/txt/Digest.hpp
-include/aleph/txt/Libatxt.hpp
-include/aleph/txt/Predatxt.hpp
-include/aleph/txt/PrintTable.hpp
-include/aleph/txt/Sort.hpp
-include/aleph/txt/Txtcalls.hpp
-include/aleph/www/CgiQuery.hpp
-include/aleph/www/Cookie.hpp
-include/aleph/www/HtmlPage.hpp
-include/aleph/www/Libawww.hpp
-include/aleph/www/Predawww.hpp
-include/aleph/www/Url.hpp
-include/aleph/www/XHtmlPage.hpp
-@dirrm include/aleph/eng
-@dirrm include/aleph/net
-@dirrm include/aleph/odb
-@dirrm include/aleph/plt
-@dirrm include/aleph/sio
-@dirrm include/aleph/std
-@dirrm include/aleph/sys
-@dirrm include/aleph/txt
-@dirrm include/aleph/www
-@dirrm include/aleph
-lib/libaleph-eng.a
-lib/libaleph-eng.so
-lib/libaleph-eng.so.%%PORTVER%%
-lib/libaleph-net.a
-lib/libaleph-net.so
-lib/libaleph-net.so.%%PORTVER%%
-lib/libaleph-odb.a
-lib/libaleph-odb.so
-lib/libaleph-odb.so.%%PORTVER%%
-lib/libaleph-plt.a
-lib/libaleph-plt.so
-lib/libaleph-plt.so.%%PORTVER%%
-lib/libaleph-sio.a
-lib/libaleph-sio.so
-lib/libaleph-sio.so.%%PORTVER%%
-lib/libaleph-std.a
-lib/libaleph-std.so
-lib/libaleph-std.so.%%PORTVER%%
-lib/libaleph-sys.a
-lib/libaleph-sys.so
-lib/libaleph-sys.so.%%PORTVER%%
-lib/libaleph-txt.a
-lib/libaleph-txt.so
-lib/libaleph-txt.so.%%PORTVER%%
-lib/libaleph-www.a
-lib/libaleph-www.so
-lib/libaleph-www.so.%%PORTVER%%