Date: Sun, 3 Oct 2010 04:57:39 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: Kris Moore <kmoore@FreeBSD.org>, Alexey Dokuchaev <danfe@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/x11/menu-cache Makefile Message-ID: <20101002205739.GG9579@bonjour.sunpoet.net> In-Reply-To: <20101002172753.GA87214@FreeBSD.org> References: <201010011450.o91Eosvw061411@repoman.freebsd.org> <20101002172753.GA87214@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--c8JyeaiReRNoiMDS
Content-Type: multipart/mixed; boundary="vbzKE9fGfpHIBC6T"
Content-Disposition: inline
--vbzKE9fGfpHIBC6T
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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
> >=20
> > FreeBSD ports repository
> >=20
> > Modified files:
> > x11/menu-cache Makefile=20
> > Log:
> > Fix install of pkgconfig data
>=20
> `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?
>=20
> ./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=3Dgnomehack does to Makefile.in.=20
I have tested the following cases:
1. Based on Makefile r1.2, change post-configure: to post-patch:
2. Add USE_GNOME=3Dgnomehack 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
--=20
4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B
Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net>, <sunpoet at FreeBSD.org>
--vbzKE9fGfpHIBC6T
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="cvsdiff.menu-cache"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D kmoore@FreeBSD.org
COMMENT=3D The menu-cache portion of LXDE
=20
-USE_GNOME=3D gtk20 pkgconfig
+USE_GNOME=3D gnomehack gtk20 pkgconfig
USE_AUTOTOOLS=3D libtool:22
USE_LDCONFIG=3D yes
USE_GMAKE=3D yes
@@ -22,14 +22,4 @@
LDFLAGS+=3D -L${LOCALBASE}/lib
CONFIGURE_ENV+=3D CPPFLAGS=3D"${CPPFLAGS}" LDFLAGS=3D"${LDFLAGS}"
=20
-.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>
--vbzKE9fGfpHIBC6T--
--c8JyeaiReRNoiMDS
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (FreeBSD)
iQIcBAEBAgAGBQJMp5zDAAoJENxEJH7MV+NraRQQAKmsydMTbwrW60umxDOwv7BA
S+7tjrC/83l4w75XzOhytZZ16vxmRus96Xo+iEmlaOWuWx+4O+MF81RR0sT5yHIi
XGsXhArpwdBLo70NoOQYyfudCHfflJqsi7Hl+T4RxTRbrVvkLBuAn+gfmo1GeqtQ
0vqDs3BNx8Dp5pV9lprgAcPnoxgsk/jOfPSGPD2aFpSMDpg2lWOH4/ZrE4/Q7NWH
HU97qwA+4IiJaxob1XISsuDMf2W882SwcRpU93sJFz3AYWFJiBb7QTn/h5iHE+Mw
w6zkKMyogs64kGIt3OXPwEBtRDwjwUVKzfq8hoEB9wqNJ7A0INy5D5dFTFFm16DQ
AmzqW/EmxhFtURQp4vOqnvPFi6hflgaEiQLlzdetjbSHawbsLR5kFAMYB8NhDV35
MqUPrPXlL+mtkqX1d694zGUJaQggbfa8ksssqo0gVC13YuK4yUyTbXFVzGZbdbbK
nveXE/EbllGeMMC1O6trWGWR7fbFBe6yA1j9SNPf500jyC74M8pXDt5bN1WV2c1K
90PB54x7ZXzx/guHH41sNn05pYUhAeNKXA2mrVicuq95K14tj3cy1cGHBrVIVQSS
jsYnISLUhnu7snoPVpsbtFiTQkeaCRo9q14Q/sn4jEJ0rGhL8/mK6VKYnR0EZPt9
pFdb2y68XJIFPDsVTnar
=S0LK
-----END PGP SIGNATURE-----
--c8JyeaiReRNoiMDS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101002205739.GG9579>