From owner-freebsd-emulation@FreeBSD.ORG Wed Mar 21 14:32:15 2007 Return-Path: X-Original-To: freebsd-emulation@freebsd.org Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5AA4016A403 for ; Wed, 21 Mar 2007 14:32:15 +0000 (UTC) (envelope-from karol.kwiat@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.168]) by mx1.freebsd.org (Postfix) with ESMTP id CFD2313C448 for ; Wed, 21 Mar 2007 14:32:14 +0000 (UTC) (envelope-from karol.kwiat@gmail.com) Received: by ug-out-1314.google.com with SMTP id 71so331935ugh for ; Wed, 21 Mar 2007 07:32:13 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:openpgp:content-type; b=L/J4GrUNwywYSwEusMABZ3Y5cJHbiGznNh1ymolFSbJ4BTOzZDHKRyY3UyKp29BoBgBmVNm9j4VOD4aicUQ/6Fi11FoCfDLouYm1AETYNfB/Gllc+FiFbPT1rGAbZX8rf3JXdDnmCyRALvaX0cS3EJUoKtmo+ECfzT/dvHoVO0E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:openpgp:content-type; b=F1WuIQe5pTNN9mfGm37Dx601XqlN8Wlz8ykqwmkS+eI2KcLVpq3FXnQRc2op0C3ejEajNAbLgqpFWB3SoKeFWIkn983R+4QxMKPP7zr1/m7AGPryWLyT7qxQIARge8GiwRIr6ergp4K2plwwtXgnihLbd3FzWkB9m945Q4GW4Ns= Received: by 10.67.29.12 with SMTP id g12mr3189550ugj.1174487532503; Wed, 21 Mar 2007 07:32:12 -0700 (PDT) Received: from persephone.orchid.homeunix.org ( [84.10.174.25]) by mx.google.com with ESMTP id u6sm1951813uge.2007.03.21.07.32.11; Wed, 21 Mar 2007 07:32:12 -0700 (PDT) Message-ID: <460141F0.6090000@gmail.com> Date: Wed, 21 Mar 2007 15:32:16 +0100 From: Karol Kwiatkowski User-Agent: Thunderbird 2.0b2 (X11/20070306) MIME-Version: 1.0 To: Alexander Leidinger References: <4601219B.402@gmail.com> <20070321143737.hcrklzpsqooocksc@webmail.leidinger.net> In-Reply-To: <20070321143737.hcrklzpsqooocksc@webmail.leidinger.net> X-Enigmail-Version: 0.94.3.0 OpenPGP: id=06E09309; url=http://www.orchid.homeunix.org/carlos/gpg/0x06E09309.asc Content-Type: multipart/mixed; boundary="------------020409060704080705090607" Cc: freebsd-emulation@FreeBSD.org Subject: [OT] Makefile magic [was: Re: linux-fonconfig-2.2.3_6 not X11BASE clean] X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: karol.kwiat@gmail.com List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2007 14:32:15 -0000 This is a multi-part message in MIME format. --------------020409060704080705090607 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Alexander Leidinger wrote: > Quoting Karol Kwiatkowski (from Wed, 21 Mar 2007 > 13:14:19 +0100): > >> Hello all, >> >> environment: >> X11BASE=/usr/local >> >> problem: >> new version of linux-fonconfig (2.2.3_6) installs fonts.conf into >> ${PREFIX}/etc/fonts/fonts.conf. In that file there is a hardcoded path >> to /usr/X11R6/lib/X11/fonts which doesn't exist in my environment. >> >> solution: >> patch to x11-fonts/linux-config attached, I'm sending it here >> cause I'm >> not sure if that's a proper solution. > > You don't need to patch fonts.conf. Just replace /usr/X11R6 globally > with $X11BASE. Well, true. Fixed. I just thought it's strange to have our (FreeBSD's) file with hardcoded path :) > You also added the backup file to the plist, just do an > inplace replacement without the backup (-i option). I'm probably missing something but I can't see how to do that. sed(1) mentions -i with zero-length extension. Then there are those lines in /usr/ports/Mk/bsd.port.mk: # Macro for doing in-place file editing using regexps REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} and whatever I put in ${REINPLACE_CMD} line after -i option I get errors or different extensions. However, how about replacing ${INSTALL_DATA} with ${SED}? Patch attached. Cheers, Karol -- Karol Kwiatkowski OpenPGP 0x06E09309 --------------020409060704080705090607 Content-Type: text/plain; name="x11-fonts.linux-fontconfig-2.2.3_6.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="x11-fonts.linux-fontconfig-2.2.3_6.patch" ZGlmZiAtcnUgbGludXgtZm9udGNvbmZpZy5vcmlnL01ha2VmaWxlIGxpbnV4LWZvbnRjb25m aWcvTWFrZWZpbGUKLS0tIGxpbnV4LWZvbnRjb25maWcub3JpZy9NYWtlZmlsZQlNb24gTWFy IDE5IDA2OjEzOjU4IDIwMDcKKysrIGxpbnV4LWZvbnRjb25maWcvTWFrZWZpbGUJV2VkIE1h ciAyMSAxNTowNzowOCAyMDA3CkBAIC0yOCw2ICsyOCw2IEBACiAJJHtSTX0gJHtXUktTUkN9 L2V0Yy9mb250cy9mb250cy5jb25mCiAKIHBvc3QtaW5zdGFsbDoKLQkke0lOU1RBTExfREFU QX0gJHtGSUxFU0RJUn0vZm9udHMuY29uZiAke1BSRUZJWH0vZXRjL2ZvbnRzL2ZvbnRzLmNv bmYKKwkke1NFRH0gLWUgInN8L3Vzci9YMTFSNnwke1gxMUJBU0V9fGciICR7RklMRVNESVJ9 L2ZvbnRzLmNvbmYgPiAke1BSRUZJWH0vZXRjL2ZvbnRzL2ZvbnRzLmNvbmYKIAogLmluY2x1 ZGUgPGJzZC5wb3J0Lm1rPgo= --------------020409060704080705090607--