Date: Fri, 29 Aug 2014 09:50:08 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366486 - in head/lang/ofc: . files Message-ID: <201408290950.s7T9o8oB049780@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Aug 29 09:50:08 2014 New Revision: 366486 URL: http://svnweb.freebsd.org/changeset/ports/366486 QAT: https://qat.redports.org/buildarchive/r366486/ Log: Convert to use USES=objc which makes the port use clang to build Add patches for libofc to properly build with libobjc2 Use options helpers to simplify a bit the makefile Approved by: vanilla Added: head/lang/ofc/files/patch-ofc__DJPEGImage.m (contents, props changed) head/lang/ofc/files/patch-ofc__DLog.m (contents, props changed) head/lang/ofc/files/patch-ofc__DTCPServer.m (contents, props changed) head/lang/ofc/files/patch-ofc__DText.m (contents, props changed) Modified: head/lang/ofc/Makefile Modified: head/lang/ofc/Makefile ============================================================================== --- head/lang/ofc/Makefile Fri Aug 29 09:48:42 2014 (r366485) +++ head/lang/ofc/Makefile Fri Aug 29 09:50:08 2014 (r366486) @@ -3,7 +3,7 @@ PORTNAME= ofc PORTVERSION= 0.8.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= lang MASTER_SITES= GOOGLE_CODE @@ -17,27 +17,16 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex PROJECTHOST= ${PORTNAME} USE_SDL= sdl -USES= libtool pathfix +USES= libtool objc pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +INSTALL_TARGET= install-strip OPTIONS_DEFINE= GDBM GMP -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm -.endif - -.if ${PORT_OPTIONS:MGMP} -LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp -.endif - -.if ${OSVERSION} >= 900000 -# 'obj/obj-api.h' deprecated on gcc4.7, so ofc require gcc4.6 or early version. -USE_GCC= 4.6 -.endif +GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm +GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp .include <bsd.port.mk> Added: head/lang/ofc/files/patch-ofc__DJPEGImage.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ofc/files/patch-ofc__DJPEGImage.m Fri Aug 29 09:50:08 2014 (r366486) @@ -0,0 +1,10 @@ +--- ./ofc/DJPEGImage.m.orig 2008-08-20 19:16:29.000000000 +0200 ++++ ./ofc/DJPEGImage.m 2014-08-29 08:26:49.885998054 +0200 +@@ -25,6 +25,7 @@ + //============================================================================== + + #include <setjmp.h> ++#include <stdio.h> + + #include "ofc/DJPEGImage.h" + Added: head/lang/ofc/files/patch-ofc__DLog.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ofc/files/patch-ofc__DLog.m Fri Aug 29 09:50:08 2014 (r366486) @@ -0,0 +1,11 @@ +--- ./ofc/DLog.m.orig 2004-11-23 21:06:33.000000000 +0100 ++++ ./ofc/DLog.m 2014-08-29 08:26:49.886998482 +0200 +@@ -25,7 +25,7 @@ + //============================================================================== + + #include "ofc/DLog.h" +- ++#include <stdarg.h> + + #if _INTERFACE_ + Added: head/lang/ofc/files/patch-ofc__DTCPServer.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ofc/files/patch-ofc__DTCPServer.m Fri Aug 29 09:50:08 2014 (r366486) @@ -0,0 +1,30 @@ +--- ./ofc/DTCPServer.m.orig 2008-08-11 18:59:46.000000000 +0200 ++++ ./ofc/DTCPServer.m 2014-08-29 08:26:49.887997880 +0200 +@@ -370,6 +370,7 @@ + { + switch(_mode) + { ++#ifndef __FreeBSD__ + case DTS_THREADING: + { + ok = (objc_thread_detach(@selector(handleConnection:), self, peer) != NULL); +@@ -380,6 +381,7 @@ + } + } + break; ++#endif + #ifndef WIN32 + case DTS_FORKING: + { +@@ -460,9 +462,11 @@ + + switch(_mode) + { ++#ifndef __FreeBSD__ + case DTS_THREADING: + objc_thread_exit(); + break; ++#endif + + case DTS_FORKING: + exit(0); Added: head/lang/ofc/files/patch-ofc__DText.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ofc/files/patch-ofc__DText.m Fri Aug 29 09:50:08 2014 (r366486) @@ -0,0 +1,10 @@ +--- ./ofc/DText.m.orig 2008-08-05 18:29:04.000000000 +0200 ++++ ./ofc/DText.m 2014-08-29 08:27:25.604995394 +0200 +@@ -29,6 +29,7 @@ + #include <string.h> + #include <ctype.h> + #include <stdlib.h> ++#include <stdarg.h> + #include <errno.h> + #include <stdio.h> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408290950.s7T9o8oB049780>