7 files changed, 18 insertions, 88 deletions

diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index da0aa94ea5c1..32323cdf48f4 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -8,10 +8,9 @@
 PORTNAME=	golded+
 PORTVERSION=	1.1.5.a${SNAPDATE}
 CATEGORIES=	news mail
-MASTER_SITES=	SF/golded-plus/golded-plus-src/Snapshot%20of%20the%201.1.5
-DISTNAME=	gps${SNAPDATE:S,^200,,}
-SNAPDATE=	20070503
-EXTRACT_SUFX=	.tb2
+MASTER_SITES=	SF/golded-plus/Golded%2B%201.1.5%20snapshots
+DISTNAME=	gps115-${SNAPDATE}
+SNAPDATE=	20110223
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	GoldEd+ (FTN message editor)
diff --git a/news/golded+/distinfo b/news/golded+/distinfo
index 917fb3ba5c4d..0bd1f0d303b2 100644
--- a/news/golded+/distinfo
+++ b/news/golded+/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gps70503.tb2) = ebac731af993ad4fe9e206fcdf9ac00d149df44376c1238bfb2ede422e8deb57
-SIZE (gps70503.tb2) = 1530599
+SHA256 (gps115-20110223.tar.bz2) = cdc0976bcad8dc2419318b17e1a9069cfd0feb4b61d8057e46a075f8b2936d2c
+SIZE (gps115-20110223.tar.bz2) = 7824955
diff --git a/news/golded+/files/patch-GNUmakef.def b/news/golded+/files/patch-GNUmakef.def
index 402c18c8c7a8..0525d449958c 100644
--- a/news/golded+/files/patch-GNUmakef.def
+++ b/news/golded+/files/patch-GNUmakef.def
@@ -1,6 +1,6 @@
---- GNUmakef.def.orig	Mon May 15 16:54:00 2006
-+++ GNUmakef.def	Tue Oct 31 23:29:12 2006
-@@ -106,8 +106,8 @@
+--- GNUmakef.def.orig	2011-02-20 04:37:40.000000000 +0600
++++ GNUmakef.def	2011-12-15 11:32:23.000000000 +0700
+@@ -135,8 +135,8 @@
  CAT=cat
  SED=sed
  GREP=grep
@@ -11,7 +11,7 @@
  AR=ar
  RANLIB=ranlib
  PLATFORM=lnx
-@@ -119,8 +119,8 @@
+@@ -155,8 +155,8 @@
  endif
  endif
  endif
@@ -21,4 +21,4 @@
 +#LNKFLAGS+=-g
  CPPFLAGS+=$(CFLAGS) -fno-rtti # -fno-exceptions
  
- # comment following lines if you dislike ncurses
+ # Run `make USE_NCURSES=0` if you dislike ncurses
diff --git a/news/golded+/files/patch-geinit.cpp b/news/golded+/files/patch-golded3-geinit.cpp
index ac38391252e1..8c4e76e8d59c 100644
--- a/news/golded+/files/patch-geinit.cpp
+++ b/news/golded+/files/patch-golded3-geinit.cpp
@@ -1,6 +1,6 @@
---- golded3/geinit.cpp.orig	Sun May 14 18:09:02 2006
-+++ golded3/geinit.cpp	Wed Nov  1 02:49:10 2006
-@@ -413,19 +413,22 @@
+--- golded3/geinit.cpp.orig	2011-02-23 02:31:26.000000000 +0600
++++ golded3/geinit.cpp	2011-12-15 11:37:21.000000000 +0700
+@@ -420,19 +420,22 @@
    wcenters(12, C_BRAGW, "redistribute the program or any parts hereof under cer-");
    wcenters(13, C_BRAGW, "tain conditions. See the LICENSE.TXT for more details.");
  
@@ -10,6 +10,11 @@
    {
 -    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s (Fido: %s) - <%s>",
 -      __gver_vendor_name__, __gver_vendor_fido__, __gver_vendor_email__);
+-  }
+-  else
+-  {
+-    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s <%s>",
+-      __gver_vendor_name__, __gver_vendor_email__);
 +    wcenters(MAXROW-10, C_BRAGW, "This executable is distributed by");
 +    if (*__gver_vendor_fido__)
 +    {
@@ -24,11 +29,6 @@
 +  
 +    wcenters(MAXROW-9, C_BRAGW, buf);
    }
