Date: Sun, 28 Jul 2013 04:20:32 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323810 - in head/lang/ofc: . files Message-ID: <201307280420.r6S4KWdQ063852@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307280420.r6S4KWdQ063852>