Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Apr 2007 13:50:13 +0300
From:      Peter Pentchev <roam@ringlet.net>
To:        Joe Marcus Clarke <marcus@FreeBSD.org>
Cc:        cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: cvs commit: ports/misc/shared-mime-info Makefile ports/misc/shared-mime-info/files patch-Makefile.in
Message-ID:  <20070427105013.GA54793@straylight.m.ringlet.net>
In-Reply-To: <200704261909.l3QJ9MEv002024@repoman.freebsd.org>
References:  <200704261909.l3QJ9MEv002024@repoman.freebsd.org>

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

--3MwIy2ne0vdjdPXF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Apr 26, 2007 at 07:09:22PM +0000, Joe Marcus Clarke wrote:
> marcus      2007-04-26 19:09:22 UTC
>=20
>   FreeBSD ports repository
>=20
>   Modified files:
>     misc/shared-mime-info Makefile=20
>     misc/shared-mime-info/files patch-Makefile.in=20
>   Log:
>   Correct MIME dirs in patch.

Wasn't the patch-Makefile.in change a bit too aggressive? :)  What do
you think about the following patch to restore the pkgconfigdir setting,
so both the packing list is correct *and* pkg-config can actually find
the shared-mime-info.pc file? :)

G'luck,
Peter

Index: ports/misc/shared-mime-info/files/patch-Makefile.in
=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/misc/shared-mime-info/files/patch-Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile.in
--- ports/misc/shared-mime-info/files/patch-Makefile.in	26 Apr 2007 19:09:2=
2 -0000	1.5
+++ ports/misc/shared-mime-info/files/patch-Makefile.in	27 Apr 2007 10:48:3=
0 -0000
@@ -1,6 +1,15 @@
---- Makefile.in.orig	Sat Feb 10 04:50:08 2007
-+++ Makefile.in	Sat Feb 10 04:52:30 2007
-@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status
+--- Makefile.in.orig	Fri Apr 27 10:41:23 2007
++++ Makefile.in	Fri Apr 27 10:41:52 2007
+@@ -274,7 +274,7 @@
+=20
+ CLEANFILES =3D freedesktop.org.xml po/stamp-it
+ DISTCLEANFILES =3D intltool-extract intltool-merge intltool-update
+-pkgconfigdir =3D $(datadir)/pkgconfig
++pkgconfigdir =3D $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA =3D shared-mime-info.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -901,7 +901,11 @@
  @INTLTOOL_DESKTOP_RULE@
 =20
  install-data-hook:=20

--=20
Peter Pentchev	roam@ringlet.net    roam@cnsys.bg    roam@FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
If the meanings of 'true' and 'false' were switched, then this sentence wou=
ldn't be false.

--3MwIy2ne0vdjdPXF
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQFGMdVl7Ri2jRYZRVMRAlPVAJ9FIQK3YhEYLXBwCFiJvN/MSjxuhACfR2BH
dA2W8gCYj1c+bPPrU2aNA2k=
=NG/g
-----END PGP SIGNATURE-----

--3MwIy2ne0vdjdPXF--



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