From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 27 19:20:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8222516A4E7 for ; Thu, 27 Jul 2006 19:20:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E4A243D5E for ; Thu, 27 Jul 2006 19:20:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6RJK8gd067704 for ; Thu, 27 Jul 2006 19:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6RJK8Uv067703; Thu, 27 Jul 2006 19:20:08 GMT (envelope-from gnats) Resent-Date: Thu, 27 Jul 2006 19:20:08 GMT Resent-Message-Id: <200607271920.k6RJK8Uv067703@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ed Schouten Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C0AC16A4DA for ; Thu, 27 Jul 2006 19:18:54 +0000 (UTC) (envelope-from ed@zonk.fxq.nl) Received: from swip.net (mailfe10.swip.net [212.247.155.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5D2643D66 for ; Thu, 27 Jul 2006 19:18:50 +0000 (GMT) (envelope-from ed@zonk.fxq.nl) Received: from [83.180.59.125] (HELO zonk.fxq.nl) by mailfe10.swip.net (CommuniGate Pro SMTP 5.0.8) with ESMTPS id 74262089 for FreeBSD-gnats-submit@freebsd.org; Thu, 27 Jul 2006 21:18:49 +0200 Received: from zonk.fxq.nl (localhost [127.0.0.1]) by zonk.fxq.nl (8.13.6/8.13.6) with ESMTP id k6RJIiKg023377 for ; Thu, 27 Jul 2006 21:18:44 +0200 (CEST) (envelope-from ed@zonk.fxq.nl) Received: (from ed@localhost) by zonk.fxq.nl (8.13.6/8.13.6/Submit) id k6RJIhjD023376; Thu, 27 Jul 2006 21:18:43 +0200 (CEST) (envelope-from ed) Message-Id: <200607271918.k6RJIhjD023376@zonk.fxq.nl> Date: Thu, 27 Jul 2006 21:18:43 +0200 (CEST) From: Ed Schouten To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100928: [games/openttd] Uncripple the Makefile and remove useless warnings when removing data directory X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ed Schouten List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 19:20:15 -0000 >Number: 100928 >Category: ports >Synopsis: [games/openttd] Uncripple the Makefile and remove useless warnings when removing data directory >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jul 27 19:20:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Ed Schouten >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD zonk.fxq.nl 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Jul 15 23:07:29 CEST 2006 root@zonk.fxq.nl:/usr/obj/usr/src/sys/ZONK i386 >Description: The current Makefile of the OpenTTD port is quite broken. There are variable assignments inside make target definitions. This prevents you from using the WITH_* switches. The plist also has some @dirrm's that will cause warnings on deletion when the user as the data files installed. >How-To-Repeat: Try to compile OpenTTD with WITH_MIDI_PLAYER defined. This will fail. Removing an installation of OpenTTD with the data files installed will cause warnings. >Fix: Apply the following patch: %%% --- games/openttd/Makefile Fri Jun 16 06:45:44 2006 +++ games/openttd/Makefile Thu Jul 27 21:14:38 2006 @@ -20,17 +20,21 @@ USE_GMAKE= yes +.if defined(WITH_MIDI_PLAYER) +MAKE_ARGS+= MIDI=${WITH_MIDI_PLAYER} +.endif +.if defined(WITH_DEDICATED_SERVER_ONLY) +MAKE_ARGS+= DEDICATED=1 +.else +USE_SDL= sdl +.endif + pre-everything:: .if !defined(WITH_MIDI_PLAYER) @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player" -.else -MAKE_ARGS+= MIDI=${WITH_MIDI_PLAYER} .endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" -USE_SDL= sdl -.else -MAKE_ARGS+= DEDICATED=1 .endif post-extract: --- games/openttd/pkg-plist Tue Feb 7 14:16:07 2006 +++ games/openttd/pkg-plist Thu Jul 27 21:14:38 2006 @@ -6,7 +6,7 @@ %%DATADIR%%/data/openttd.grf %%DATADIR%%/data/opntitle.dat %%DATADIR%%/data/trkfoundw.grf -@dirrm %%DATADIR%%/data +@dirrmtry %%DATADIR%%/data %%DATADIR%%/lang/american.lng %%DATADIR%%/lang/brazilian_portuguese.lng %%DATADIR%%/lang/catalan.lng @@ -32,7 +32,7 @@ %%DATADIR%%/lang/swedish.lng %%DATADIR%%/lang/turkish.lng @dirrm %%DATADIR%%/lang -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/Howto_compile_lng_files_from_CLI.txt %%PORTDOCS%%%%DOCSDIR%%/Manual.txt %%PORTDOCS%%%%DOCSDIR%%/console.txt %%% >Release-Note: >Audit-Trail: >Unformatted: