Date: Fri, 25 Jun 2004 00:10:39 +0200 From: Joe Marcus Clarke <marcus@marcuscom.com> To: pav@freebsd.org Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: third-party shared-mime-info installation Message-ID: <1088036559.91312.1.camel@shumai.marcuscom.com> In-Reply-To: <1087994026.60089.28.camel@pav.hide.vol.cz> References: <1087994026.60089.28.camel@pav.hide.vol.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-XPihwRtgU94B7nnZqK2A
Content-Type: multipart/mixed; boundary="=-XhNyqqGjHsy2PVd1Hm2n"
--=-XhNyqqGjHsy2PVd1Hm2n
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Wed, 2004-06-23 at 08:33, Pav Lucistnik wrote:
> Hi,
>=20
> one of my ports is installing his own data to shared-mime-info database.
> The problem is that the port is installing under /usr/X11R6 (it's a
> GNOME app), but the mime database is in /usr/local/share/mime.
>=20
> What's the preferred way to handle this? Let the port install files out
> of it's prefix, or should we hack shared-mime-info to look to maintain
> two databases (one in /usr/local, second in /usr/X11R6)?
Give these patches a shot. They should effectively allow for databases
in LOCALBASE and X11BASE (much like the way pkg-config works). Too bad
the xdgmime code isn't its own shared library...
Joe
>=20
>=20
> 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/pcvs/ports/science/gchempaint/Makefile,v
> retrieving revision 1.16
> diff -a -u -r1.16 Makefile
> --- Makefile 29 May 2004 11:48:19 -0000 1.16
> +++ Makefile 23 Jun 2004 12:27:34 -0000
> @@ -5,7 +5,7 @@
> # $FreeBSD: ports/science/gchempaint/Makefile,v 1.16 2004/05/29 11:48:19=
pav Exp $
> =20
> PORTNAME=3D gchempaint
> -PORTVERSION=3D 0.4.4
> +PORTVERSION=3D 0.4.5
> CATEGORIES=3D science
> MASTER_SITES=3D ${MASTER_SITE_SAVANNAH}
> MASTER_SITE_SUBDIR=3D ${PORTNAME}
> @@ -20,6 +20,11 @@
> USE_GNOME=3D gnomehack gnomeprefix intlhack libgnomeprintui libgnomeui l=
thack
> USE_GMAKE=3D yes
> USE_LIBTOOL_VER=3D13
> +USE_REINPLACE=3D yes
> CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" LIBS=3D"-L${LOCALBA=
SE}/lib"
> +
> +post-patch:
> + @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${LOCALBASE}/share/mime/|' ${=
WRKSRC}/Makefile.in
> + @${REINPLACE_CMD} -e 's|$$(datadir)/mime$$|${LOCALBASE}/share/mime|' ${=
WRKSRC}/Makefile.in
> =20
> .include <bsd.port.mk>
> Index: distinfo
> =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/pcvs/ports/science/gchempaint/distinfo,v
> retrieving revision 1.10
> diff -a -u -r1.10 distinfo
> --- distinfo 29 May 2004 11:48:19 -0000 1.10
> +++ distinfo 23 Jun 2004 12:27:34 -0000
> @@ -1,2 +1,2 @@
> -MD5 (gchempaint-0.4.4.tar.bz2) =3D 1d877cff475eda565e8db4a67f4f7c02
> -SIZE (gchempaint-0.4.4.tar.bz2) =3D 619320
> +MD5 (gchempaint-0.4.5.tar.bz2) =3D b074f844b044868ee999eaaf680ba975
> +SIZE (gchempaint-0.4.5.tar.bz2) =3D 622075
> Index: pkg-plist
> =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/pcvs/ports/science/gchempaint/pkg-plist,v
> retrieving revision 1.7
> diff -a -u -r1.7 pkg-plist
> --- pkg-plist 11 Mar 2004 22:28:20 -0000 1.7
> +++ pkg-plist 23 Jun 2004 12:27:34 -0000
> @@ -69,3 +69,8 @@
> @dirrm share/gnome/help/gchempaint
> @dirrm share/gnome/omf/gchempaint
> @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gchempaint/gchempai=
nt-C.omf 2>/dev/null || /usr/bin/true
> +@cwd %%LOCALBASE%%
> +share/mime/application/x-gchempaint.xml
> +share/mime/packages/gchempaint.xml
> +@exec update-mime-database %%LOCALBASE%%/share/mime
> +@unexec update-mime-database %%LOCALBASE%%/share/mime
--=20
PGP Key : http://www.marcuscom.com/pgp.asc
--=-XhNyqqGjHsy2PVd1Hm2n
Content-Disposition: attachment; filename=gnomevfs2.diff
Content-Type: text/x-patch; name=gnomevfs2.diff; charset=iso-8859-1
Content-Transfer-Encoding: base64
ZGlmZiAtcnVOIGdub21ldmZzMi5vcmlnL01ha2VmaWxlIGdub21ldmZzMi9NYWtlZmlsZQ0KLS0t
IGdub21ldmZzMi5vcmlnL01ha2VmaWxlCVdlZCBKdW4gMjMgMjA6MTg6MzMgMjAwNA0KKysrIGdu
b21ldmZzMi9NYWtlZmlsZQlXZWQgSnVuIDIzIDIwOjE4OjIzIDIwMDQNCkBAIC03LDcgKzcsNyBA
QA0KIA0KIFBPUlROQU1FPQlnbm9tZXZmczINCiBQT1JUVkVSU0lPTj0JMi42LjEuMQ0KLVBPUlRS
RVZJU0lPTj0JMQ0KK1BPUlRSRVZJU0lPTj0JMg0KIENBVEVHT1JJRVM9CWRldmVsIGdub21lDQog
TUFTVEVSX1NJVEVTPQkke01BU1RFUl9TSVRFX0dOT01FfQ0KIE1BU1RFUl9TSVRFX1NVQkRJUj0J
c291cmNlcy9nbm9tZS12ZnMvMi42DQpAQCAtODMsOCArODMsMTAgQEANCiAJCSdzfFxAZGF0YWRp
clxAL2dub21lfFxAZGF0YWRpclxAfGcnDQogCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC91c3Iv
bG9jYWx8JHtMT0NBTEJBU0V9fGcnIFwNCiAJCSR7V1JLU1JDfS9saWJnbm9tZXZmcy9NYWtlZmls
ZS5pbiBcDQotCQkke1dSS1NSQ30vbGliZ25vbWV2ZnMveGRnbWltZS5jIFwNCiAJCSR7V1JLU1JD
fS9tb2R1bGVzL3Zmb2xkZXIvYXBwbGljYXRpb25zLWFsbC11c2Vycy52Zm9sZGVyLWluZm8uaW4N
CisJQCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8L3Vzci9sb2NhbHwke0xPQ0FMQkFTRX18ZyA7IFwN
CisJCXN8JSVYMTFCQVNFJSV8JHtYMTFCQVNFfXxnJyBcDQorCQkke1dSS1NSQ30vbGliZ25vbWV2
ZnMveGRnbWltZS5jDQogLmlmICFkZWZpbmVkKFdJVEhPVVRfS0RFX01FTlVTKQ0KIAlAJHtTRUR9
IC1lICdzfC91c3IvbG9jYWx8JHtMT0NBTEJBU0V9fGcnIFwNCiAJCTwgJHtGSUxFU0RJUn0vS0RF
LmRpcmVjdG9yeSA+ICR7V1JLU1JDfS9LREUuZGlyZWN0b3J5DQpkaWZmIC1ydU4gZ25vbWV2ZnMy
Lm9yaWcvZmlsZXMvcGF0Y2gtbGliZ25vbWV2ZnNfeGRnbWltZS5jIGdub21ldmZzMi9maWxlcy9w
YXRjaC1saWJnbm9tZXZmc194ZGdtaW1lLmMNCi0tLSBnbm9tZXZmczIub3JpZy9maWxlcy9wYXRj
aC1saWJnbm9tZXZmc194ZGdtaW1lLmMJV2VkIERlYyAzMSAxOTowMDowMCAxOTY5DQorKysgZ25v
bWV2ZnMyL2ZpbGVzL3BhdGNoLWxpYmdub21ldmZzX3hkZ21pbWUuYwlXZWQgSnVuIDIzIDIwOjE2
OjA4IDIwMDQNCkBAIC0wLDAgKzEsMTEgQEANCistLS0gbGliZ25vbWV2ZnMveGRnbWltZS5jLm9y
aWcJV2VkIEp1biAyMyAyMDoxNToyNSAyMDA0DQorKysrIGxpYmdub21ldmZzL3hkZ21pbWUuYwlX
ZWQgSnVuIDIzIDIwOjE1OjQxIDIwMDQNCitAQCAtOTcsNyArOTcsNyBAQA0KKyANCisgICAgICAg
eGRnX2RhdGFfZGlycyA9IGdldGVudiAoIlhER19EQVRBX0RJUlMiKTsNCisgICAgICAgaWYgKHhk
Z19kYXRhX2RpcnMgPT0gTlVMTCkNCistCXhkZ19kYXRhX2RpcnMgPSAiL3Vzci9sb2NhbC9zaGFy
ZS86L3Vzci9zaGFyZS8iOw0KKysJeGRnX2RhdGFfZGlycyA9ICIvdXNyL2xvY2FsL3NoYXJlLzol
JVgxMUJBU0UlJS9zaGFyZS86L3Vzci9zaGFyZS8iOw0KKyANCisgICAgICAgcHRyID0geGRnX2Rh
dGFfZGlyczsNCisgDQo=
--=-XhNyqqGjHsy2PVd1Hm2n
Content-Disposition: attachment; filename=gtk20.diff
Content-Type: text/x-patch; name=gtk20.diff; charset=iso-8859-1
Content-Transfer-Encoding: base64
ZGlmZiAtcnVOIGd0azIwLm9yaWcvTWFrZWZpbGUgZ3RrMjAvTWFrZWZpbGUNCi0tLSBndGsyMC5v
cmlnL01ha2VmaWxlCVdlZCBKdW4gMjMgMjA6MjE6MDcgMjAwNA0KKysrIGd0azIwL01ha2VmaWxl
CVdlZCBKdW4gMjMgMjA6MjE6MDAgMjAwNA0KQEAgLTcsNiArNyw3IEBADQogDQogUE9SVE5BTUU9
CWd0aw0KIFBPUlRWRVJTSU9OPQkyLjQuMw0KK1BPUlRSRVZJU0lPTj0JMQ0KIENBVEVHT1JJRVM9
CXgxMS10b29sa2l0cw0KIE1BU1RFUl9TSVRFUz0JJHtNQVNURVJfU0lURV9HTk9NRTpTLCVTVUJE
SVIlLHNvdXJjZXMvZ3RrKy8yLjQsfSBcDQogCQlmdHA6Ly9mdHAuZ3RrLm9yZy9wdWIvZ3RrL3Yy
LjMvIFwNCkBAIC02Niw3ICs2Nyw4IEBADQogCQkke1hBUkdTfSAke1JFSU5QTEFDRV9DTUR9IC1l
ICdzfC1sZ21vZHVsZXxAR01PRFVMRV9MSUJTQHxnJw0KIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSAn
c3xbe11saWJkaXJbfV0vbG9jYWxlfHtkYXRhZGlyfS9sb2NhbGV8ZycgXA0KIAkJJHtXUktTUkN9
L2NvbmZpZ3VyZQ0KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnc3wvdXNyL2xvY2FsfCR7TE9DQUxC
QVNFfXxnJyBcDQorCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC91c3IvbG9jYWx8JHtMT0NBTEJB
U0V9fGcgOyBcDQorCQlzfCUlWDExQkFTRSUlfCR7WDExQkFTRX18ZycgXA0KIAkJJHtXUktTUkN9
L2d0ay94ZGdtaW1lL3hkZ21pbWUuYw0KIA0KIHByZS1idWlsZDoNCmRpZmYgLXJ1TiBndGsyMC5v
cmlnL2ZpbGVzL3BhdGNoLWd0a194ZGdtaW1lX3hkZ21pbWUuYyBndGsyMC9maWxlcy9wYXRjaC1n
dGtfeGRnbWltZV94ZGdtaW1lLmMNCi0tLSBndGsyMC5vcmlnL2ZpbGVzL3BhdGNoLWd0a194ZGdt
aW1lX3hkZ21pbWUuYwlXZWQgRGVjIDMxIDE5OjAwOjAwIDE5NjkNCisrKyBndGsyMC9maWxlcy9w
YXRjaC1ndGtfeGRnbWltZV94ZGdtaW1lLmMJV2VkIEp1biAyMyAyMDoyMDoyMSAyMDA0DQpAQCAt
MCwwICsxLDExIEBADQorLS0tIGd0ay94ZGdtaW1lL3hkZ21pbWUuYy5vcmlnCVdlZCBKdW4gMjMg
MjA6MTk6NDMgMjAwNA0KKysrKyBndGsveGRnbWltZS94ZGdtaW1lLmMJV2VkIEp1biAyMyAyMDox
OTo1NiAyMDA0DQorQEAgLTk4LDcgKzk4LDcgQEANCisgDQorICAgICAgIHhkZ19kYXRhX2RpcnMg
PSBnZXRlbnYgKCJYREdfREFUQV9ESVJTIik7DQorICAgICAgIGlmICh4ZGdfZGF0YV9kaXJzID09
IE5VTEwpDQorLQl4ZGdfZGF0YV9kaXJzID0gIi91c3IvbG9jYWwvc2hhcmUvOi91c3Ivc2hhcmUv
IjsNCisrCXhkZ19kYXRhX2RpcnMgPSAiL3Vzci9sb2NhbC9zaGFyZS86JSVYMTFCQVNFJSUvc2hh
cmUvOi91c3Ivc2hhcmUvIjsNCisgDQorICAgICAgIHB0ciA9IHhkZ19kYXRhX2RpcnM7DQorIA0K
--=-XhNyqqGjHsy2PVd1Hm2n
Content-Disposition: attachment; filename=shared-mime-info.diff
Content-Type: text/x-patch; name=shared-mime-info.diff; charset=iso-8859-1
Content-Transfer-Encoding: base64
ZGlmZiAtcnVOIHNoYXJlZC1taW1lLWluZm8ub3JpZy9NYWtlZmlsZSBzaGFyZWQtbWltZS1pbmZv
L01ha2VmaWxlDQotLS0gc2hhcmVkLW1pbWUtaW5mby5vcmlnL01ha2VmaWxlCVdlZCBKdW4gMjMg
MjA6MTQ6MjYgMjAwNA0KKysrIHNoYXJlZC1taW1lLWluZm8vTWFrZWZpbGUJV2VkIEp1biAyMyAy
MDoxNDoxNSAyMDA0DQpAQCAtNiw3ICs2LDcgQEANCiANCiBQT1JUTkFNRT0Jc2hhcmVkLW1pbWUt
aW5mbw0KIFBPUlRWRVJTSU9OPQkwLjE0DQotUE9SVFJFVklTSU9OPQkyDQorUE9SVFJFVklTSU9O
PQkzDQogQ0FURUdPUklFUz0JbWlzYyBnbm9tZQ0KIE1BU1RFUl9TSVRFUz0JaHR0cDovL3d3dy5m
cmVlZGVza3RvcC5vcmcvc29mdHdhcmUvc2hhcmVkLW1pbWUtaW5mby8NCiBESVNUTkFNRT0Jc2hh
cmVkLW1pbWUtaW5mby0ke1BPUlRWRVJTSU9OfQ0KQEAgLTIxLDcgKzIxLDggQEANCiBNQU4xPQkJ
dXBkYXRlLW1pbWUtZGF0YWJhc2UuMQ0KIA0KIHBvc3QtcGF0Y2g6DQotCUAke1JFSU5QTEFDRV9D
TUR9IC1lICdzfC91c3IvbG9jYWx8JHtMT0NBTEJBU0V9fGcnIFwNCisJQCR7UkVJTlBMQUNFX0NN
RH0gLWUgJ3N8L3Vzci9sb2NhbHwke0xPQ0FMQkFTRX18ZyA7IFwNCisJCXN8JSVYMTFCQVNFJSV8
JHtYMTFCQVNFfXxnJyBcDQogCQkke1dSS1NSQ30vdXBkYXRlLW1pbWUtZGF0YWJhc2UuYw0KIA0K
IC5pbmNsdWRlIDxic2QucG9ydC5taz4NCmRpZmYgLXJ1TiBzaGFyZWQtbWltZS1pbmZvLm9yaWcv
ZmlsZXMvcGF0Y2gtdXBkYXRlLW1pbWUtZGF0YWJhc2UuYyBzaGFyZWQtbWltZS1pbmZvL2ZpbGVz
L3BhdGNoLXVwZGF0ZS1taW1lLWRhdGFiYXNlLmMNCi0tLSBzaGFyZWQtbWltZS1pbmZvLm9yaWcv
ZmlsZXMvcGF0Y2gtdXBkYXRlLW1pbWUtZGF0YWJhc2UuYwlXZWQgSnVuIDIzIDIwOjE0OjI2IDIw
MDQNCisrKyBzaGFyZWQtbWltZS1pbmZvL2ZpbGVzL3BhdGNoLXVwZGF0ZS1taW1lLWRhdGFiYXNl
LmMJV2VkIEp1biAyMyAyMDoxMzoyMiAyMDA0DQpAQCAtMSw1ICsxLDUgQEANCi0tLS0gdXBkYXRl
LW1pbWUtZGF0YWJhc2UuYy5vcmlnCU1vbiBPY3QgMTMgMTE6NDM6MzggMjAwMw0KLSsrKyB1cGRh
dGUtbWltZS1kYXRhYmFzZS5jCU1vbiBBcHIgMTIgMjI6NDU6MDEgMjAwNA0KKy0tLSB1cGRhdGUt
bWltZS1kYXRhYmFzZS5jLm9yaWcJTW9uIE9jdCAxMyAwNTo0MzozOCAyMDAzDQorKysrIHVwZGF0
ZS1taW1lLWRhdGFiYXNlLmMJV2VkIEp1biAyMyAyMDoxMzoxMCAyMDA0DQogQEAgLTM3Nyw3ICsz
NzcsOCBAQA0KICAJCX0NCiAgCX0NCkBAIC0xMCwzICsxMCwxMiBAQA0KICB9DQogIA0KICAvKiAn
bm9kZScgaXMgYSA8bWltZS10eXBlPiBub2RlIGZyb20gYSBzb3VyY2UgZmlsZSwgd2hvc2UgdHlw
ZSBpcyAndHlwZScuDQorQEAgLTEzMzAsNyArMTMzMSw3IEBADQorIA0KKyAJZW52ID0gZ2V0ZW52
KCJYREdfREFUQV9ESVJTIik7DQorIAlpZiAoIWVudikNCistCQllbnYgPSAiL3Vzci9sb2NhbC9z
aGFyZS86L3Vzci9zaGFyZS8iOw0KKysJCWVudiA9ICIvdXNyL2xvY2FsL3NoYXJlLzolJVgxMUJB
U0UlJS9zaGFyZS86L3Vzci9zaGFyZS8iOw0KKyAJZGlycyA9IGdfc3Ryc3BsaXQoZW52LCAiOiIs
IDApOw0KKyAJZ19yZXR1cm5faWZfZmFpbChkaXJzICE9IE5VTEwpOw0KKyAJZm9yIChuID0gMDsg
ZGlyc1tuXTsgbisrKQ0K
--=-XhNyqqGjHsy2PVd1Hm2n--
--=-XPihwRtgU94B7nnZqK2A
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQBA2h7Pb2iPiv4Uz4cRAoV7AJwO6IucLBzTAKAYzYTJRERKlnmFNwCeJ180
pVL+oYjc1PMYpfQGL8N2/Qo=
=PQFP
-----END PGP SIGNATURE-----
--=-XPihwRtgU94B7nnZqK2A--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1088036559.91312.1.camel>