18 files changed, 404 insertions, 0 deletions

diff --git a/news/Makefile b/news/Makefile
index 25abdadaf520..bb9f0b288cd9 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -14,6 +14,7 @@
     SUBDIR += dnews
     SUBDIR += fidogate
     SUBDIR += gnus-emacs20
+    SUBDIR += golded+
     SUBDIR += grn
     SUBDIR += gup
     SUBDIR += husky-base
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
new file mode 100644
index 000000000000..5e8ac2fcd56a
--- /dev/null
+++ b/news/golded+/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:    husky-msged
+# Date created:                         6 January 2003
+# Whom:                                 Max Khon
+#
+# $FreeBSD$
+#
+
+PORTNAME=	golded+
+PORTVERSION=	1.1.4.7
+CATEGORIES=	news mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=golded-plus
+DISTNAME=	gps114-7
+
+MAINTAINER=	fjoe@FreeBSD.org
+COMMENT=	GoldEd+ (FTN message editor)
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+MAN1=		golded.1 goldnode.1 rddt.1
+
+post-patch:
+	@cp ${WRKSRC}/golded3/mygolded.__h ${WRKSRC}/golded3/mygolded.h
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${PREFIX}/bin/golded
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${PREFIX}/bin/goldnode
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${PREFIX}/bin/rddt
+	@for i in ${MAN1}; do \
+		${INSTALL_MAN} ${WRKSRC}/docs/$$i ${PREFIX}/man/man1; \
+	done
+	@${MKDIR} ${PREFIX}/share/examples/golded+
+	@(cd ${WRKSRC}/cfgs && ${TAR} cf - --exclude CVS * | \
+	  ${TAR} xf - -C ${PREFIX}/share/examples/golded+)
+	@${MKDIR} ${PREFIX}/share/doc/golded+
+	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${PREFIX}/share/doc/golded+
+	@${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${PREFIX}/share/doc/golded+
+
+.include <bsd.port.mk>
diff --git a/news/golded+/distinfo b/news/golded+/distinfo
new file mode 100644
index 000000000000..a5e7b7fa5f44
--- /dev/null
+++ b/news/golded+/distinfo
@@ -0,0 +1 @@
+MD5 (gps114-7.tar.bz2) = 0bb9d4b9be90630e4ea87a3928f047a4
diff --git a/news/golded+/files/patch-GNUmakef.def b/news/golded+/files/patch-GNUmakef.def
new file mode 100644
index 000000000000..3291595b7e05
--- /dev/null
+++ b/news/golded+/files/patch-GNUmakef.def
@@ -0,0 +1,22 @@
+--- ./GNUmakef.def.orig	Sat Dec  2 13:11:50 2000
++++ ./GNUmakef.def	Mon Oct 20 01:56:39 2003
+@@ -37,8 +37,6 @@
+ OBJEXT=.o
+ LIBEXT=.a
+ else
+-CC=gcc
+-CXX=g++
+ AR=ar
+ PLATFORM=lnx
+ EXEEXT=
+@@ -47,8 +45,8 @@
+ endif
+ endif
+ endif
+-CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2# -fomit-frame-pointer
+-LNKFLAGS+=-g
++CFLAGS+=-funsigned-char $(INCS) -Wall -Wno-sign-compare #-pedantic -O2 -fomit-frame-pointer
++LNKFLAGS+=
+ CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
+ 
+ # comment following lines if you dislike ncurses
diff --git a/news/golded+/files/patch-golded3::gckeys.cpp b/news/golded+/files/patch-golded3::gckeys.cpp
new file mode 100644
index 000000000000..e88cd4ce2e07
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gckeys.cpp
@@ -0,0 +1,23 @@
+--- ./golded3/gckeys.cpp.orig	Mon Oct 20 02:43:53 2003
++++ ./golded3/gckeys.cpp	Mon Oct 20 02:49:54 2003
+@@ -825,9 +825,9 @@
+ 
+ //  ------------------------------------------------------------------
+ 
+-void RunMacro(Macro* m) {
++void RunMacro(const Macro& m) {
+ 
+-  gkey* mac = m->buf;
++  const gkey* mac = m.buf;
+   while(*mac) {
+     kbput(*mac);
+     mac++;
+@@ -839,7 +839,7 @@
+ 
+ static void PlayMacro() {
+ 
+-  RunMacro(&CFG->macro[0xFFFF-gkbd.curronkey->pass]);
++  RunMacro(CFG->macro[0xFFFF-gkbd.curronkey->pass]);
+ }
+ 
+ 
diff --git a/news/golded+/files/patch-golded3::gectnr.cpp b/news/golded+/files/patch-golded3::gectnr.cpp
new file mode 100644
index 000000000000..48a79b63bbab
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gectnr.cpp
@@ -0,0 +1,28 @@
+--- ./golded3/gectnr.cpp.orig	Wed Mar 22 23:59:18 2000
++++ ./golded3/gectnr.cpp	Mon Oct 20 02:40:51 2003
+@@ -34,7 +34,7 @@
+ void Container::StyleCodeHighlight(const char* text, int row, int col, bool dohide, int color) {
+ 
+   uint sclen = 0;
+-  char* txptr = text;
++  const char* txptr = text;
+   char buf[200];
+   const char* ptr = text;
+   const char* stylemargins = " -|\\";    // we probably have to make a keyword for it
+@@ -60,14 +60,14 @@
+           if((bb <= 1) and (bi <= 1) and (br <= 1) and (bu <= 1) and *ptr) {
+             const char* beginword = ptr;                       //  _/*>another*/_
+             char endchar = NUL;
+-            char* end = ptr;
++            char* end = const_cast<char *>(ptr);
+             do {
+               end = strpbrk(++end, punctchars);
+             } while ((end) and not isstylechar(*(end-1)));
+             if(end)
+               endchar = *end;
+             else
+-              end = ptr+strlen(ptr);
++              end = const_cast<char *>(ptr+strlen(ptr));
+             *end = NUL;
+             char* endstyle = end-1;                      //  _/*another*/>_
+             if(isstylechar(*endstyle) and not strchr(stylemargins, *beginword)) {
diff --git a/news/golded+/files/patch-golded3::geglob.cpp b/news/golded+/files/patch-golded3::geglob.cpp
new file mode 100644
index 000000000000..e873cefc5f8a
--- /dev/null
+++ b/news/golded+/files/patch-golded3::geglob.cpp
@@ -0,0 +1,11 @@
+--- ./golded3/geglob.cpp.orig	Mon Oct 20 02:45:03 2003
++++ ./golded3/geglob.cpp	Mon Oct 20 02:45:13 2003
+@@ -274,7 +274,7 @@
+   vector<Macro>::iterator m = CFG->macro.begin();
+   while(m != CFG->macro.end()) {
+     if((key == m->key) and (type == m->type)) {
+-      RunMacro(m);
++      RunMacro(*m);
+       return true;
+     }
+     m++;
diff --git a/news/golded+/files/patch-golded3::gehdre.cpp b/news/golded+/files/patch-golded3::gehdre.cpp
new file mode 100644
index 000000000000..fb16c5ab4d97
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gehdre.cpp
@@ -0,0 +1,11 @@
+--- ./golded3/gehdre.cpp.orig	Mon Oct 20 02:57:23 2003
++++ ./golded3/gehdre.cpp	Mon Oct 20 02:58:21 2003
+@@ -511,7 +511,7 @@
+       // Try to match akas with the dest address, but only if the orig address was NOT changed
+       vector<gaka>::iterator i;
+       for(i = CFG->aka.begin(); i != CFG->aka.end(); i++) {
+-        if(memcmp(&msg->orig, i, sizeof(Addr)) == 0)
++        if(memcmp(&msg->orig, &(*i), sizeof(Addr)) == 0)
+           break;  // Found one of our own akas.
+       }
+ 
diff --git a/news/golded+/files/patch-golded3::gemlst.cpp b/news/golded+/files/patch-golded3::gemlst.cpp
new file mode 100644
index 000000000000..0b3bd3dad70b
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gemlst.cpp
@@ -0,0 +1,11 @@
+--- ./golded3/gemlst.cpp.orig	Mon Oct 20 03:02:58 2003
++++ ./golded3/gemlst.cpp	Mon Oct 20 03:05:15 2003
+@@ -1021,7 +1021,7 @@
+     }
+ 
+     if(found and list[j].msgno != t.replyto)
+-      list.erase(&list[j]);
++      list.erase(list.begin() + j);
+ 
+     if(found or list.size() == 0)
+       list.push_back(t);
diff --git a/news/golded+/files/patch-golded3::gepost.cpp b/news/golded+/files/patch-golded3::gepost.cpp
new file mode 100644
index 000000000000..c6524a5b0e34
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gepost.cpp
@@ -0,0 +1,20 @@
+--- ./golded3/gepost.cpp.orig	Mon Oct 20 03:09:41 2003
++++ ./golded3/gepost.cpp	Mon Oct 20 03:10:16 2003
+@@ -243,7 +243,7 @@
+   msg->oorig = msg->orig;
+   if(AA->isnet() and msg->orig.point) {
+     for(u = CFG->aka.begin(); u != CFG->aka.end(); u++) {
+-      if(not memcmp(u, &msg->orig, sizeof(Addr))) {
++      if(not memcmp(&(*u), &msg->orig, sizeof(Addr))) {
+         // Use fakenet to everybody
+         if(u->pointnet) {
+           msg->oorig.net   = u->pointnet;  // Create fake address
+@@ -361,7 +361,7 @@
+       cmsg->oorig = cmsg->orig;
+       if(AA->isnet() and cmsg->orig.point) {
+         for(u = CFG->aka.begin(); u != CFG->aka.end(); u++) {
+-          if(not memcmp(u, &cmsg->orig, sizeof(Addr))) {
++          if(not memcmp(&(*u), &cmsg->orig, sizeof(Addr))) {
+             // Use fakenet to everybody
+             if(u->pointnet) {
+               cmsg->oorig.net   = u->pointnet;  // Create fake address
diff --git a/news/golded+/files/patch-golded3::geprot.h b/news/golded+/files/patch-golded3::geprot.h
new file mode 100644
index 000000000000..2da3c34d306f
--- /dev/null
+++ b/news/golded+/files/patch-golded3::geprot.h
@@ -0,0 +1,11 @@
+--- ./golded3/geprot.h.orig	Mon Oct 20 02:44:44 2003
++++ ./golded3/geprot.h	Mon Oct 20 02:44:53 2003
+@@ -61,7 +61,7 @@
+ 
+ int ReadKeysCfg(int force);
+ void KeyCmdAdd(gkey cmd, gkey val, int type);
+-void RunMacro(Macro* m);
++void RunMacro(const Macro& m);
+ 
+ 
+ //  ------------------------------------------------------------------
diff --git a/news/golded+/files/patch-golded3::gesrch.cpp b/news/golded+/files/patch-golded3::gesrch.cpp
new file mode 100644
index 000000000000..2654d7ba2732
--- /dev/null
+++ b/news/golded+/files/patch-golded3::gesrch.cpp
@@ -0,0 +1,11 @@
+--- ./golded3/gesrch.cpp.orig	Mon Oct 20 03:15:28 2003
++++ ./golded3/gesrch.cpp	Mon Oct 20 03:16:29 2003
+@@ -217,7 +217,7 @@
+ 
+ bool golded_search_manager::search(GMsg* msg, bool quick, bool shortcircuit) {
+ 
+-  search_item* item = items.begin();
++  vector<search_item>::iterator item = items.begin();
+   bool exit = false;
+   bool and_cycle = false;
+   bool or_cycle = false;
diff --git a/news/golded+/files/patch-golded3::geutil2.cpp b/news/golded+/files/patch-golded3::geutil2.cpp
new file mode 100644
index 000000000000..01c538df971d
--- /dev/null
+++ b/news/golded+/files/patch-golded3::geutil2.cpp
@@ -0,0 +1,24 @@
+--- ./golded3/geutil2.cpp.orig	Fri Feb 25 17:04:04 2000
++++ ./golded3/geutil2.cpp	Mon Oct 20 04:14:52 2003
+@@ -190,9 +190,9 @@
+ 
+ int AkaMatch(ftn_addr* match, const ftn_addr* addr) {
+ 
+-  int aka;
++  int aka = 0;
+ 
+-  for(vector<AkaMatchG>::iterator am = CFG->akamatch.begin(), aka=0; am != CFG->akamatch.end(); am++, aka++) {
++  for(vector<AkaMatchG>::iterator am = CFG->akamatch.begin(); am != CFG->akamatch.end(); am++, aka++) {
+     if(addr->match(am->mask)) {
+       int akano = GetAkaNo(am->aka);
+       if(akano != -1) {
+@@ -207,7 +207,8 @@
+   int matchaka = 0;
+   vector<gaka>::iterator a;
+ 
+-  for(a = CFG->aka.begin(), aka = 0; a != CFG->aka.end(); aka++, a++) {
++  aka = 0;
++  for(a = CFG->aka.begin(); a != CFG->aka.end(); aka++, a++) {
+ 
+     if(match->equals(a->addr))
+       matchaka = aka;
diff --git a/news/golded+/files/patch-goldlib::gall::gdefs.h b/news/golded+/files/patch-goldlib::gall::gdefs.h
new file mode 100644
index 000000000000..e5a3675bc445
--- /dev/null
+++ b/news/golded+/files/patch-goldlib::gall::gdefs.h
@@ -0,0 +1,20 @@
+--- ./goldlib/gall/gdefs.h.orig	Fri Feb 25 16:10:58 2000
++++ ./goldlib/gall/gdefs.h	Mon Oct 20 17:10:33 2003
+@@ -34,14 +34,17 @@
+ #include <cstddef>
+ #include <gcmpall.h>
+ 
++using namespace std;
+ 
+ //  ------------------------------------------------------------------
+ //  Define portability and shorthand notation
+ 
++#if !defined(__GNUC__) || __GNUC__ < 3
+ #ifndef and
+ #define not      !
+ #define and      &&
+ #define or       ||
++#endif
+ #endif
+ 
+ #ifndef true
diff --git a/news/golded+/files/patch-goldlib::gall::gevalhum.cpp b/news/golded+/files/patch-goldlib::gall::gevalhum.cpp
new file mode 100644
index 000000000000..78d13cda8cb9
--- /dev/null
+++ b/news/golded+/files/patch-goldlib::gall::gevalhum.cpp
@@ -0,0 +1,33 @@
+--- ./goldlib/gall/gevalhum.cpp.orig	Mon Oct 20 02:04:25 2003
++++ ./goldlib/gall/gevalhum.cpp	Mon Oct 20 02:17:07 2003
+@@ -50,12 +50,12 @@
+ 
+     while(ostk.size()) {
+ 
+-      int* vptr = vstk.begin();
+-      ops* optr = ostk.begin();
++      vector<int>::iterator vptr = vstk.begin();
++      vector<ops>::iterator optr = ostk.begin();
+ 
+-      while(optr < ostk.end()) {
++      while(optr != ostk.end()) {
+ 
+-        if(optr < (ostk.end() - 1)) {
++        if(optr != (ostk.end() - 1)) {
+ 
+           if(*optr == parenthesis_left) {
+             if(optr[1] == parenthesis_right) {
+@@ -80,10 +80,10 @@
+ 
+         if(ostk.size()) {
+           if((*optr == negation) or (*optr == logic_not))
+-            *vptr = evaluate_ops(optr, vptr, vptr);
++            *vptr = evaluate_op(*optr, *vptr, *vptr);
+           else {
+-            *vptr = evaluate_ops(optr, vptr, vptr+1);
+-            if(vptr+1 < vstk.end())
++            *vptr = evaluate_op(*optr, *vptr, *(vptr+1));
++            if(vptr+1 != vstk.end())
+               vstk.erase(vptr+1);
+           }
+           ostk.erase(optr);
diff --git a/news/golded+/files/patch-goldlib::gcfg::gs_opus.h b/news/golded+/files/patch-goldlib::gcfg::gs_opus.h
new file mode 100644
index 000000000000..8689295dfee9
--- /dev/null
+++ b/news/golded+/files/patch-goldlib::gcfg::gs_opus.h
@@ -0,0 +1,13 @@
+--- ./goldlib/gcfg/gs_opus.h.orig	Fri Feb 25 16:12:42 2000
++++ ./goldlib/gcfg/gs_opus.h	Mon Oct 20 02:25:17 2003
+@@ -137,10 +137,6 @@
+ # define Procedure    void
+ # define shl          <<
+ # define shr          >>
+-# define xor          ^
+-# define and          &&
+-# define or           ||
+-# define not          !
+ # define mod          %
+   typedef unsigned      Bit;
+   typedef unsigned char const * const  STRING;
diff --git a/news/golded+/pkg-descr b/news/golded+/pkg-descr
new file mode 100644
index 000000000000..a8a5c306df8e
--- /dev/null
+++ b/news/golded+/pkg-descr
@@ -0,0 +1,6 @@
+Msged/TE (full-featured FTN mail reader)
+
+Msged/TE is a part of Husky Fidosoft Project.
+Husky is complete freeware suite of Fidonet applications. 
+
+WWW: http://husky.sourceforge.net/
diff --git a/news/golded+/pkg-plist b/news/golded+/pkg-plist
new file mode 100644
index 000000000000..e67f14e89d0f
--- /dev/null
+++ b/news/golded+/pkg-plist
@@ -0,0 +1,116 @@
+bin/golded
+bin/goldnode
+bin/rddt
+share/doc/golded+/gold_ref.txt
+share/doc/golded+/gold_usr.txt
+share/examples/golded+/charset/850_850.chs
+share/examples/golded+/charset/850_asc.chs
+share/examples/golded+/charset/850_iqp.chs
+share/examples/golded+/charset/850_iso.chs
+share/examples/golded+/charset/865_iso.chs
+share/examples/golded+/charset/can_asc.chs
+share/examples/golded+/charset/can_ibm.chs
+share/examples/golded+/charset/cmp_ibm.esc
+share/examples/golded+/charset/dut_asc.chs
+share/examples/golded+/charset/dut_ibm.chs
+share/examples/golded+/charset/fin_asc.chs
+share/examples/golded+/charset/fin_ibm.chs
+share/examples/golded+/charset/frn_asc.chs
+share/examples/golded+/charset/frn_ibm.chs
+share/examples/golded+/charset/ger_asc.chs
+share/examples/golded+/charset/ger_ibm.chs
+share/examples/golded+/charset/i1m_ibm.chs
+share/examples/golded+/charset/i51_ibm.esc
+share/examples/golded+/charset/ibm_asc.chs
+share/examples/golded+/charset/ibm_cmp.chs
+share/examples/golded+/charset/ibm_i51.chs
+share/examples/golded+/charset/ibm_ibm.chs
+share/examples/golded+/charset/ibm_iqp.chs
+share/examples/golded+/charset/ibm_iso.chs
+share/examples/golded+/charset/ibm_mac.chs
+share/examples/golded+/charset/ibm_mne.chs
+share/examples/golded+/charset/ibm_swe.chs
+share/examples/golded+/charset/ibm_vt1.chs
+share/examples/golded+/charset/iqp_850.chs
+share/examples/golded+/charset/iqp_ibm.chs
+share/examples/golded+/charset/iso_850.chs
+share/examples/golded+/charset/iso_asc.chs
+share/examples/golded+/charset/iso_ibm.chs
+share/examples/golded+/charset/iso_iso.chs
+share/examples/golded+/charset/iso_mac.chs
+share/examples/golded+/charset/iso_vt1.chs
+share/examples/golded+/charset/ita_asc.chs
+share/examples/golded+/charset/itl_ibm.chs
+share/examples/golded+/charset/mac_850.chs
+share/examples/golded+/charset/mac_asc.chs
+share/examples/golded+/charset/mac_ibm.chs
+share/examples/golded+/charset/mac_iso.chs
+share/examples/golded+/charset/mac_vt1.chs
+share/examples/golded+/charset/mne_850.esc
+share/examples/golded+/charset/mne_ibm.esc
+share/examples/golded+/charset/nor_asc.chs
+share/examples/golded+/charset/nor_ibm.chs
+share/examples/golded+/charset/prt_asc.chs
+share/examples/golded+/charset/prt_ibm.chs
+share/examples/golded+/charset/spn_asc.chs
+share/examples/golded+/charset/spn_ibm.chs
+share/examples/golded+/charset/swe_asc.chs
+share/examples/golded+/charset/swe_ibm.chs
+share/examples/golded+/charset/swi_asc.chs
+share/examples/golded+/charset/swi_ibm.chs
+share/examples/golded+/charset/uk__asc.chs
+share/examples/golded+/charset/uk__ibm.chs
+share/examples/golded+/colorset/gedcol00.cfg
+share/examples/golded+/colorset/gedcol01.cfg
+share/examples/golded+/colorset/gedcol02.cfg
+share/examples/golded+/colorset/gedcol03.cfg
+share/examples/golded+/colorset/gedcol04.cfg
+share/examples/golded+/colorset/gedcol05.cfg
+share/examples/golded+/colorset/gedcol06.cfg
+share/examples/golded+/colorset/gedcol07.cfg
+share/examples/golded+/colorset/gedcol08.cfg
+share/examples/golded+/colorset/gedcol09.cfg
+share/examples/golded+/colorset/gedcol10.cfg
+share/examples/golded+/colorset/gedcol11.cfg
+share/examples/golded+/colorset/gedcol12.cfg
+share/examples/golded+/colorset/gedcol13.cfg
+share/examples/golded+/colorset/gedcol14.cfg
+share/examples/golded+/colorset/gedcol15.cfg
+share/examples/golded+/colorset/gedcol16.cfg
+share/examples/golded+/colorset/gedcol17.cfg
+share/examples/golded+/colorset/gedcol18.cfg
+share/examples/golded+/colorset/gedcol19.cfg
+share/examples/golded+/colorset/gedcol20.cfg
+share/examples/golded+/colorset/gedcol21.cfg
+share/examples/golded+/colorset/gedcol22.cfg
+share/examples/golded+/colorset/gedcol23.cfg
+share/examples/golded+/colorset/gedmon00.cfg
+share/examples/golded+/colorset/gedmon01.cfg
+share/examples/golded+/colorset/gedmon02.cfg
+share/examples/golded+/config/advanced.cfg
+share/examples/golded+/config/gedlngdk.cfg
+share/examples/golded+/config/gedlngit.cfg
+share/examples/golded+/config/gedlngnl.cfg
+share/examples/golded+/config/gedlngus.cfg
+share/examples/golded+/config/goldhelp.cfg
+share/examples/golded+/config/goldkeys.cfg
+share/examples/golded+/config/goldlang.cfg
+share/examples/golded+/config/goldlang.ger
+share/examples/golded+/config/goldlang.it
+share/examples/golded+/config/goldlang.nl
+share/examples/golded+/config/goldlang.ru2
+share/examples/golded+/config/goldlang.rus
+share/examples/golded+/config/goldlang.sv
+share/examples/golded+/config/simple.cfg
+share/examples/golded+/template/dansk.tpl
+share/examples/golded+/template/default.tpl
+share/examples/golded+/template/email.tpl
+share/examples/golded+/template/golded.cfm
+share/examples/golded+/template/golded.tpl
+share/examples/golded+/template/newsgrps.tpl
+@dirrm share/examples/golded+/charset
+@dirrm share/examples/golded+/config
+@dirrm share/examples/golded+/colorset
+@dirrm share/examples/golded+/template
+@dirrm share/examples/golded+
+@dirrm share/doc/golded+