From owner-svn-ports-all@freebsd.org Wed Sep 30 10:45:09 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 591BA4245E1; Wed, 30 Sep 2020 10:45:09 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C1Xvn1lZ2z45d2; Wed, 30 Sep 2020 10:45:09 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F81B1E37F; Wed, 30 Sep 2020 10:45:09 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08UAj9X1012187; Wed, 30 Sep 2020 10:45:09 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UAj8a6012184; Wed, 30 Sep 2020 10:45:08 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009301045.08UAj8a6012184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Wed, 30 Sep 2020 10:45:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550676 - in head/games/lincity: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/games/lincity: . files X-SVN-Commit-Revision: 550676 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2020 10:45:09 -0000 Author: se Date: Wed Sep 30 10:45:08 2020 New Revision: 550676 URL: https://svnweb.freebsd.org/changeset/ports/550676 Log: Fix build with -fno-common Added: head/games/lincity/files/patch-ldsvgui.c (contents, props changed) head/games/lincity/files/patch-main.c (contents, props changed) head/games/lincity/files/patch-screen.h (contents, props changed) Modified: head/games/lincity/Makefile Modified: head/games/lincity/Makefile ============================================================================== --- head/games/lincity/Makefile Wed Sep 30 10:36:54 2020 (r550675) +++ head/games/lincity/Makefile Wed Sep 30 10:45:08 2020 (r550676) @@ -3,7 +3,7 @@ PORTNAME= lincity PORTVERSION= 1.13.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Lincity%20Development%20Source/${PORTVERSION} @@ -23,8 +23,8 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS SVGALIB OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_ON= --without-x @@ -36,7 +36,7 @@ SVGALIB_CONFIGURE_OFF= --without-svga PLIST_SUB+= PROG="bin/lincity" .else USES+= xorg -USE_XORG= sm xext +USE_XORG= ice sm x11 xext PLIST_SUB+= PROG="bin/xlincity" .endif Added: head/games/lincity/files/patch-ldsvgui.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lincity/files/patch-ldsvgui.c Wed Sep 30 10:45:08 2020 (r550676) @@ -0,0 +1,13 @@ +--- ldsvgui.c.orig 2003-10-05 05:53:32 UTC ++++ ldsvgui.c +@@ -99,8 +99,8 @@ char LIBDIR[_MAX_PATH]; + char LIBDIR[256]; + #endif + +-char *lc_save_dir; +-char save_names[10][42]; ++extern char *lc_save_dir; ++extern char save_names[10][42]; + + /* ---------------------------------------------------------------------- * + * Public Functions Added: head/games/lincity/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lincity/files/patch-main.c Wed Sep 30 10:45:08 2020 (r550676) @@ -0,0 +1,15 @@ +--- main.c.orig 2004-07-03 07:59:05 UTC ++++ main.c +@@ -96,9 +96,9 @@ char LIBDIR[LC_PATH_MAX]; + #endif + #endif + +-char *lc_save_dir; +-char *lc_temp_file; +-char save_names[10][42]; ++extern char *lc_save_dir; ++extern char *lc_temp_file; ++extern char save_names[10][42]; + + #ifdef CS_PROFILE + int prof_countdown = PROFILE_COUNTDOWN; Added: head/games/lincity/files/patch-screen.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lincity/files/patch-screen.h Wed Sep 30 10:45:08 2020 (r550676) @@ -0,0 +1,11 @@ +--- screen.h.orig 2004-06-22 13:24:19 UTC ++++ screen.h +@@ -20,7 +20,7 @@ extern unsigned char start_font1[2048]; + extern unsigned char start_font2[4096]; + extern unsigned char start_font3[4096]; + +-int monthgraph_style; ++extern int monthgraph_style; + + /* This is on in screen_full_refresh, used in *_refresh() */ + extern char screen_refreshing;