4 files changed, 4 insertions, 175 deletions

diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 47280b7693e8..04fe823f01c1 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	golded+
 PORTVERSION=	1.1.5.a${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES=	news mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=golded-plus
 DISTNAME=	gps${SNAPDATE:S,^200,,}
-SNAPDATE=	20061116
+SNAPDATE=	20070503
 EXTRACT_SUFX=	.tb2
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/golded+/distinfo b/news/golded+/distinfo
index 6c58417a19e7..ec9851a07de5 100644
--- a/news/golded+/distinfo
+++ b/news/golded+/distinfo
@@ -1,3 +1,3 @@
-MD5 (gps61116.tb2) = 5c56ca8436fbf4f91e0e5328cea646c1
-SHA256 (gps61116.tb2) = 66fe9c3802453d2f8e2516152f4423cba619085b13bf426ccf4d5729862c9eb4
-SIZE (gps61116.tb2) = 1521451
+MD5 (gps70503.tb2) = 1646ef7135b78ceb7fe5b8a8f3b3fbc1
+SHA256 (gps70503.tb2) = ebac731af993ad4fe9e206fcdf9ac00d149df44376c1238bfb2ede422e8deb57
+SIZE (gps70503.tb2) = 1530599
diff --git a/news/golded+/files/patch-gemlst.cpp b/news/golded+/files/patch-gemlst.cpp
deleted file mode 100644
index f9ecc2db9c7a..000000000000
--- a/news/golded+/files/patch-gemlst.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- golded3/gemlst.cpp.orig	Wed Oct 25 21:54:37 2006
-+++ golded3/gemlst.cpp	Tue Nov 21 08:20:53 2006
-@@ -19,7 +19,7 @@
- //  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- //  MA 02111-1307 USA
- //  ------------------------------------------------------------------
--//  $Id: gemlst.cpp,v 1.58 2006/09/30 06:45:34 ssianky Exp $
-+//  $Id: gemlst.cpp,v 1.60 2006/11/20 15:41:40 stas_degteff Exp $
- //  ------------------------------------------------------------------
- //  Message lister.
- //  ------------------------------------------------------------------
-@@ -708,55 +708,7 @@
- 
- //  ------------------------------------------------------------------
- 
--class ThreadEntry {
--
--public:
--  uint32_t msgno;
--  uint32_t replyto;
--  uint32_t reply1st;
--  uint32_t replynext;
--  uint32_t replytoindex;
--  uint32_t level;
--};
--
--#define MAX_LEVEL 20
--
--class GThreadlist : public gwinpick {
--
--private:
--
--  gwindow     window;
--  GMsg        msg;
--  ThreadEntry t;
--
--  std::vector<ThreadEntry>  list;
--  std::vector<std::string>  tree;
--
--  dword m_OldMsgno;
--  uint m_OldTags;
--  std::string m_OldEchoId;
--
--  void BuildThreadIndex(dword msgno);
--  void recursive_build(uint32_t msgn, uint32_t rn, uint32_t level, uint32_t index);
--  void GenTree(int idx);
--  void update_title();
--  bool NextThread(bool next);
--
--public:
--
--  void open();                        // Called after window is opened
--  void close();                       // Called after window is closed
--  void print_line(uint idx, uint pos, bool isbar);
--  void do_delayed();
--  bool handle_key();                  // Handles keypress
--
--  void Run();
--  bool GoNextUnread(bool reader);
--
--  GThreadlist() { memset(&msg, 0, sizeof(GMsg)); replylinkfloat = CFG->replylinkfloat; };
--  ~GThreadlist() { ResetMsg(&msg); };
--};
--
-+//#define MAX_LEVEL 20
- 
- //  ------------------------------------------------------------------
- 
diff --git a/news/golded+/files/patch-geprot.h b/news/golded+/files/patch-geprot.h
deleted file mode 100644
index c3ed94b5e482..000000000000
--- a/news/golded+/files/patch-geprot.h
+++ /dev/null
@@ -1,102 +0,0 @@
---- golded3/geprot.h.orig	Tue May 16 16:49:29 2006
-+++ golded3/geprot.h	Thu Nov 23 11:11:14 2006
-@@ -19,7 +19,7 @@
- //  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- //  MA 02111-1307 USA
- //  ------------------------------------------------------------------
--//  $Id: geprot.h,v 1.45 2006/05/14 14:33:21 stas_degteff Exp $
-+//  $Id: geprot.h,v 1.48 2006/11/22 08:25:52 stas_degteff Exp $
- //  ------------------------------------------------------------------
- //  Collective header for GE*.CPP source files.
- //  ------------------------------------------------------------------
-@@ -210,19 +210,6 @@
- 
- 
- //  ------------------------------------------------------------------
--//  GEMLST prototypes
--
--void MsgThreadlist();
--
--
--//  ------------------------------------------------------------------
--//  GEMRKS prototypes
--
--void MarkMsgs(GMsg* msg);
--int NextMarkedmsg(int direction, GMsg* msg);
--
--
--//  ------------------------------------------------------------------
- //  GEMSGS prototypes
- 
- void TokenXlat(int mode, std::string &input, GMsg* msg, GMsg* oldmsg, int origarea);
-@@ -235,6 +222,70 @@
- int DoCarboncopy(GMsg* msg, GMsg** carbon);
- void DoCrosspost(GMsg* msg, std::vector<int> &postareas);
- char* ParseInternetAddr(char* __string, char* __name, char* __addr, bool detect_charset = true);
-+
-+
-+//  ------------------------------------------------------------------
-+//  GEMLST prototypes
-+
-+void MsgThreadlist();
-+
-+//  ------------------------------------------------------------------
-+
-+class ThreadEntry {
-+
-+public:
-+  uint32_t msgno;
-+  uint32_t replyto;
-+  uint32_t reply1st;
-+  uint32_t replynext;
-+  uint32_t replytoindex;
-+  uint32_t level;
-+};
-+
-+//  ------------------------------------------------------------------
-+
-+class GThreadlist : public gwinpick {
-+
-+private:
-+
-+  gwindow     window;
-+  GMsg        msg;
-+  ThreadEntry t;
-+
-+  std::vector<ThreadEntry>  list;
-+  std::vector<std::string>  tree;
-+
-+  dword m_OldMsgno;
-+  uint m_OldTags;
-+  std::string m_OldEchoId;
-+
-+  void BuildThreadIndex(dword msgno);
-+  void recursive_build(uint32_t msgn, uint32_t rn, uint32_t level, uint32_t index);
-+  void GenTree(int idx);
-+  void update_title();
-+  bool NextThread(bool next);
-+
-+public:
-+
-+  void open();                        // Called after window is opened
-+  void close();                       // Called after window is closed
-+  void print_line(uint idx, uint pos, bool isbar);
-+  void do_delayed();
-+  bool handle_key();                  // Handles keypress
-+
-+  void Run();
-+  bool GoNextUnread(bool reader);
-+
-+  GThreadlist() { memset(&msg, 0, sizeof(GMsg)); replylinkfloat = CFG->replylinkfloat; };
-+  ~GThreadlist() { ResetMsg(&msg); };
-+};
-+
-+
-+//  ------------------------------------------------------------------
-+//  GEMRKS prototypes
-+
-+void MarkMsgs(GMsg* msg);
-+int NextMarkedmsg(int direction, GMsg* msg);
- 
- 
- //  ------------------------------------------------------------------