Attachment #86449 for bug #122885

View | Details | Raw Unified | Return to bug 122885
Collapse All | Expand All





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=	20070503
EXTRACT_SUFX=	.tb2

MAINTAINER=	fjoe@FreeBSD.org

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (gps61116.tb2) = 5c56ca8436fbf4f91e0e5328cea646c1	1	MD5 (gps70503.tb2) = 1646ef7135b78ceb7fe5b8a8f3b3fbc1
2	SHA256 (gps61116.tb2) = 66fe9c3802453d2f8e2516152f4423cba619085b13bf426ccf4d5729862c9eb4	2	SHA256 (gps70503.tb2) = ebac731af993ad4fe9e206fcdf9ac00d149df44376c1238bfb2ede422e8deb57
3	SIZE (gps61116.tb2) = 1521451	3	SIZE (gps70503.tb2) = 1530599




--- 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
 
 //  ------------------------------------------------------------------
 




--- 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);
 
 
 //  ------------------------------------------------------------------

Return to bug 122885

Lines 7-18 Link Here

(-)Makefile (-2 / +1 lines)
7		7
8	PORTNAME= golded+	8	PORTNAME= golded+
9	PORTVERSION= 1.1.5.a${SNAPDATE}	9	PORTVERSION= 1.1.5.a${SNAPDATE}
10	PORTREVISION= 1
11	CATEGORIES= news mail	10	CATEGORIES= news mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR=golded-plus	12	MASTER_SITE_SUBDIR=golded-plus
14	DISTNAME= gps${SNAPDATE:S,^200,,}	13	DISTNAME= gps${SNAPDATE:S,^200,,}
15	SNAPDATE= 20061116	14	SNAPDATE= 20070503
16	EXTRACT_SUFX= .tb2	15	EXTRACT_SUFX= .tb2
17		16
18	MAINTAINER= fjoe@FreeBSD.org	17	MAINTAINER= fjoe@FreeBSD.org

Removed Link Here

(-)files/patch-gemlst.cpp (-68 lines)
1	--- golded3/gemlst.cpp.orig Wed Oct 25 21:54:37 2006
2	+++ golded3/gemlst.cpp Tue Nov 21 08:20:53 2006
3	@@ -19,7 +19,7 @@
4	// Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5	// MA 02111-1307 USA
6	// ------------------------------------------------------------------
7	-// $Id: gemlst.cpp,v 1.58 2006/09/30 06:45:34 ssianky Exp $
8	+// $Id: gemlst.cpp,v 1.60 2006/11/20 15:41:40 stas_degteff Exp $
9	// ------------------------------------------------------------------
10	// Message lister.
11	// ------------------------------------------------------------------
12	@@ -708,55 +708,7 @@
13
14	// ------------------------------------------------------------------
15
16	-class ThreadEntry {
17	-
18	-public:
19	- uint32_t msgno;
20	- uint32_t replyto;
21	- uint32_t reply1st;
22	- uint32_t replynext;
23	- uint32_t replytoindex;
24	- uint32_t level;
25	-};
26	-
27	-#define MAX_LEVEL 20
28	-
29	-class GThreadlist : public gwinpick {
30	-
31	-private:
32	-
33	- gwindow window;
34	- GMsg msg;
35	- ThreadEntry t;
36	-
37	- std::vector<ThreadEntry> list;
38	- std::vector<std::string> tree;
39	-
40	- dword m_OldMsgno;
41	- uint m_OldTags;
42	- std::string m_OldEchoId;
43	-
44	- void BuildThreadIndex(dword msgno);
45	- void recursive_build(uint32_t msgn, uint32_t rn, uint32_t level, uint32_t index);
46	- void GenTree(int idx);
47	- void update_title();
48	- bool NextThread(bool next);
49	-
50	-public:
51	-
52	- void open(); // Called after window is opened
53	- void close(); // Called after window is closed
54	- void print_line(uint idx, uint pos, bool isbar);
55	- void do_delayed();
56	- bool handle_key(); // Handles keypress
57	-
58	- void Run();
59	- bool GoNextUnread(bool reader);
60	-
61	- GThreadlist() { memset(&msg, 0, sizeof(GMsg)); replylinkfloat = CFG->replylinkfloat; };
62	- ~GThreadlist() { ResetMsg(&msg); };
63	-};
64	-
65	+//#define MAX_LEVEL 20
66
67	// ------------------------------------------------------------------
68

