From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 13 01:40:22 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 0D94F16A41F for ; Tue, 13 Jun 2006 01:40:22 +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 E4AAD43D49 for ; Tue, 13 Jun 2006 01:40:20 +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 k5D1eKxw071785 for ; Tue, 13 Jun 2006 01:40:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5D1eKU4071784; Tue, 13 Jun 2006 01:40:20 GMT (envelope-from gnats) Resent-Date: Tue, 13 Jun 2006 01:40:20 GMT Resent-Message-Id: <200606130140.k5D1eKU4071784@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, Shaun Amott Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC6E916A473 for ; Tue, 13 Jun 2006 01:35:06 +0000 (UTC) (envelope-from shaun@inerd.com) Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124]) by mx1.FreeBSD.org (Postfix) with SMTP id BD58343D5C for ; Tue, 13 Jun 2006 01:35:05 +0000 (GMT) (envelope-from shaun@inerd.com) Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03]) by dione.picobyte.net (Postfix) with ESMTP for ; Tue, 13 Jun 2006 02:35:03 +0100 (BST) Message-Id: <1150162503.74013@charon.picobyte.net> Date: Tue, 13 Jun 2006 02:35:03 +0100 From: Shaun Amott To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/98891: [PATCH] bsd.port.mk: Fix DESKTOP_ENTRIES processing on 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Shaun Amott List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jun 2006 01:40:22 -0000 >Number: 98891 >Category: ports >Synopsis: [PATCH] bsd.port.mk: Fix DESKTOP_ENTRIES processing on 4.x >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: Tue Jun 13 01:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: There is some sh(1) code in bsd.port.mk that processes DESKTOP_ENTRIES - unfortunately, it doesn't seem to work on 4.x[1] The patch below uses replaces the use of built-in sh arithmatic code with expr(1) - this fixes the problem on 4.x, and also still works on later OS versions. [1] Example of a broken port: http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.4.2005092302/blobandconquer-0.1.1.log >How-To-Repeat: >Fix: --- bsd.port.mk.diff begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.533 diff -u -r1.533 bsd.port.mk --- bsd.port.mk 23 May 2006 21:53:18 -0000 1.533 +++ bsd.port.mk 13 Jun 2006 01:25:37 -0000 @@ -5480,7 +5480,7 @@ check-desktop-entries: .if defined(DESKTOP_ENTRIES) @set ${DESKTOP_ENTRIES} XXX; \ - if [ $$((($$# - 1) % 6)) -ne 0 ]; then \ + if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \ ${ECHO_CMD} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \ exit 1; \ fi; \ @@ -5526,7 +5526,7 @@ exit 1; \ fi; \ shift 6; \ - num=$$((num + 1)); \ + num=`${EXPR} $$num + 1`; \ done .else @${DO_NADA} --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: