Attachment 49742 Details for Bug 75926 – file.diff

[patch] file.diff

file.diff (text/plain), 8.36 KB, created by forsite on 2005-01-07 19:30:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: forsite

Created: 2005-01-07 19:30:27 UTC

Size: 8.36 KB

patch

obsolete

>diff -uNr ftrack.old/Makefile ftrack/Makefile
>--- ftrack.old/Makefile	Mon Sep 27 22:17:09 2004
>+++ ftrack/Makefile	Fri Jan  7 22:16:39 2005
>@@ -1,19 +1,18 @@
> # New ports collection makefile for:    ftrack
>-# Date created:         Thu Dec 21 14:20:49 MSK 2000
>-# Whom:                 Sergey Samoyloff <gonza@techline.ru>
>+# Date created:         Thu Jan 03 21:20:49 MSK 2005
>+# Whom:                 Forsite//HPG <forsite@spamtest.ru>
> #
> # $FreeBSD: ports/mail/ftrack/Makefile,v 1.14 2004/09/27 18:17:09 leeym Exp $
> #
> 
> 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
>@@ -31,19 +30,26 @@
> 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 -uNr ftrack.old/distinfo ftrack/distinfo
>--- ftrack.old/distinfo	Thu Jan 29 10:24:50 2004
>+++ ftrack/distinfo	Tue Jan  4 06:01:08 2005
>@@ -1,2 +1,2 @@
>-MD5 (ftr301s.zip) = 377ffe4c0bc1c28de114055c61e9f982
>-SIZE (ftr301s.zip) = 201709
>+MD5 (ftr31sr.zip) = 938dc32be04fcdadc3db2964b9c231d8
>+SIZE (ftr31sr.zip) = 282358
>diff -uNr ftrack.old/files/patch-MakeFiles-FreeBSD-Makefile ftrack/files/patch-MakeFiles-FreeBSD-Makefile
>--- ftrack.old/files/patch-MakeFiles-FreeBSD-Makefile	Wed Oct 29 11:59:23 2003
>+++ ftrack/files/patch-MakeFiles-FreeBSD-Makefile	Thu Jan  6 13:59:10 2005
>@@ -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 -uNr ftrack.old/files/patch-hpp::constant.hpp ftrack/files/patch-hpp::constant.hpp
>--- ftrack.old/files/patch-hpp::constant.hpp	Sat Mar 10 21:56:51 2001
>+++ ftrack/files/patch-hpp::constant.hpp	Fri Jan  7 22:17:16 2005
>@@ -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 -uNr ftrack.old/files/patch-src::ftrack.cpp ftrack/files/patch-src::ftrack.cpp
>--- ftrack.old/files/patch-src::ftrack.cpp	Thu Jan  1 03:00:00 1970
>+++ ftrack/files/patch-src::ftrack.cpp	Wed Jan  5 21:49:06 2005
>@@ -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 -uNr ftrack.old/files/patch-src::outbound.cpp ftrack/files/patch-src::outbound.cpp
>--- ftrack.old/files/patch-src::outbound.cpp	Sat Mar 10 21:56:51 2001
>+++ ftrack/files/patch-src::outbound.cpp	Thu Jan  1 03:00:00 1970
>@@ -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 -uNr ftrack.old/files/patch-src::ustr.cpp ftrack/files/patch-src::ustr.cpp
>--- ftrack.old/files/patch-src::ustr.cpp	Thu Jan  1 03:00:00 1970
>+++ ftrack/files/patch-src::ustr.cpp	Thu Jan  6 13:22:34 2005
>@@ -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 -uNr ftrack.old/pkg-plist ftrack/pkg-plist
>--- ftrack.old/pkg-plist	Mon Sep 27 22:17:09 2004
>+++ ftrack/pkg-plist	Fri Jan  7 16:28:50 2005
>@@ -5,5 +5,5 @@
> etc/ftrack/loop.tpl
> etc/ftrack/alt2koi.tbl
> etc/ftrack/koi2alt.tbl
>-sbin/ftrack
>+bin/ftrack
> @dirrm etc/ftrack

Actions: View | Diff

Attachments on bug 75926: 49742