mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Unbreak on RELENG_5/6

Browse Source 
- Remove dependency on gcc 2.95 assuming that support for gcc 2.7.2
is dropped long time ago
- Bump PORTREVISION

Approved by:	portmgr, MAINTAINER
This commit is contained in:
Max Khon 2005-08-19 13:01:21 +00:00
parent e7b6980a72
commit 4095d64e48
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=140929
8 changed files with 87 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/ftrack/Makefile
View File

@ -8,7 +8,7 @@
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/
@ -25,20 +25,13 @@ 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 <bsd.port.pre.mk>
.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
@ -69,4 +62,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/eng/* ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

6
mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile
View File

@ -1,7 +1,7 @@
--- 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

10
mail/ftrack/files/patch-hpp-a_list.hpp
View File

@ -1,5 +1,5 @@
--- 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:
@ -20,12 +20,14 @@
Elem *p;
ElemPtr(Elem *e) { p = e; }
protected:
@@ -294,7 +294,7 @@
@@ -294,8 +294,8 @@
public:
class ElemPtr : public BiList<T>::ElemPtr {
public:
- ElemPtr(BiList<T>::ElemPtr &e) : BiList<T>::ElemPtr(e){}
- T* operator->() { return operator T*(); }
+ ElemPtr(typename BiList<T>::ElemPtr &e) : BiList<T>::ElemPtr(e){}
T* operator->() { return operator T*(); }
+ T* operator->() { return BiList<T>::ElemPtr::operator T*(); }
};
ElemPtr AddToBegin( T &t ) {
return (ElemPtr)BiList<T>::AddToBegin(t);

20
mail/ftrack/files/patch-hpp-ustr.hpp Normal file
View File

@ -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 <stddef.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
class Str {
private:
@@ -81,4 +83,4 @@
-#endif
\ No newline at end of file
+#endif

13
mail/ftrack/files/patch-src-help.cpp Normal file
View File

@ -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 <stdio.h>
#include "constant.hpp"
#include "help.hpp"
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
void Hello(void) {
cout << "\nFTrack " << FVersion << " " << Copyright << "\n";

11
mail/ftrack/files/patch-src-parsetpl.cpp Normal file
View File

@ -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';
}

18
mail/ftrack/files/patch-src-scd_do.cpp Normal file
View File

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

15
mail/ftrack/files/patch-src::ftrack.cpp
View File

@ -1,5 +1,16 @@
--- 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 <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <smapi/msgapi.h>
static struct utimbuf ut;
@@ -53,7 +53,7 @@
// Signals catch functions
// --------------------------------------------------------------------