diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2013-07-28 04:20:32 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2013-07-28 04:20:32 +0000 |
| commit | 9d39f570f6cac00d63a3bafbcb3bce7a005c847c (patch) | |
| tree | d171f88c95bcca0aaa449e8d703fb97dbd1dbec7 /lang/ofc | |
| parent | ef1ad06e552d8344299e591fcbf1ddbb5e05c76b (diff) | |
1: Fix build with newer zlib [1]
2: switch to gcc46.
PR: ports/180748
Submitted by: John Marino <freebsd at marino.st> [1]
Notes
Notes:
svn path=/head/; revision=323810
Diffstat (limited to 'lang/ofc')
| -rw-r--r-- | lang/ofc/Makefile | 4 | ||||
| -rw-r--r-- | lang/ofc/files/patch-ofc_DGZipFile.h | 19 | ||||
| -rw-r--r-- | lang/ofc/files/patch-ofc_DGZipFile.m | 22 |
3 files changed, 43 insertions, 2 deletions
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index 1b3cea22b28f..0b4e9cb4ca1b 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ 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} diff --git a/lang/ofc/files/patch-ofc_DGZipFile.h b/lang/ofc/files/patch-ofc_DGZipFile.h new file mode 100644 index 000000000000..6423325cb2e9 --- /dev/null +++ b/lang/ofc/files/patch-ofc_DGZipFile.h @@ -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 diff --git a/lang/ofc/files/patch-ofc_DGZipFile.m b/lang/ofc/files/patch-ofc_DGZipFile.m new file mode 100644 index 000000000000..68abf4674b44 --- /dev/null +++ b/lang/ofc/files/patch-ofc_DGZipFile.m @@ -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 |