On Sat, Oct 02, 2010 at 05:27:53PM +0000, Alexey Dokuchaev wrote: > On Fri, Oct 01, 2010 at 02:50:54PM +0000, Kris Moore wrote: > > kmoore 2010-10-01 14:50:54 UTC > > > > FreeBSD ports repository > > > > Modified files: > > x11/menu-cache Makefile > > Log: > > Fix install of pkgconfig data > > `post-configure' target name suggests that Makefile.in's can be omitted > from that code, since the patch is applied to generated files anyway, no? > > ./danfe
Hi,
To the best of my knowledge, we usually do *.in modification BEFORE
configure: (e.g. post-patch:). Furthermore, the replacement looks like
what USE_GNOME=gnomehack does to Makefile.in.
I have tested the following cases:
1. Based on Makefile r1.2, change post-configure: to post-patch:
2. Add USE_GNOME=gnomehack and remove post-configure:
The "make patch" results are identical. (except .bak files)
I did not add this port to tinderbox due to a long package-depends-list
(67 ports). But I believe the following patch should work fine.
Kris, Would you please check if everything is OK with the attached patch?
Thanks.
Regards,
sunpoet
--
4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B
Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net>, <sunpoet at FreeBSD.org>
Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/menu-cache/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 1 Oct 2010 14:50:54 -0000 1.3 +++ Makefile 2 Oct 2010 20:55:18 -0000 @@ -13,7 +13,7 @@ MAINTAINER= [email protected] COMMENT= The menu-cache portion of LXDE -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gnomehack gtk20 pkgconfig USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GMAKE= yes @@ -22,14 +22,4 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -.include <bsd.port.pre.mk> - -post-configure: - ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/libmenu-cache/Makefile.in ${WRKSRC}/libmenu-cache/Makefile - ${REINPLACE_CMD} -e 's|(datadir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/libmenu-cache/Makefile.in ${WRKSRC}/libmenu-cache/Makefile - ${REINPLACE_CMD} -e 's|(prefix)/lib/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/libmenu-cache/Makefile.in ${WRKSRC}/libmenu-cache/Makefile - -.include <bsd.port.post.mk> +.include <bsd.port.mk>
pgpTBDyNkAdj1.pgp
Description: PGP signature
