From owner-svn-ports-all@FreeBSD.ORG  Sun Jul 28 04:20:33 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8BDB1885;
 Sun, 28 Jul 2013 04:20:33 +0000 (UTC)
 (envelope-from vanilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A2682056;
 Sun, 28 Jul 2013 04:20:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6S4KWxv063858;
 Sun, 28 Jul 2013 04:20:32 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6S4KWdQ063852;
 Sun, 28 Jul 2013 04:20:32 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201307280420.r6S4KWdQ063852@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Sun, 28 Jul 2013 04:20:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323810 - in head/lang/ofc: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jul 2013 04:20:33 -0000

Author: vanilla
Date: Sun Jul 28 04:20:32 2013
New Revision: 323810
URL: http://svnweb.freebsd.org/changeset/ports/323810

Log:
  1: Fix build with newer zlib [1]
  2: switch to gcc46.
  
  PR:		ports/180748
  Submitted by:	John Marino <freebsd at marino.st> [1]

Added:
  head/lang/ofc/files/patch-ofc_DGZipFile.h   (contents, props changed)
  head/lang/ofc/files/patch-ofc_DGZipFile.m   (contents, props changed)
Modified:
  head/lang/ofc/Makefile

Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile	Sat Jul 27 22:50:01 2013	(r323809)
+++ head/lang/ofc/Makefile	Sun Jul 28 04:20:32 2013	(r323810)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/
 PROJECTHOST=	${PORTNAME}
 USE_SDL=	sdl
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=		pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
@@ -38,7 +38,7 @@ LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 
 .if ${OSVERSION} >= 900000
 # needs libobjc
-GCCSUFFIX=42
+GCCSUFFIX=	46
 CC=		gcc${GCCSUFFIX}
 CXX=		g++${GCCSUFFIX}
 OFC_GCC_PORT?=	lang/gcc${GCCSUFFIX}

Added: head/lang/ofc/files/patch-ofc_DGZipFile.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ofc/files/patch-ofc_DGZipFile.h	Sun Jul 28 04:20:32 2013	(r323810)
@@ -0,0 +1,19 @@
+--- ofc/DGZipFile.h.orig	2008-08-02 15:15:11.000000000 +0000
++++ ofc/DGZipFile.h
+@@ -46,6 +46,7 @@
+ #endif
+ 
+ #ifdef HAVE_DGZIPFILE
++#include <zlib.h>
+ 
+ // the seek origins
+ #define DGZ_SEEK_SET  (0)    // Seek from the start of the file
+@@ -114,7 +115,7 @@
+ @interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
+ {
+ @private
+-  void           *_file;    // the file pointer
++  gzFile          _file;    // the file pointer
+ }
+ 
+ #endif

Added: head/lang/ofc/files/patch-ofc_DGZipFile.m
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ofc/files/patch-ofc_DGZipFile.m	Sun Jul 28 04:20:32 2013	(r323810)
@@ -0,0 +1,22 @@
+--- ofc/DGZipFile.m.orig	2008-08-02 05:58:14.000000000 +0000
++++ ofc/DGZipFile.m
+@@ -31,10 +31,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#ifdef HAVE_DGZIPFILE
+-#include <zlib.h>
+-#endif
+-
+ #include "ofc/DDatable.h"
+ 
+ 
+@@ -123,7 +119,7 @@
+ @interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
+ {
+ @private
+-  void           *_file;    // the file pointer
++  gzFile          _file;    // the file pointer
+ }
+ 
+ #endif