From owner-svn-ports-head@FreeBSD.ORG Wed Aug 28 20:24:51 2013 Return-Path: Delivered-To: svn-ports-head@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 BF4F43B9; Wed, 28 Aug 2013 20:24:51 +0000 (UTC) (envelope-from amdmi3@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 9F2BA256C; Wed, 28 Aug 2013 20:24:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SKOpjf066501; Wed, 28 Aug 2013 20:24:51 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SKOppC066498; Wed, 28 Aug 2013 20:24:51 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201308282024.r7SKOppC066498@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 28 Aug 2013 20:24:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325550 - in head/games/lincity: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 20:24:51 -0000 Author: amdmi3 Date: Wed Aug 28 20:24:50 2013 New Revision: 325550 URL: http://svnweb.freebsd.org/changeset/ports/325550 Log: - Fix build breakage introduced in r324073 - (Really) fix build with clang Added: head/games/lincity/files/ head/games/lincity/files/patch-pixmap.c (contents, props changed) head/games/lincity/files/patch-pixmap.h (contents, props changed) Modified: head/games/lincity/Makefile Modified: head/games/lincity/Makefile ============================================================================== --- head/games/lincity/Makefile Wed Aug 28 18:37:40 2013 (r325549) +++ head/games/lincity/Makefile Wed Aug 28 20:24:50 2013 (r325550) @@ -10,25 +10,21 @@ MASTER_SITES= SF/${PORTNAME}/Lincity%20D MAINTAINER= ports@FreeBSD.org COMMENT= Rich city simulation game for X -OPTIONS_DEFINE= SVGALIB NLS - LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USES= gmake -USE_CSTD= c89 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAN6= lincity.6 -.include +OPTIONS_DEFINE= SVGALIB NLS -pre-configure: - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/readpng.c +.include .if ${PORT_OPTIONS:MSVGALIB} -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib +LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib CONFIGURE_ARGS+= --without-x PLIST_SUB= PROG="bin/lincity" .else @@ -45,4 +41,7 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +pre-configure: + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/readpng.c + .include Added: head/games/lincity/files/patch-pixmap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lincity/files/patch-pixmap.c Wed Aug 28 20:24:50 2013 (r325550) @@ -0,0 +1,11 @@ +--- pixmap.c.orig 2003-03-17 01:32:40.000000000 +0300 ++++ pixmap.c 2013-08-28 22:15:03.677227606 +0400 +@@ -390,7 +390,7 @@ + likes it in the file. Still need to fix this in autoconf, + but for now this will do. */ + #if !defined (WIN32) +-inline int ++int + pixmap_index (int x, int y) + { + return y*pixmap_width + x; Added: head/games/lincity/files/patch-pixmap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lincity/files/patch-pixmap.h Wed Aug 28 20:24:50 2013 (r325550) @@ -0,0 +1,11 @@ +--- pixmap.h.orig 2003-02-03 06:52:18.000000000 +0300 ++++ pixmap.h 2013-08-28 22:14:20.285227378 +0400 +@@ -19,7 +19,7 @@ + void initialize_pixmap (void); + void resize_pixmap (int new_width, int new_height); + int pixmap_getpixel (int x, int y); +-inline int pixmap_index (int x, int y); ++int pixmap_index (int x, int y); + int pixmap_getpixel (int x, int y); + void pixmap_setpixel (int x, int y, int col); + void pixmap_hline (int x1, int y1, int x2, int col);