From 32ed1b6782b60f6a4d31b3d2a46debb8a723b131 Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Sat, 8 Jan 2005 15:08:19 +0000 Subject: - assign new MAINTAINER - update to ftrack-3.1 PR: 75926 Submitted by: forsite@spamtest.ru --- mail/ftrack/Makefile | 23 +++++--- mail/ftrack/distinfo | 4 +- mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile | 67 ++++++++++++++++++---- mail/ftrack/files/patch-hpp::constant.hpp | 29 ++++++---- mail/ftrack/files/patch-src::ftrack.cpp | 11 ++++ mail/ftrack/files/patch-src::outbound.cpp | 20 ------- mail/ftrack/files/patch-src::ustr.cpp | 11 ++++ mail/ftrack/pkg-plist | 2 +- 8 files changed, 115 insertions(+), 52 deletions(-) create mode 100644 mail/ftrack/files/patch-src::ftrack.cpp delete mode 100644 mail/ftrack/files/patch-src::outbound.cpp create mode 100644 mail/ftrack/files/patch-src::ustr.cpp (limited to 'mail/ftrack') diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile index bf8d5f05fb26..57b1acc0dc82 100644 --- a/mail/ftrack/Makefile +++ b/mail/ftrack/Makefile @@ -6,14 +6,13 @@ # PORTNAME= ftrack -PORTVERSION= 3.01 -PORTREVISION= 2 +PORTVERSION= 3.1 +PORTEPOCH= 1 CATEGORIES= mail -# mastersite disappeared in August 2003 -MASTER_SITES= # http://gonza.bizhost.ru/ports/ -DISTNAME= ftr${PORTVERSION:S/.//g}s +MASTER_SITES= http://ufm.kgb.ru/files/ +DISTNAME= ftr${PORTVERSION:S/.//g}sr -MAINTAINER= ports@FreeBSD.org +MAINTAINER= forsite@spamtest.ru COMMENT= FTN Messages tracker LIB_DEPENDS= smapi.2:${PORTSDIR}/news/husky-smapi @@ -25,25 +24,33 @@ ALL_TARGET= ftrack MAKEFILE= ${WRKSRC}/MakeFiles/FreeBSD/Makefile EXTRACT_AFTER_ARGS= -d ${WRKSRC} USE_GCC= 2.95 +USE_PERL5= yes PORTDOCS= ftrack.faq readme report.err pre-patch: ${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \ s@../../src/@src/@g; s@g\+\+@${CC}@g; \ - s@-L../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile + s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile + ${REINPLACE_CMD} -e "s@PREFIXGOESHERE@${PREFIX}@g" ${FILESDIR}/patch-hpp::constant.hpp + ${RM} ${FILESDIR}/patch-hpp::constant.hpp.bak .for DIR in MakeFiles/FreeBSD src hpp doc/eng samples/tpl for FILE in ${WRKSRC}/${DIR}/*; do \ ${TR} -d '\015' < $${FILE} > $${FILE}.new; \ ${MV} $${FILE}.new $${FILE}; \ done .endfor +.for DIR in hpp src + for FILE in ${WRKSRC}/${DIR}/*; do \ + ${MV} $${FILE} `${ECHO} $${FILE} | ${TR} "[:upper:]" "[:lower:]"`; \ + done +.endfor pre-configure: ${CP} ${WRKSRC}/MakeFiles/FreeBSD/Makefile ${WRKSRC} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ftrack ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/ftrack ${PREFIX}/bin ${MKDIR} ${PREFIX}/etc/ftrack ${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${PREFIX}/etc/ftrack/ftrack.cfg-dist ${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${PREFIX}/etc/ftrack diff --git a/mail/ftrack/distinfo b/mail/ftrack/distinfo index 085af8e92449..0e265afbd281 100644 --- a/mail/ftrack/distinfo +++ b/mail/ftrack/distinfo @@ -1,2 +1,2 @@ -MD5 (ftr301s.zip) = 377ffe4c0bc1c28de114055c61e9f982 -SIZE (ftr301s.zip) = 201709 +MD5 (ftr31sr.zip) = 938dc32be04fcdadc3db2964b9c231d8 +SIZE (ftr31sr.zip) = 282358 diff --git a/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile index 0ef65c17c391..0eb3c63258a1 100644 --- a/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile +++ b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile @@ -1,25 +1,70 @@ ---- MakeFiles/FreeBSD/Makefile.orig Tue Oct 28 04:05:28 2003 -+++ MakeFiles/FreeBSD/Makefile Tue Oct 28 04:05:55 2003 +--- MakeFiles/FreeBSD/Makefile.orig Thu Jan 6 13:36:31 2005 ++++ MakeFiles/FreeBSD/Makefile Thu Jan 6 13:38:14 2005 @@ -1,5 +1,4 @@ --CC= cc --CFLAGS= -Wall -W -fno-rtti -+CFLAGS+=-Wall -W -fno-rtti +-CC= gcc295 +-CFLAGS= -Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts` ++CFLAGS+=-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts` CDEFS= -DUNIX - COPT= -Ihpp -I/usr/local/include -O -pipe -mcpu=pentiumpro + COPT= -Ihpp -I/usr/local/include -O -pipe LFLAGS= -s -@@ -39,13 +38,13 @@ +@@ -34,23 +33,53 @@ + utils.o \ + mask.o \ + script.o \ +- wildmat.o ++ wildmat.o \ ++ ustr.o \ ++ ficl.o \ ++ words.o \ ++ dict.o \ ++ sysdep.o \ ++ math64.o \ ++ vm.o \ ++ stack.o \ ++ softcore.o + +-%.o: %.c ++ficl.o: $(SRCDIR)ficl.c + $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< + +-%.o: $(SRCDIR)%.cpp ++words.o: $(SRCDIR)words.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++dict.o: $(SRCDIR)dict.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++sysdep.o: $(SRCDIR)sysdep.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++math64.o: $(SRCDIR)math64.c $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< - %.o: $(SRCDIR)%.cpp -- $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< +-$(SRCDIR)cfg.cpp: $(SRCDIR)cfg.y +- bison -l -d $< -o $(SRCDIR)cfg.tab +- mv $(SRCDIR)cfg.tab $(SRCDIR)cfg.cpp ++vm.o: $(SRCDIR)vm.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++stack.o: $(SRCDIR)stack.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++softcore.o: $(SRCDIR)softcore.c ++ $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++%.o: $(SRCDIR)%.cpp + $(CXX) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ ++#$(SRCDIR)cfg.cpp: $(SRCDIR)cfg.y ++# bison -l -d $< -o $(SRCDIR)cfg.tab ++# mv $(SRCDIR)cfg.tab $(SRCDIR)cfg.cpp # Thunderbirds are go! ftrack: $(OBJS) -- $(CC) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi -+ $(CXX) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi +- $(CC) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts` ++ $(CXX) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts` clean: -rm -f *.o diff --git a/mail/ftrack/files/patch-hpp::constant.hpp b/mail/ftrack/files/patch-hpp::constant.hpp index a81a04cc7a6f..fdd39439e652 100644 --- a/mail/ftrack/files/patch-hpp::constant.hpp +++ b/mail/ftrack/files/patch-hpp::constant.hpp @@ -1,11 +1,20 @@ ---- hpp/constant.hpp.orig Wed Sep 20 14:46:48 2000 -+++ hpp/constant.hpp Wed Sep 20 14:47:01 2000 -@@ -30,7 +30,7 @@ - #define PATHDELIMS "/" - #define PATHDELIMC '/' - #endif --#define FVersion "3.01"OsType -+#define FVersion "3.01" - #define RevisionHI 3 - #define RevisionLO 1 +--- hpp/constant.hpp.orig Fri Jan 7 21:15:51 2005 ++++ hpp/constant.hpp Fri Jan 7 21:17:02 2005 +@@ -21,7 +21,7 @@ + # ifdef __LINUX__ + # define OsType "/LNX" + # elif defined(__FreeBSD__) +-# define OsType "/FBSD" ++# define OsType "/BSD" + # elif defined(sun) + # define OsType "/SUN" + # elif defined(_AIX) +@@ -38,7 +38,7 @@ #define FTrackProductLo 0xff + #define FTrackProductHi 0x0c + #define Copyright "(C) 1998-2002 Fyodor Ustinov (2:5020/79)" +-#define DefaultConfig "ftrack.cfg" ++#define DefaultConfig "/usr/local/etc/ftrack/ftrack.cfg" + + #ifdef UNIX + #define MsgExtension ".msg" diff --git a/mail/ftrack/files/patch-src::ftrack.cpp b/mail/ftrack/files/patch-src::ftrack.cpp new file mode 100644 index 000000000000..1a476d9ed684 --- /dev/null +++ b/mail/ftrack/files/patch-src::ftrack.cpp @@ -0,0 +1,11 @@ +--- src/ftrack.cpp.orig Fri Apr 26 20:59:40 2002 ++++ src/ftrack.cpp Wed Jan 5 21:39:27 2005 +@@ -53,7 +53,7 @@ + // Signals catch functions + // -------------------------------------------------------------------- + void AbrtHndl(int Sign) { +-fstream fh ("FTrack.err", ios::append); ++fstream fh ("FTrack.err", ios::app); + + cerr << "Internal Error!!! Please, read report.err in documentation.\n"; + cerr << "---------------------------------------\n"; diff --git a/mail/ftrack/files/patch-src::outbound.cpp b/mail/ftrack/files/patch-src::outbound.cpp deleted file mode 100644 index 4f892c570a9e..000000000000 --- a/mail/ftrack/files/patch-src::outbound.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/outbound.cpp.orig Sun May 21 18:09:12 2000 -+++ src/outbound.cpp Tue May 23 12:43:00 2000 -@@ -373,7 +373,7 @@ - fclose (fh); - unlink(TmtName); - -- bfh = open(BsyName,O_CREAT | O_EXCL,0666); -+ bfh = open(BsyName,O_CREAT | O_EXCL,0640); - if (bfh == -1) { - return FALSE; - } -@@ -858,7 +858,7 @@ - } - fclose (fh); - unlink(TmtName); -- bfh = open(Buff,O_CREAT | O_EXCL,0666); -+ bfh = open(Buff,O_CREAT | O_EXCL,0640); - if (bfh == -1) { - Log.Level(LOGW) << "Packet " << Name << " is locked." << EOL; - return TRUE; diff --git a/mail/ftrack/files/patch-src::ustr.cpp b/mail/ftrack/files/patch-src::ustr.cpp new file mode 100644 index 000000000000..09741fdcd6f8 --- /dev/null +++ b/mail/ftrack/files/patch-src::ustr.cpp @@ -0,0 +1,11 @@ +--- src/ustr.cpp.orig Thu Jan 6 13:21:40 2005 ++++ src/ustr.cpp Thu Jan 6 13:20:44 2005 +@@ -297,7 +297,7 @@ + } + + Str &Str::Upper(void) { +- for (int i = 0; i < Len; i++) { ++ for (unsigned int i = 0; i < Len; i++) { + Ptr[i] = toupper(Ptr[i]); + } + return *this; diff --git a/mail/ftrack/pkg-plist b/mail/ftrack/pkg-plist index f81dda7d5ab2..08774c941d02 100644 --- a/mail/ftrack/pkg-plist +++ b/mail/ftrack/pkg-plist @@ -5,5 +5,5 @@ etc/ftrack/badto.tpl etc/ftrack/loop.tpl etc/ftrack/alt2koi.tbl etc/ftrack/koi2alt.tbl -sbin/ftrack +bin/ftrack @dirrm etc/ftrack -- cgit v1.2.3