Removed Link Here

(-)files/patch-geprot.h (-102 lines)
1	--- golded3/geprot.h.orig Tue May 16 16:49:29 2006
2	+++ golded3/geprot.h Thu Nov 23 11:11:14 2006
3	@@ -19,7 +19,7 @@
4	// Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5	// MA 02111-1307 USA
6	// ------------------------------------------------------------------
7	-// $Id: geprot.h,v 1.45 2006/05/14 14:33:21 stas_degteff Exp $
8	+// $Id: geprot.h,v 1.48 2006/11/22 08:25:52 stas_degteff Exp $
9	// ------------------------------------------------------------------
10	// Collective header for GE*.CPP source files.
11	// ------------------------------------------------------------------
12	@@ -210,19 +210,6 @@
13
14
15	// ------------------------------------------------------------------
16	-// GEMLST prototypes
17	-
18	-void MsgThreadlist();
19	-
20	-
21	-// ------------------------------------------------------------------
22	-// GEMRKS prototypes
23	-
24	-void MarkMsgs(GMsg* msg);
25	-int NextMarkedmsg(int direction, GMsg* msg);
26	-
27	-
28	-// ------------------------------------------------------------------
29	// GEMSGS prototypes
30
31	void TokenXlat(int mode, std::string &input, GMsg* msg, GMsg* oldmsg, int origarea);
32	@@ -235,6 +222,70 @@
33	int DoCarboncopy(GMsg* msg, GMsg** carbon);
34	void DoCrosspost(GMsg* msg, std::vector<int> &postareas);
35	char* ParseInternetAddr(char* __string, char* __name, char* __addr, bool detect_charset = true);
36	+
37	+
38	+// ------------------------------------------------------------------
39	+// GEMLST prototypes
40	+
41	+void MsgThreadlist();
42	+
43	+// ------------------------------------------------------------------
44	+
45	+class ThreadEntry {
46	+
47	+public:
48	+ uint32_t msgno;
49	+ uint32_t replyto;
50	+ uint32_t reply1st;
51	+ uint32_t replynext;
52	+ uint32_t replytoindex;
53	+ uint32_t level;
54	+};
55	+
56	+// ------------------------------------------------------------------
57	+
58	+class GThreadlist : public gwinpick {
59	+
60	+private:
61	+
62	+ gwindow window;
63	+ GMsg msg;
64	+ ThreadEntry t;
65	+
66	+ std::vector<ThreadEntry> list;
67	+ std::vector<std::string> tree;
68	+
69	+ dword m_OldMsgno;
70	+ uint m_OldTags;
71	+ std::string m_OldEchoId;
72	+
73	+ void BuildThreadIndex(dword msgno);
74	+ void recursive_build(uint32_t msgn, uint32_t rn, uint32_t level, uint32_t index);
75	+ void GenTree(int idx);
76	+ void update_title();
77	+ bool NextThread(bool next);
78	+
79	+public:
80	+
81	+ void open(); // Called after window is opened
82	+ void close(); // Called after window is closed
83	+ void print_line(uint idx, uint pos, bool isbar);
84	+ void do_delayed();
85	+ bool handle_key(); // Handles keypress
86	+
87	+ void Run();
88	+ bool GoNextUnread(bool reader);
89	+
90	+ GThreadlist() { memset(&msg, 0, sizeof(GMsg)); replylinkfloat = CFG->replylinkfloat; };
91	+ ~GThreadlist() { ResetMsg(&msg); };
92	+};
93	+
94	+
95	+// ------------------------------------------------------------------
96	+// GEMRKS prototypes
97	+
98	+void MarkMsgs(GMsg* msg);
99	+int NextMarkedmsg(int direction, GMsg* msg);
100
101
102	// ------------------------------------------------------------------