summaryrefslogtreecommitdiffstats
path: root/news
diff options
context:
space:
mode:
Diffstat (limited to 'news')
-rw-r--r--news/golded+/Makefile10
-rw-r--r--news/golded+/distinfo2
-rw-r--r--news/golded+/files/patch-GNUmakef.def22
-rw-r--r--news/golded+/files/patch-golded3-gemsgs.cpp11
-rw-r--r--news/golded+/files/patch-golded3::gckeys.cpp23
-rw-r--r--news/golded+/files/patch-golded3::gectnr.cpp28
-rw-r--r--news/golded+/files/patch-golded3::geglob.cpp11
-rw-r--r--news/golded+/files/patch-golded3::gehdre.cpp11
-rw-r--r--news/golded+/files/patch-golded3::gemlst.cpp11
-rw-r--r--news/golded+/files/patch-golded3::gepost.cpp20
-rw-r--r--news/golded+/files/patch-golded3::geprot.h11
-rw-r--r--news/golded+/files/patch-golded3::gesrch.cpp11
-rw-r--r--news/golded+/files/patch-golded3::geutil2.cpp24
-rw-r--r--news/golded+/files/patch-goldlib::gall::gdefs.h20
-rw-r--r--news/golded+/files/patch-goldlib::gall::gevalhum.cpp33
-rw-r--r--news/golded+/files/patch-goldlib::gcfg::gs_opus.h13
-rw-r--r--news/golded+/pkg-plist30
17 files changed, 47 insertions, 244 deletions
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index f811679..a100a0d 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= golded+
-PORTVERSION= 1.1.4.7
-PORTREVISION= 1
+PORTVERSION= 1.1.5.a${SNAPDATE}
CATEGORIES= news mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=golded-plus
-DISTNAME= gps114-7
+DISTNAME= gps-${SNAPDATE}
+SNAPDATE= 20031224
MAINTAINER= fjoe@FreeBSD.org
COMMENT= GoldEd+ (FTN message editor)
@@ -22,6 +22,7 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN1= golded.1 goldnode.1 rddt.1
+DOCS= copying copying.lib license.txt notework.txt rusfaq.txt tips.txt
post-patch:
@cp ${WRKSRC}/golded3/mygolded.__h ${WRKSRC}/golded3/mygolded.h
@@ -42,6 +43,9 @@ do-install:
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${DOCSDIR}
+ @for i in ${DOCS}; do \
+ ${INSTALL_DATA} ${WRKSRC}/docs/$$i ${DOCSDIR}; \
+ done
.endif
.include <bsd.port.mk>
diff --git a/news/golded+/distinfo b/news/golded+/distinfo
index a5e7b7f..a99ea1b 100644
--- a/news/golded+/distinfo
+++ b/news/golded+/distinfo
@@ -1 +1 @@
-MD5 (gps114-7.tar.bz2) = 0bb9d4b9be90630e4ea87a3928f047a4
+MD5 (gps-20031224.tar.bz2) = eef31e059c8d869a824ebd5b18377b87
diff --git a/news/golded+/files/patch-GNUmakef.def b/news/golded+/files/patch-GNUmakef.def
index 3291595..fe9da99 100644
--- a/news/golded+/files/patch-GNUmakef.def
+++ b/news/golded+/files/patch-GNUmakef.def
@@ -1,22 +1,24 @@
---- ./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
+--- GNUmakef.def.orig Mon Dec 22 14:02:19 2003
++++ GNUmakef.def Fri Dec 26 05:38:58 2003
+@@ -78,8 +78,8 @@
+ LNKFLAGS+=-lbe -ltextencoding
else
+ CAT=cat
-CC=gcc
-CXX=g++
++#CC=gcc
++#CXX=g++
AR=ar
+ RANLIB=ranlib
PLATFORM=lnx
- EXEEXT=
-@@ -47,8 +45,8 @@
+@@ -91,8 +91,8 @@
endif
endif
endif
--CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2# -fomit-frame-pointer
+-CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
-LNKFLAGS+=-g
-+CFLAGS+=-funsigned-char $(INCS) -Wall -Wno-sign-compare #-pedantic -O2 -fomit-frame-pointer
-+LNKFLAGS+=
++CFLAGS+=-funsigned-char $(INCS) -Wall -Wno-sign-compare -O2 -DPRAGMA_PACK # -pedantic -fomit-frame-pointer
++#LNKFLAGS+=-g
CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
# comment following lines if you dislike ncurses
diff --git a/news/golded+/files/patch-golded3-gemsgs.cpp b/news/golded+/files/patch-golded3-gemsgs.cpp
deleted file mode 100644
index a3f3751..0000000
--- a/news/golded+/files/patch-golded3-gemsgs.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- golded3/gemsgs.cpp.orig Sun Nov 2 20:05:14 2003
-+++ golded3/gemsgs.cpp Sun Nov 2 20:04:49 2003
-@@ -55,7 +55,7 @@
- va_list a;
- va_start(a, cnt);
- for(int i = 0; i < cnt; i ++) {
-- use = va_arg(a, bool);
-+ use = va_arg(a, int);
- if(dst[toklen] == '{') {
- char *p = strchr(dst+toklen, '}');
- if(p) {
diff --git a/news/golded+/files/patch-golded3::gckeys.cpp b/news/golded+/files/patch-golded3::gckeys.cpp
deleted file mode 100644
index e88cd4c..0000000
--- a/news/golded+/files/patch-golded3::gckeys.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./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
deleted file mode 100644
index 48a79b63..0000000
--- a/news/golded+/files/patch-golded3::gectnr.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./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
deleted file mode 100644
index e873cef..0000000
--- a/news/golded+/files/patch-golded3::geglob.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index fb16c5a..0000000
--- a/news/golded+/files/patch-golded3::gehdre.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index 0b3bd3d..0000000
--- a/news/golded+/files/patch-golded3::gemlst.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index c6524a5..0000000
--- a/news/golded+/files/patch-golded3::gepost.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
deleted file mode 100644
index 2da3c34..0000000
--- a/news/golded+/files/patch-golded3::geprot.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index 2654d7b..0000000
--- a/news/golded+/files/patch-golded3::gesrch.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index 01c538d..0000000
--- a/news/golded+/files/patch-golded3::geutil2.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./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
deleted file mode 100644
index e5a3675..0000000
--- a/news/golded+/files/patch-goldlib::gall::gdefs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
deleted file mode 100644
index 78d13cd..0000000
--- a/news/golded+/files/patch-goldlib::gall::gevalhum.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./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
deleted file mode 100644
index 8689295..0000000
--- a/news/golded+/files/patch-goldlib::gcfg::gs_opus.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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-plist b/news/golded+/pkg-plist
index f27ec41..8daed08 100644
--- a/news/golded+/pkg-plist
+++ b/news/golded+/pkg-plist
@@ -1,14 +1,23 @@
bin/golded
bin/goldnode
bin/rddt
+%%PORTDOCS%%%%DOCSDIR%%/copying
+%%PORTDOCS%%%%DOCSDIR%%/copying.lib
%%PORTDOCS%%%%DOCSDIR%%/gold_ref.txt
%%PORTDOCS%%%%DOCSDIR%%/gold_usr.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/notework.txt
+%%PORTDOCS%%%%DOCSDIR%%/rusfaq.txt
+%%PORTDOCS%%%%DOCSDIR%%/tips.txt
%%EXAMPLESDIR%%/charset/850_850.chs
%%EXAMPLESDIR%%/charset/850_asc.chs
%%EXAMPLESDIR%%/charset/850_iqp.chs
%%EXAMPLESDIR%%/charset/850_iso.chs
%%EXAMPLESDIR%%/charset/865_iso.chs
+%%EXAMPLESDIR%%/charset/866_koi.chs
+%%EXAMPLESDIR%%/charset/866_kou.chs
+%%EXAMPLESDIR%%/charset/866_ukr.chs
+%%EXAMPLESDIR%%/charset/866_win.chs
%%EXAMPLESDIR%%/charset/can_asc.chs
%%EXAMPLESDIR%%/charset/can_ibm.chs
%%EXAMPLESDIR%%/charset/cmp_ibm.esc
@@ -42,6 +51,9 @@ bin/rddt
%%EXAMPLESDIR%%/charset/iso_vt1.chs
%%EXAMPLESDIR%%/charset/ita_asc.chs
%%EXAMPLESDIR%%/charset/itl_ibm.chs
+%%EXAMPLESDIR%%/charset/koi_866.chs
+%%EXAMPLESDIR%%/charset/kou_866.chs
+%%EXAMPLESDIR%%/charset/kou_ukr.chs
%%EXAMPLESDIR%%/charset/mac_850.chs
%%EXAMPLESDIR%%/charset/mac_asc.chs
%%EXAMPLESDIR%%/charset/mac_ibm.chs
@@ -61,6 +73,11 @@ bin/rddt
%%EXAMPLESDIR%%/charset/swi_ibm.chs
%%EXAMPLESDIR%%/charset/uk__asc.chs
%%EXAMPLESDIR%%/charset/uk__ibm.chs
+%%EXAMPLESDIR%%/charset/ukr_866.chs
+%%EXAMPLESDIR%%/charset/ukr_koi.chs
+%%EXAMPLESDIR%%/charset/ukr_kou.chs
+%%EXAMPLESDIR%%/charset/ukr_ukr.chs
+%%EXAMPLESDIR%%/charset/win_866.chs
%%EXAMPLESDIR%%/colorset/gedcol00.cfg
%%EXAMPLESDIR%%/colorset/gedcol01.cfg
%%EXAMPLESDIR%%/colorset/gedcol02.cfg
@@ -89,17 +106,23 @@ bin/rddt
%%EXAMPLESDIR%%/colorset/gedmon01.cfg
%%EXAMPLESDIR%%/colorset/gedmon02.cfg
%%EXAMPLESDIR%%/config/advanced.cfg
+%%EXAMPLESDIR%%/config/advanced.rus
+%%EXAMPLESDIR%%/config/gedcolor.cfg
+%%EXAMPLESDIR%%/config/gedcolor.rus
%%EXAMPLESDIR%%/config/gedlngdk.cfg
%%EXAMPLESDIR%%/config/gedlngit.cfg
%%EXAMPLESDIR%%/config/gedlngnl.cfg
%%EXAMPLESDIR%%/config/gedlngus.cfg
%%EXAMPLESDIR%%/config/goldhelp.cfg
+%%EXAMPLESDIR%%/config/goldhelp.rus
%%EXAMPLESDIR%%/config/goldkeys.cfg
+%%EXAMPLESDIR%%/config/goldkeys.rus
%%EXAMPLESDIR%%/config/goldlang.cfg
%%EXAMPLESDIR%%/config/goldlang.ger
%%EXAMPLESDIR%%/config/goldlang.it
%%EXAMPLESDIR%%/config/goldlang.nl
%%EXAMPLESDIR%%/config/goldlang.ru2
+%%EXAMPLESDIR%%/config/goldlang.ru3
%%EXAMPLESDIR%%/config/goldlang.rus
%%EXAMPLESDIR%%/config/goldlang.sv
%%EXAMPLESDIR%%/config/simple.cfg
@@ -109,8 +132,9 @@ bin/rddt
%%EXAMPLESDIR%%/template/golded.cfm
%%EXAMPLESDIR%%/template/golded.tpl
%%EXAMPLESDIR%%/template/newsgrps.tpl
-@dirrm %%EXAMPLESDIR%%/charset
+@dirrm %%EXAMPLESDIR%%/template
@dirrm %%EXAMPLESDIR%%/config
@dirrm %%EXAMPLESDIR%%/colorset
-@dirrm %%EXAMPLESDIR%%/template
+@dirrm %%EXAMPLESDIR%%/charset
@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
OpenPOWER on IntegriCloud