From vasallia@ukr.net  Wed Jul 14 01:36:20 2004
Return-Path: <vasallia@ukr.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5283616A52F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 14 Jul 2004 01:36:19 +0000 (GMT)
Received: from mail-kv.alkar.net (mail-kv.alkar.net [195.248.176.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C3AA43D58
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 14 Jul 2004 01:36:19 +0000 (GMT)
	(envelope-from vasallia@ukr.net)
Received: from [212.86.238.72] (helo=santinel.home.ua)
	by mail-kv.alkar.net with esmtp (Exim 4.34 (FreeBSD))
	id 1BkYgz-000OyF-Ha; Wed, 14 Jul 2004 04:36:18 +0300
Received: from anray by santinel.home.ua with local (Exim 4.34; FreeBSD)
	id 1BkYgu-0004MZ-6J; Wed, 14 Jul 2004 04:36:12 +0300
Message-Id: <E1BkYgu-0004MZ-6J@santinel.home.ua>
Date: Wed, 14 Jul 2004 04:36:12 +0300
From: Andrey Slusar <vasallia@ukr.net>
Reply-To: Andrey Slusar <vasallia@ukr.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mt@primats.org.ua
Subject: [PATCH] mail/mailsync: fix compiling with gcc3.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         69022
>Category:       ports
>Synopsis:       [PATCH] mail/mailsync: fix compiling with gcc3.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 14 01:40:18 GMT 2004
>Closed-Date:    Wed Jul 14 15:47:16 GMT 2004
>Last-Modified:  Wed Jul 14 15:47:16 GMT 2004
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sat Jul 12 11:05:40 EEST 2008 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
	Mainainer CC'ed.
	This port required gcc2.95 on build. I am fixed this and added
	supporting user defined ${CFLAGS}.
>How-To-Repeat:
	
>Fix:

--- mailsync.diff begins here ---
diff -ruN /usr/ports/mail/mailsync/Makefile mailsync/Makefile
--- /usr/ports/mail/mailsync/Makefile	Wed Feb  4 07:07:22 2004
+++ mailsync/Makefile	Wed Jul 14 04:08:55 2004
@@ -22,7 +22,6 @@
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GCC=	2.95
 
 ALL_TARGET=	default
 
diff -ruN /usr/ports/mail/mailsync/files/patch-Makefile mailsync/files/patch-Makefile
--- /usr/ports/mail/mailsync/files/patch-Makefile	Thu Feb 27 21:54:58 2003
+++ mailsync/files/patch-Makefile	Wed Jul 14 04:04:23 2004
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Oct 24 16:03:07 2002
-+++ Makefile	Wed Feb 26 23:39:48 2003
+--- Makefile.orig	Thu Oct 24 17:03:07 2002
++++ Makefile	Wed Jul 14 04:02:48 2004
 @@ -1,32 +1,32 @@
  # compiling with g++-3 worked for me with the commented ## lines - tpo
  
@@ -22,7 +22,8 @@
  ##CC = g++-3.0
  
  # flags for your compiler
- CFLAGS = -g  -O2 -Wall -I$(C)
+-CFLAGS = -g  -O2 -Wall -I$(C)
++CFLAGS += -Wall -fno-operator-names -I$(C)
  
  # required libraries
 -LDFLAGS = -lm -lssl -lgssapi_krb5
diff -ruN /usr/ports/mail/mailsync/files/patch-mailsync.c mailsync/files/patch-mailsync.c
--- /usr/ports/mail/mailsync/files/patch-mailsync.c	Thu Feb 27 21:54:58 2003
+++ mailsync/files/patch-mailsync.c	Wed Jul 14 03:52:41 2004
@@ -1,6 +1,14 @@
 --- mailsync.c.orig	Thu Nov  7 12:05:46 2002
-+++ mailsync.c	Mon Feb  3 22:59:09 2003
-@@ -30,8 +30,8 @@
++++ mailsync.c	Wed Jul 14 03:52:22 2004
+@@ -20,6 +20,7 @@
+ extern int errno;               // Just in case
+ #include <sys/stat.h>           // Stat()
+ 
++#include <cassert>
+ #include <string>
+ #include <set>
+ #include <map>
+@@ -30,8 +31,8 @@
  using std::vector;
  using std::make_pair;
  
--- mailsync.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jul 14 15:47:05 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=69022 
>Unformatted:
