From owner-freebsd-gnome Wed Jan 29 12: 0:54 2003 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BB1B37B401 for ; Wed, 29 Jan 2003 12:00:51 -0800 (PST) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 942A643F3F for ; Wed, 29 Jan 2003 12:00:50 -0800 (PST) (envelope-from marcus@marcuscom.com) Received: from [192.168.1.4] (shumai.marcuscom.com [192.168.1.4]) by creme-brulee.marcuscom.com (8.12.6/8.12.6) with ESMTP id h0TK0SDZ031054; Wed, 29 Jan 2003 15:00:28 -0500 (EST) (envelope-from marcus@marcuscom.com) Subject: Re: png-1.2.5 should install libpng12.pc From: Joe Marcus Clarke To: "Andrey A. Chernov" Cc: Franz Klammer , FreeBSD GNOME Users In-Reply-To: <20030129195719.GA20199@nagual.pp.ru> References: <1043865770.608.51.camel@ds9.webonaut.com> <20030129190935.GA19386@nagual.pp.ru> <1043868739.67424.19.camel@shumai.marcuscom.com> <20030129195127.GA19951@nagual.pp.ru> <1043870047.67424.36.camel@shumai.marcuscom.com> <20030129195719.GA20199@nagual.pp.ru> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-ZxkGc3HQs4cYOrDOi7og" Organization: MarcusCom, Inc. Message-Id: <1043870447.67424.44.camel@shumai.marcuscom.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.1 Date: 29 Jan 2003 15:00:47 -0500 X-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,IN_REP_TO,NOSPAM_INC,PGP_SIGNATURE_2,REFERENCES, SPAM_PHRASE_00_01 version=2.43 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-ZxkGc3HQs4cYOrDOi7og Content-Type: multipart/mixed; boundary="=-a3XRat+dROnuvUUvtIoT" --=-a3XRat+dROnuvUUvtIoT Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Wed, 2003-01-29 at 14:57, Andrey A. Chernov wrote: > On Wed, Jan 29, 2003 at 14:54:07 -0500, Joe Marcus Clarke wrote: > >=20 > > In the Makefile.diff I sent you, there is. I can libpng.pc.in (in the >=20 > I not receive it. Could you please combine all patches and resend them? > Explanation why it is ever needed will be good too. Here is a unified diff to the png port with all of the patches.=20 Basically, these patches are needed for the upcoming release of GNOME 2.2. The libpng12.pc file is used by Nautilus and gstreamer-plugins.=20 Thanks for looking into this. Joe --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-a3XRat+dROnuvUUvtIoT Content-Disposition: attachment; filename=png.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=png.diff; charset=ISO-8859-1 diff -ruN png.orig/Makefile png/Makefile --- png.orig/Makefile Wed Jan 29 14:59:56 2003 +++ png/Makefile Wed Jan 29 14:59:19 2003 @@ -7,6 +7,7 @@ =20 PORTNAME=3D png PORTVERSION=3D 1.2.5 +PORTREVISION=3D 1 CATEGORIES=3D graphics MASTER_SITES=3D http://www.libpng.org/pub/png/src/ \ ftp://swrinde.nde.swri.edu/pub/png/src/ \ @@ -19,6 +20,8 @@ =20 MAINTAINER=3D ache@FreeBSD.org =20 +RUN_DEPENDS=3D pkg-config:${PORTSDIR}/devel/pkgconfig + MAKEFILE=3D ${WRKSRC}/scripts/makefile.freebsd INSTALLS_SHLIB=3D yes SHLIB_VER=3D 5 @@ -38,5 +41,11 @@ =20 pre-install: @[ -d ${PREFIX}/include/libpng ] || ${MKDIR} ${PREFIX}/include/libpng + +post-install: + ${CAT} ${WRKSRC}/scripts/libpng.pc.in | ${SED} -e \ + 's|@PREFIX@|${PREFIX}|' > ${WRKSRC}/scripts/libpng.pc + ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc \ + ${PREFIX}/libdata/pkgconfig/libpng12.pc =20 .include diff -ruN png.orig/pkg-plist png/pkg-plist --- png.orig/pkg-plist Wed Jan 29 14:59:56 2003 +++ png/pkg-plist Wed Jan 29 14:59:46 2003 @@ -6,6 +6,7 @@ @unexec rm -f %D/include/%f lib/libpng.a lib/libpng.so.%%SHLIB_VER%% +libdata/pkgconfig/libpng12.pc @exec ln -sf %f %B/libpng.so @unexec rm -f %B/libpng.so @dirrm include/libpng --=-a3XRat+dROnuvUUvtIoT-- --=-ZxkGc3HQs4cYOrDOi7og Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQA+ODLvb2iPiv4Uz4cRAvhXAJ9ilvJMB+eU3/NjyO9ftvu+oNeUUgCgobk+ VCrGRolQ1JkXvZRe0nXNzko= =SICK -----END PGP SIGNATURE----- --=-ZxkGc3HQs4cYOrDOi7og-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message