--  else
--  {
--    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s <%s>",
--      __gver_vendor_name__, __gver_vendor_email__);
--  }
 -
 -  wcenters(MAXROW-9, C_BRAGW, buf);
    gsprintf(PRINTF_DECLARE_BUFFER(buf), "Compiled on %s %s", __gver_date__, __gver_time__);
diff --git a/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp b/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp
deleted file mode 100644
index 334f36ccd949..000000000000
--- a/news/golded+/files/patch-goldlib-gall-gmemdbg.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- goldlib/gall/gmemdbg.cpp.orig	Fri Feb 23 05:34:31 2007
-+++ goldlib/gall/gmemdbg.cpp	Fri Feb 23 05:35:12 2007
-@@ -193,7 +193,7 @@
-   long last_diff = LONG_MAX;
-   Throw** i = throw_index;
-   for(int n=0; n<throw_index_size; n++,i++) {
--    long diff = (uint32_t)*i - (uint32_t)pointer;
-+    long diff = (long)*i - (long)pointer;
-     if((diff > 0) and (diff < last_diff)) {
-       last_candidate = *i;
-       last_diff = diff;
-@@ -211,7 +211,7 @@
-   long last_diff = LONG_MAX;
-   Throw** i = throw_index;
-   for(int n=0; n<throw_index_size; n++,i++) {
--    long diff = (uint32_t)pointer - (uint32_t)*i;
-+    long diff = (long)pointer - (long)*i;
-     if((diff > 0) and (diff < last_diff)) {
-       last_candidate = *i;
-       last_diff = diff;
diff --git a/news/golded+/files/patch-goldlib-hunspell-csutil.cxx b/news/golded+/files/patch-goldlib-hunspell-csutil.cxx
deleted file mode 100644
index 0abe4bec6868..000000000000
--- a/news/golded+/files/patch-goldlib-hunspell-csutil.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- goldlib/hunspell/csutil.cxx.orig	Fri Feb 23 05:38:36 2007
-+++ goldlib/hunspell/csutil.cxx	Fri Feb 23 05:40:11 2007
-@@ -4942,7 +4942,7 @@
- */
- int get_utf_cs_len()
- {
--  return (int)get_utf_cs(false);
-+  return (long)get_utf_cs(false);
- }
- 
- static struct lang_map *get_lang2enc(bool what = true)
-@@ -4980,7 +4980,7 @@
- 
- const char * get_default_enc(const char * lang)
- {
--  int n = (int)get_lang2enc(false);
-+  int n = (long)get_lang2enc(false);
-   for (int i = 0; i < n; i++)
-   {
-     if (strcmp(lang, get_lang2enc()[i].lang) == 0)
-@@ -4993,7 +4993,7 @@
- 
- int get_lang_num(const char * lang)
- {
--  int n = (int)get_lang2enc(false);
-+  int n = (long)get_lang2enc(false);
-   for (int i = 0; i < n; i++)
-   {
-     if (strncmp(lang,get_lang2enc()[i].lang,2) == 0)
diff --git a/news/golded+/files/patch-goldnode-goldnode.cpp b/news/golded+/files/patch-goldnode-goldnode.cpp
deleted file mode 100644
index f55981d272ef..000000000000
--- a/news/golded+/files/patch-goldnode-goldnode.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- goldnode/goldnode.cpp.orig	Fri Feb 23 05:44:33 2007
-+++ goldnode/goldnode.cpp	Fri Feb 23 05:45:36 2007
-@@ -259,7 +259,7 @@
-   point = strchr(str, '.');
-   domain = strchr(str, '@');
-   if(domain and point)
--    if((uint32_t)point > (uint32_t)domain)
-+    if(point > domain)
-       point = NULL;
- 
-   if(space)
-@@ -304,7 +304,7 @@
-     char* point = strchr(str, '.');
-     domain = strchr(str, '@');
-     if(domain and point)
--      if((uint32_t)point > (uint32_t)domain)
-+      if(point > domain)
-         point = NULL;
- 
-     if(net) {