Index: head/mail/ftrack/Makefile =================================================================== --- head/mail/ftrack/Makefile (revision 140928) +++ head/mail/ftrack/Makefile (revision 140929) @@ -1,72 +1,65 @@ # New ports collection makefile for: ftrack # Date created: Thu Dec 21 14:20:49 MSK 2000 # Whom: Sergey Samoyloff # # $FreeBSD$ # PORTNAME= ftrack PORTVERSION= 3.1 PORTEPOCH= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://ufm.kgb.ru/files/ \ http://forsite.ibch.ru/ports/ DISTNAME= ftr${PORTVERSION:S/.//g}sr MAINTAINER= forsite@spamtest.ru COMMENT= FTN Messages tracker LIB_DEPENDS= smapi.2:${PORTSDIR}/news/husky-smapi USE_ZIP= yes USE_REINPLACE= yes USE_GMAKE= yes 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 -.include - -.if ${OSVERSION} >= 504001 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - 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@../../src/@src/@g; \ s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile ${REINPLACE_CMD} -e "s@ftrack.cfg@${PREFIX}/etc/ftrack/ftrack.cfg@g" ${WRKSRC}/hpp/constant.hpp .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}/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 .for FILE in alt2koi.tbl koi2alt.tbl ${INSTALL_DATA} ${WRKSRC}/samples/${FILE} ${PREFIX}/etc/ftrack .endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/eng/* ${DOCSDIR} .endif -.include +.include Property changes on: head/mail/ftrack/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.18 \ No newline at end of property +1.19 \ No newline at end of property Index: head/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile =================================================================== --- head/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile (revision 140928) +++ head/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile (revision 140929) @@ -1,70 +1,70 @@ ---- MakeFiles/FreeBSD/Makefile.orig Thu Jan 6 13:36:31 2005 -+++ MakeFiles/FreeBSD/Makefile Thu Jan 6 13:38:14 2005 +--- MakeFiles/FreeBSD/Makefile.orig Fri Aug 19 17:20:22 2005 ++++ MakeFiles/FreeBSD/Makefile Fri Aug 19 17:20:23 2005 @@ -1,5 +1,4 @@ --CC= gcc295 +-CC= cc -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 LFLAGS= -s @@ -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 $< -$(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 `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 Property changes on: head/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/mail/ftrack/files/patch-hpp-a_list.hpp =================================================================== --- head/mail/ftrack/files/patch-hpp-a_list.hpp (revision 140928) +++ head/mail/ftrack/files/patch-hpp-a_list.hpp (revision 140929) @@ -1,31 +1,33 @@ ---- hpp/a_list.hpp.orig Tue Oct 28 04:01:58 2003 -+++ hpp/a_list.hpp Tue Oct 28 04:02:41 2003 +--- hpp/a_list.hpp.orig Fri Aug 19 17:20:23 2005 ++++ hpp/a_list.hpp Fri Aug 19 17:47:38 2005 @@ -173,8 +173,8 @@ protected: class Elem : public AbstractElem { - friend BiList; - friend ElemPtr; + friend class BiList; + friend class ElemPtr; public: T data; operator T&() { return data; } @@ -199,7 +199,7 @@ public: class ElemPtr { - friend BiList; + friend class BiList; Elem *p; ElemPtr(Elem *e) { p = e; } protected: -@@ -294,7 +294,7 @@ +@@ -294,8 +294,8 @@ public: class ElemPtr : public BiList::ElemPtr { public: - ElemPtr(BiList::ElemPtr &e) : BiList::ElemPtr(e){} +- T* operator->() { return operator T*(); } + ElemPtr(typename BiList::ElemPtr &e) : BiList::ElemPtr(e){} - T* operator->() { return operator T*(); } ++ T* operator->() { return BiList::ElemPtr::operator T*(); } }; ElemPtr AddToBegin( T &t ) { + return (ElemPtr)BiList::AddToBegin(t); Property changes on: head/mail/ftrack/files/patch-hpp-a_list.hpp ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/ftrack/files/patch-hpp-ustr.hpp =================================================================== --- head/mail/ftrack/files/patch-hpp-ustr.hpp (nonexistent) +++ head/mail/ftrack/files/patch-hpp-ustr.hpp (revision 140929) @@ -0,0 +1,20 @@ +--- hpp/ustr.hpp.orig Fri Aug 19 17:22:08 2005 ++++ hpp/ustr.hpp Fri Aug 19 17:22:52 2005 +@@ -24,7 +24,9 @@ + + #include + #include +-#include ++#include ++ ++using namespace std; + + class Str { + private: +@@ -81,4 +83,4 @@ + + + +-#endif +\ No newline at end of file ++#endif Property changes on: head/mail/ftrack/files/patch-hpp-ustr.hpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/mail/ftrack/files/patch-src-help.cpp =================================================================== --- head/mail/ftrack/files/patch-src-help.cpp (nonexistent) +++ head/mail/ftrack/files/patch-src-help.cpp (revision 140929) @@ -0,0 +1,13 @@ +--- src/help.cpp.orig Fri Aug 19 17:58:00 2005 ++++ src/help.cpp Fri Aug 19 17:59:15 2005 +@@ -1,7 +1,9 @@ + #include + #include "constant.hpp" + #include "help.hpp" +-#include ++#include ++ ++using namespace std; + + void Hello(void) { + cout << "\nFTrack " << FVersion << " " << Copyright << "\n"; Property changes on: head/mail/ftrack/files/patch-src-help.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/mail/ftrack/files/patch-src-parsetpl.cpp =================================================================== --- head/mail/ftrack/files/patch-src-parsetpl.cpp (nonexistent) +++ head/mail/ftrack/files/patch-src-parsetpl.cpp (revision 140929) @@ -0,0 +1,11 @@ +--- src/parsetpl.cpp.orig Fri Aug 19 17:49:03 2005 ++++ src/parsetpl.cpp Fri Aug 19 17:50:18 2005 +@@ -880,7 +880,7 @@ + + // First - replace all \r to \n + +- while ((tmt = strchr(Body,'\r')) != NULL) { ++ while ((tmt = strchr((char *) Body,'\r')) != NULL) { + *tmt = '\n'; + } + Property changes on: head/mail/ftrack/files/patch-src-parsetpl.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/mail/ftrack/files/patch-src-scd_do.cpp =================================================================== --- head/mail/ftrack/files/patch-src-scd_do.cpp (nonexistent) +++ head/mail/ftrack/files/patch-src-scd_do.cpp (revision 140929) @@ -0,0 +1,18 @@ +--- src/scd_do.cpp.orig Fri Aug 19 17:50:40 2005 ++++ src/scd_do.cpp Fri Aug 19 17:51:06 2005 +@@ -472,7 +472,7 @@ + return FALSE; + } + CHP = 16101; +- while ((tmt = strchr(_Tpl->Body,'\n')) != NULL) *tmt = '\r'; ++ while ((tmt = strchr((char *) _Tpl->Body,'\n')) != NULL) *tmt = '\r'; + tmt = m._Body; + CHP = 16102; + m._Body = (char *) malloc(((tmt != NULL) ? strlen(tmt) : 0) + strlen(_Tpl->Body) + 1); +@@ -787,4 +787,4 @@ + return TRUE; + } + +-#endif +\ No newline at end of file ++#endif Property changes on: head/mail/ftrack/files/patch-src-scd_do.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/mail/ftrack/files/patch-src::ftrack.cpp =================================================================== --- head/mail/ftrack/files/patch-src::ftrack.cpp (revision 140928) +++ head/mail/ftrack/files/patch-src::ftrack.cpp (revision 140929) @@ -1,11 +1,22 @@ ---- src/ftrack.cpp.orig Fri Apr 26 20:59:40 2002 -+++ src/ftrack.cpp Wed Jan 5 21:39:27 2005 +--- src/ftrack.cpp.orig Fri Aug 19 17:58:00 2005 ++++ src/ftrack.cpp Fri Aug 19 17:59:25 2005 +@@ -42,8 +42,8 @@ + #include "parsetpl.hpp" + #include "tmstamp.hpp" + #include "script.hpp" +-#include +-#include ++#include ++#include + #include + + static struct utimbuf ut; @@ -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"; Property changes on: head/mail/ftrack/files/patch-src::ftrack.cpp ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property