1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

Update to 6.2RC1. This also fixes unfetchable distfile.

patch-fido.c and patch-msg.c are required for compatibility with
pre 1.4 husky. They will be removed once husky ports are updated to 1.4.
This commit is contained in:
Max Khon 2006-11-12 12:58:42 +00:00
parent 664c2d855d
commit 977db1e146
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177094
8 changed files with 205 additions and 188 deletions

View File

@ -6,19 +6,16 @@
#
PORTNAME= msged
PORTVERSION= 6.0.1
PORTREVISION= 2
PORTVERSION= 6.2RC1
CATEGORIES= news mail
MASTER_SITES= http://www.physcip.uni-stuttgart.de:8080/fidosoft.husky/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
DISTNAME= ${PORTNAME}-${PORTVERSION}-stable-src
EXTRACT_SUFX= .tgz
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Msged/TE (full-featured FTN mail reader)
LIB_DEPENDS= fidoconfig.0:${PORTSDIR}/news/husky-fidoconf
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_ARGS= MSGEDCFG="\\\"~/.msged\\\""
INFO= msged

View File

@ -1,3 +1,3 @@
MD5 (husky/msged-6.0.1-src.tar.gz) = 732e9dfbf2d41a839dcabc99e0c7d85a
SHA256 (husky/msged-6.0.1-src.tar.gz) = 6e0a395947656b05de691714920cec25575eba27713ffc6ac672ffdce6919b61
SIZE (husky/msged-6.0.1-src.tar.gz) = 480040
MD5 (husky/msged-6.2RC1-stable-src.tgz) = 6a3d0201bdf0ddd00aa07d42bc172a3c
SHA256 (husky/msged-6.2RC1-stable-src.tgz) = d599d3b4371b4344c6cfff110dd8e97f91d31aa44c755159d3d0a0d5cf3688a3
SIZE (husky/msged-6.2RC1-stable-src.tgz) = 489378

View File

@ -1,20 +1,34 @@
--- ./Makefile.orig Mon Nov 26 19:13:21 2001
+++ ./Makefile Sun Sep 28 20:51:18 2003
@@ -19,7 +19,7 @@
--- Makefile.orig Sat Feb 18 00:57:56 2006
+++ Makefile Sun Nov 12 18:51:39 2006
@@ -8,10 +8,10 @@
endif
ifeq ($(DEBUG), 1)
- CFLAGS=$(WARNFLAGS) $(DEBCFLAGS) -I$(INCDIR)
+ CFLAGS=$(WARNFLAGS) $(DEBCFLAGS) -I$(INCDIR) -I$(LOCALBASE)/include
LFLAGS=$(DEBLFLAGS)
else
- CFLAGS=$(WARNFLAGS) $(OPTCFLAGS) -I$(INCDIR)
+ CFLAGS=$(WARNFLAGS) $(OPTCFLAGS) -I$(INCDIR) -I$(LOCALBASE)/include
LFLAGS=$(OPTLFLAGS)
endif
@@ -19,15 +19,15 @@
MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
endif
-CDEFS=-D$(OSTYPE) -DUSE_MSGAPI -DUNAME=\"$(UNAME)\" \
-CDEFS=-D$(OSTYPE) -DUSE_MSGAPI -DUSE_FIDOCONFIG -DUNAME=\"$(UNAME)\" \
+CDEFS=-D$(OSTYPE) -DUSE_MSGAPI -DUSE_CURSES -DUSE_FIDOCONFIG -DUNAME=\"$(UNAME)\" \
$(ADDCDEFS) -DREADMAPSDAT=\"$(CFGDIR)/readmaps.dat\" \
-DWRITMAPSDAT=\"$(CFGDIR)/writmaps.dat\" \
-DDEFAULT_CONFIG_FILE=$(MSGEDCFG)
@@ -27,7 +27,7 @@
ifeq ($(SHORTNAME), 1)
LIBS= -L$(LIBDIR) -lsmapi
- LIBS= -L$(LIBDIR) -lfidoconf -lsmapi
+ LIBS= -L$(LIBDIR) -L$(LOCALBASE)/lib -lfidoconf -lsmapi
else
- LIBS= -L$(LIBDIR) -lsmapi
+ LIBS= -L$(LIBDIR) -lsmapi -lfidoconfig
- LIBS= -L$(LIBDIR) -lfidoconfig -lsmapi
+ LIBS= -L$(LIBDIR) -L$(LOCALBASE)/lib -lfidoconfig -lsmapi
endif
TARGET= msged$(EXE)

