Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Mar 2007 16:05:43 +0100
From:      Karol Kwiatkowski <karol.kwiat@gmail.com>
To:        Alexander Leidinger <Alexander@Leidinger.net>
Cc:        freebsd-emulation@FreeBSD.org
Subject:   Re: [OT] Makefile magic [was: Re: linux-fonconfig-2.2.3_6 not	X11BASE clean]
Message-ID:  <460149C7.4060201@gmail.com>
In-Reply-To: <20070321154647.iq4avx8mpcsw84co@webmail.leidinger.net>
References:  <4601219B.402@gmail.com>	<20070321143737.hcrklzpsqooocksc@webmail.leidinger.net>	<460141F0.6090000@gmail.com> <20070321154647.iq4avx8mpcsw84co@webmail.leidinger.net>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
Alexander Leidinger wrote:
> Quoting Karol Kwiatkowski <karol.kwiat@gmail.com> (from Wed, 21 Mar 2007
> 15:32:16 +0100):
> 
>> Alexander Leidinger wrote:
> 
>>> 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.
> 
> -i'' or something like this IIRC...

Doh, thanks.

>> However, how about replacing ${INSTALL_DATA} with ${SED}? Patch attached.
> 
> This doesn't take care of chown and chgrp.

Right. Patch, hopefully a good one, against Makefile attached.

Cheers,

Karol


-- 
Karol Kwiatkowski   <karol.kwiat at gmail dot com>
OpenPGP 0x06E09309

[-- Attachment #2 --]
--- x11-fonts/linux-fontconfig/Makefile.orig	Mon Mar 19 06:13:58 2007
+++ x11-fonts/linux-fontconfig/Makefile	Wed Mar 21 15:53:55 2007
@@ -29,5 +29,6 @@
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf
+	${REINPLACE_CMD} -i '' -e "s|/usr/X11R6|${X11BASE}|g" ${PREFIX}/etc/fonts/fonts.conf
 
 .include <bsd.port.mk>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?460149C7.4060201>