diff options
Diffstat (limited to 'mail/ftrack')
| -rw-r--r-- | mail/ftrack/Makefile | 11 | ||||
| -rw-r--r-- | mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile | 25 | ||||
| -rw-r--r-- | mail/ftrack/files/patch-hpp-a_list.hpp | 31 |
3 files changed, 59 insertions, 8 deletions
diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile index f8ef2d87b0fd..a194b5059d36 100644 --- a/mail/ftrack/Makefile +++ b/mail/ftrack/Makefile @@ -7,6 +7,7 @@ PORTNAME= ftrack PORTVERSION= 3.01 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://gonza.bizhost.ru/ports/ DISTNAME= ftr${PORTVERSION:S/.//g}s @@ -14,7 +15,7 @@ DISTNAME= ftr${PORTVERSION:S/.//g}s MAINTAINER= gonza@techline.ru COMMENT= FTN Messages tracker -BUILD_DEPENDS= ${LOCALBASE}/lib/libsmapi.a:${PORTSDIR}/mail/smapi +LIB_DEPENDS= smapi.2:${PORTSDIR}/news/husky-smapi USE_ZIP= yes USE_REINPLACE= yes @@ -23,12 +24,6 @@ ALL_TARGET= ftrack MAKEFILE= ${WRKSRC}/MakeFiles/FreeBSD/Makefile EXTRACT_AFTER_ARGS= -d ${WRKSRC} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.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; \ @@ -54,4 +49,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/samples/${FILE} ${PREFIX}/etc/ftrack .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile new file mode 100644 index 000000000000..0ef65c17c391 --- /dev/null +++ b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile @@ -0,0 +1,25 @@ +--- MakeFiles/FreeBSD/Makefile.orig Tue Oct 28 04:05:28 2003 ++++ MakeFiles/FreeBSD/Makefile Tue Oct 28 04:05:55 2003 +@@ -1,5 +1,4 @@ +-CC= cc +-CFLAGS= -Wall -W -fno-rtti ++CFLAGS+=-Wall -W -fno-rtti + CDEFS= -DUNIX + COPT= -Ihpp -I/usr/local/include -O -pipe -mcpu=pentiumpro + LFLAGS= -s +@@ -39,13 +38,13 @@ + $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< + + %.o: $(SRCDIR)%.cpp +- $(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $< ++ $(CXX) $(CFLAGS) $(CDEFS) $(COPT) -c $< + + # 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 + + clean: + -rm -f *.o diff --git a/mail/ftrack/files/patch-hpp-a_list.hpp b/mail/ftrack/files/patch-hpp-a_list.hpp new file mode 100644 index 000000000000..528200a73946 --- /dev/null +++ b/mail/ftrack/files/patch-hpp-a_list.hpp @@ -0,0 +1,31 @@ +--- hpp/a_list.hpp.orig Tue Oct 28 04:01:58 2003 ++++ hpp/a_list.hpp Tue Oct 28 04:02:41 2003 +@@ -173,8 +173,8 @@ + protected: + + class Elem : public AbstractElem { +- friend BiList<T>; +- friend ElemPtr; ++ friend class BiList<T>; ++ friend class ElemPtr; + public: + T data; + operator T&() { return data; } +@@ -199,7 +199,7 @@ + public: + + class ElemPtr { +- friend BiList<T>; ++ friend class BiList<T>; + Elem *p; + ElemPtr(Elem *e) { p = e; } + protected: +@@ -294,7 +294,7 @@ + public: + class ElemPtr : public BiList<T>::ElemPtr { + public: +- ElemPtr(BiList<T>::ElemPtr &e) : BiList<T>::ElemPtr(e){} ++ ElemPtr(typename BiList<T>::ElemPtr &e) : BiList<T>::ElemPtr(e){} + T* operator->() { return operator T*(); } + }; + ElemPtr AddToBegin( T &t ) { |