View File

@ -1,139 +0,0 @@
--- curses.c.orig Wed Jan 29 00:48:13 2003
+++ curses.c Wed Jan 29 01:37:29 2003
@@ -22,6 +22,7 @@
#include "winsys.h"
#include "unused.h"
#include "keys.h"
+#include "readtc.h"
#include "specch.h"
int color;
@@ -40,6 +41,7 @@
0
};
+static int tcflags = 0; /* what we want to extract from termcap */
#define EBUFSZ 100
static EVT EVent[EBUFSZ]; /* event circular queue */
@@ -436,6 +438,8 @@
Key_A_5, Key_A_6, Key_A_7, Key_A_8, Key_A_9
};
+void TTSendMsg(int msg, int x, int y, int msgtype);
+
unsigned int TTGetKey(void)
{
int ch;
@@ -443,6 +447,11 @@
ch = getch();
switch (ch)
{
+ case KEY_RESIZE:
+ term.NRow = getmaxy(stdscr);
+ term.NCol = getmaxx(stdscr);
+ TTSendMsg(1, 0, 0, WND_WM_RESIZE);
+ return -1;
case KEY_LEFT:
return Key_Lft;
case KEY_RIGHT:
@@ -566,6 +575,7 @@
case '0':
return Key_F10;
}
+ break;
}
if (ch >= 127) /* Treat special characters */
@@ -611,7 +621,7 @@
return ch;
}
-void TTSendMsg(unsigned int msg, int x, int y, unsigned int msgtype)
+void TTSendMsg(int msg, int x, int y, int msgtype)
{
if (((ebufin + 1) % EBUFSZ) != ebufout)
{
@@ -633,6 +643,7 @@
meta(stdscr, TRUE);
intrflush(stdscr, FALSE);
raw();
+ query_termcap(tcflags);
return 0;
}
@@ -660,30 +671,47 @@
return 0;
}
+static void
+collect_events(void)
+{
+ int ch = TTGetKey();
+ if (ch < 0)
+ return;
+
+ TTSendMsg(ch, 0, 0, WND_WM_CHAR);
+}
+
int TTGetMsg(EVT * e)
{
- e->msg = TTGetKey();
- e->x = 0;
- e->y = 0;
- e->msgtype = WND_WM_CHAR;
+ while (ebufin == ebufout)
+ collect_events();
+
+ e->msg = EVent[ebufout].msg;
+ e->x = EVent[ebufout].x;
+ e->y = EVent[ebufout].y;
+ e->msgtype = EVent[ebufout].msgtype;
e->id = 0;
+ ebufout = (ebufout + 1) % EBUFSZ;
return e->msg;
}
int TTPeekQue(void)
{
- return kbhit();
+ if (kbhit())
+ collect_events();
+ return ebufin != ebufout;
}
void TTClearQue(void)
{
- while (TTPeekQue())
- TTGetKey();
+ ebufin = ebufout;
}
int TTGetChr(void)
{
- return TTGetKey();
+ EVT e;
+ TTGetMsg(&e);
+ return e.msg;
}
static char ansi2curses[8] = {
@@ -754,6 +782,18 @@
allowed_special_characters =
(unsigned char *) malloc(l = (strlen(value) + 1));
memcpy(allowed_special_characters, value, l);
+ }
+ else if (!strcmp(keyword,"pseudographics"))
+ {
+ if (atoi(value))
+ {
+ tcflags |= QUERY_ALTCHARSET;
+ }
+ else
+ {
+ tcflags &= ~QUERY_ALTCHARSET;
+ }
+ query_termcap(tcflags);
}
else
{

View File

@ -1,28 +0,0 @@
--- doc/manual/makefile.husky.orig Wed Apr 11 04:50:01 2001
+++ doc/manual/makefile.husky Thu Jan 9 04:09:02 2003
@@ -7,8 +7,8 @@
ifdef HTMLDIR
ifdef INFODIR
-all: html info
-install: install-html install-info
+all: info
+install: install-info
else
all: html
install: install-html
@@ -90,12 +90,12 @@
install-info: info
-$(MKDIR) $(MKDIROPT) $(INFODIR)
- $(INSTALL) msged.info $(INFODIR)
+ $(INSTALL) $(IMOPT) msged.info $(INFODIR)
-install-info --info-dir=$(INFODIR) $(INFODIR)$(DIRSEP)msged.info
install-html: html
-$(MKDIR) $(MKDIROPT) $(HTMLDIR)
- $(INSTALL) msged_*.html $(HTMLDIR)
+ $(INSTALL) $(IMOPT) msged_*.html $(HTMLDIR)
uninstall:
-install-info --remove --info-dir=$(INFODIR) $(INFODIR)$(DIRSEP)msged.info

View File

@ -0,0 +1,19 @@
--- fido.c.orig Sun Nov 12 18:26:36 2006
+++ fido.c Sun Nov 12 18:28:10 2006
@@ -110,6 +110,16 @@
#define OPENC O_WRONLY | O_BINARY | O_CREAT /* open/create */
#define OPENRW O_RDWR | O_BINARY /* open read/write */
+/*
+ * get_word
+ *
+ * Reads in a 2 byte word that is stored in little endian (Intel) notation
+ * and converts it to the local representation in an architecture-
+ * independent manner
+ */
+#define get_word(ptr) \
+ ((word)(ptr)[0] | \
+ (((word)(ptr)[1]) << 8 ))
/* prototypes */

View File

@ -0,0 +1,11 @@
--- msg.c.orig Sun Nov 12 18:23:41 2006
+++ msg.c Sun Nov 12 18:23:46 2006
@@ -58,7 +58,7 @@
static struct _minf minf;
-static MSGA *Ahandle = NULL; /* area handle */
+static MSG *Ahandle = NULL; /* area handle */
static MSGH *mh = NULL; /* message handle */
static XMSG xmsg; /* squish message header */

View File

@ -1,21 +1,164 @@
bin/msged
bin/testcons
etc/fido/msghelp.dat
etc/fido/readmaps.dat
etc/fido/writmaps.dat
etc/fido/readmaps.437
etc/fido/readmaps.850
etc/fido/readmaps.865
etc/fido/readmaps.866
etc/fido/readmaps.koi
etc/fido/readmaps.dat
etc/fido/readmaps.is1
etc/fido/readmaps.is5
etc/fido/readmaps.koi
etc/fido/readmaps.ukr
etc/fido/writmaps.437
etc/fido/writmaps.850
etc/fido/writmaps.865
etc/fido/writmaps.866
etc/fido/writmaps.koi
etc/fido/writmaps.dat
etc/fido/writmaps.is1
etc/fido/writmaps.is5
etc/fido/writmaps.koi
etc/fido/writmaps.ukr
share/doc/husky/msged_1.html
share/doc/husky/msged_10.html
share/doc/husky/msged_100.html
share/doc/husky/msged_101.html
share/doc/husky/msged_102.html
share/doc/husky/msged_103.html
share/doc/husky/msged_104.html
share/doc/husky/msged_105.html
share/doc/husky/msged_106.html
share/doc/husky/msged_107.html
share/doc/husky/msged_108.html
share/doc/husky/msged_109.html
share/doc/husky/msged_11.html
share/doc/husky/msged_110.html
share/doc/husky/msged_111.html
share/doc/husky/msged_112.html
share/doc/husky/msged_113.html
share/doc/husky/msged_114.html
share/doc/husky/msged_115.html
share/doc/husky/msged_116.html
share/doc/husky/msged_117.html
share/doc/husky/msged_118.html
share/doc/husky/msged_119.html
share/doc/husky/msged_12.html
share/doc/husky/msged_120.html
share/doc/husky/msged_121.html
share/doc/husky/msged_122.html
share/doc/husky/msged_123.html
share/doc/husky/msged_124.html
share/doc/husky/msged_125.html
share/doc/husky/msged_126.html
share/doc/husky/msged_127.html
share/doc/husky/msged_128.html
share/doc/husky/msged_129.html
share/doc/husky/msged_13.html
share/doc/husky/msged_130.html
share/doc/husky/msged_131.html
share/doc/husky/msged_132.html
share/doc/husky/msged_133.html
share/doc/husky/msged_134.html
share/doc/husky/msged_135.html
share/doc/husky/msged_136.html
share/doc/husky/msged_137.html
share/doc/husky/msged_138.html
share/doc/husky/msged_139.html
share/doc/husky/msged_14.html
share/doc/husky/msged_140.html
share/doc/husky/msged_141.html
share/doc/husky/msged_142.html
share/doc/husky/msged_15.html
share/doc/husky/msged_16.html
share/doc/husky/msged_17.html
share/doc/husky/msged_18.html
share/doc/husky/msged_19.html
share/doc/husky/msged_2.html
share/doc/husky/msged_20.html
share/doc/husky/msged_21.html
share/doc/husky/msged_22.html
share/doc/husky/msged_23.html
share/doc/husky/msged_24.html
share/doc/husky/msged_25.html
share/doc/husky/msged_26.html
share/doc/husky/msged_27.html
share/doc/husky/msged_28.html
share/doc/husky/msged_29.html
share/doc/husky/msged_3.html
share/doc/husky/msged_30.html
share/doc/husky/msged_31.html
share/doc/husky/msged_32.html
share/doc/husky/msged_33.html
share/doc/husky/msged_34.html
share/doc/husky/msged_35.html
share/doc/husky/msged_36.html
share/doc/husky/msged_37.html
share/doc/husky/msged_38.html
share/doc/husky/msged_39.html
share/doc/husky/msged_4.html
share/doc/husky/msged_40.html
share/doc/husky/msged_41.html
share/doc/husky/msged_42.html
share/doc/husky/msged_43.html
share/doc/husky/msged_44.html
share/doc/husky/msged_45.html
share/doc/husky/msged_46.html
share/doc/husky/msged_47.html
share/doc/husky/msged_48.html
share/doc/husky/msged_49.html
share/doc/husky/msged_5.html
share/doc/husky/msged_50.html
share/doc/husky/msged_51.html
share/doc/husky/msged_52.html
share/doc/husky/msged_53.html
share/doc/husky/msged_54.html
share/doc/husky/msged_55.html
share/doc/husky/msged_56.html
share/doc/husky/msged_57.html
share/doc/husky/msged_58.html
share/doc/husky/msged_59.html
share/doc/husky/msged_6.html
share/doc/husky/msged_60.html
share/doc/husky/msged_61.html
share/doc/husky/msged_62.html
share/doc/husky/msged_63.html
share/doc/husky/msged_64.html
share/doc/husky/msged_65.html
share/doc/husky/msged_66.html
share/doc/husky/msged_67.html
share/doc/husky/msged_68.html
share/doc/husky/msged_69.html
share/doc/husky/msged_7.html
share/doc/husky/msged_70.html
share/doc/husky/msged_71.html
share/doc/husky/msged_72.html
share/doc/husky/msged_73.html
share/doc/husky/msged_74.html
share/doc/husky/msged_75.html
share/doc/husky/msged_76.html
share/doc/husky/msged_77.html
share/doc/husky/msged_78.html
share/doc/husky/msged_79.html
share/doc/husky/msged_8.html
share/doc/husky/msged_80.html
share/doc/husky/msged_81.html
share/doc/husky/msged_82.html
share/doc/husky/msged_83.html
share/doc/husky/msged_84.html
share/doc/husky/msged_85.html
share/doc/husky/msged_86.html
share/doc/husky/msged_87.html
share/doc/husky/msged_88.html
share/doc/husky/msged_89.html
share/doc/husky/msged_9.html
share/doc/husky/msged_90.html
share/doc/husky/msged_91.html
share/doc/husky/msged_92.html
share/doc/husky/msged_93.html
share/doc/husky/msged_94.html
share/doc/husky/msged_95.html
share/doc/husky/msged_96.html
share/doc/husky/msged_97.html
share/doc/husky/msged_98.html
share/doc/husky/msged_99.html
share/doc/husky/msged_toc.html