--Signature=_Thu__10_Jun_2004_07_45_06_+0200_VbGjpWnKa5VM/a.m
Content-Type: multipart/mixed;
 boundary="Multipart=_Thu__10_Jun_2004_07_45_06_+0200_VtEnL0YGTe9A_Kpl"


--Multipart=_Thu__10_Jun_2004_07_45_06_+0200_VtEnL0YGTe9A_Kpl
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit


Hey there,

I just finished "databases.mk" for pkgsrc, it's based on the file
pkgsrc/mk/krb5.buildlink3.mk by Johnny C. Lam.

And this file will be useful for packages requiring
mysql*-client/postgresql*-lib, because actually we cannot install
databases/php4-pgsql with postgresql74-lib (the newest branch) without editing
the Makefile and changing the include.

For example, with the new databases.mk in php4-pgsql the following change is 
needed:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/php4-pgsql/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile    25 Apr 2004 01:12:49 -0000      1.9
+++ Makefile    10 Jun 2004 05:40:45 -0000
@@ -9,7 +9,9 @@
 
.include "../../www/php4/Makefile.module"
 
+DB_USE_PGSQL=          # defined
+
CONFIGURE_ARGS+=     --with-${MODNAME}=shared,${BUILDLINK_PREFIX.postgresql-lib}
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/databases.mk".include "../../mk/bsd.pkg.mk"

For mysql, we'll have to use DB_USE_MYSQL.

And to specify the default version, the options DB_{MYSQL,PGSQL}_DEFAULT will
be used.

Please share your suggestions/objections or whatever, if all it's ok I'll commit
after the freeze.

-- 
	Juan RP <juan@xtraeme.unixbsd.org>

--Multipart=_Thu__10_Jun_2004_07_45_06_+0200_VtEnL0YGTe9A_Kpl
Content-Type: application/octet-stream;
 name="databases.mk"
Content-Disposition: attachment;
 filename="databases.mk"
Content-Transfer-Encoding: base64

IyAkTmV0QlNEJAojCiMgTWFrZWZpbGUgZnJhZ21lbnQgdG8gdXNlIHdpdGggcGFja2FnZXMgcmVx
dWlyaW5nIE15U1FMCiMgb3IgUG9zdGdyZVNRTCBsaWJyYXJpZXMuCiMKIyBZb3UgY2FuIHNldCB0
aGUgZm9sbG93aW5nIHZhcmlhYmxlczoKIwojIAlEQl9VU0VfTVlTUUwJCVRvIHVzZSBhbnkgbXlz
cWwgcGFja2FnZQojIAlEQl9VU0VfUEdTUUwJCVRvIHVzZSBhbnkgcG9zdGdyZXNxbCBwYWNrYWdl
CiMKIwlEQl9QR1NRTF9ERUZBVUxUCVBvc3NpYmxlIHZhbHVlczogcG9zdGdyZXNxbDc0LCBwb3N0
Z3Jlc3FsCiMJREJfTVlTUUxfREVGQVVMVAlQb3NzaWJsZSB2YWx1ZXM6IG15c3FsNCwgbXlzcWwK
Ci5pbmNsdWRlICIuLi8uLi9tay9ic2QucHJlZnMubWsiCgouaWYgIWRlZmluZWQoREFUQUJBU0VT
X01LKQpEQVRBQkFTRVNfTUs9CQkjIGRlZmluZWQKCl9TUUxfUEtHX05BTUVTPz0JCU1ZU1FMIFBH
U1FMCl9TUUxfUEtHX0RFUEVORFMuUEdTUUw/PQlwb3N0Z3Jlc3FsNzQtbGliIHBvc2dyZXNxbC1s
aWIKX1NRTF9QS0dfREVGQVVMVC5QR1NRTD89CXBvc3RncmVzcWw3NCAjIERlZmF1bHQgcGFja2Fn
ZSB0byB1c2UKCl9TUUxfUEtHX0RFUEVORFMuTVlTUUw/PQlteXNxbDQtY2xpZW50IG15c3FsLWNs
aWVudApfU1FMX1BLR19ERUZBVUxULk1ZU1FMPz0JbXlzcWw0ICMgZGVmYXVsdCBwYWNrYWdlIHRv
IHVzZQoKLiAgZm9yIF9zcWxfIGluICR7X1NRTF9QS0dfTkFNRVN9Ci4gICAgaWYgZGVmaW5lZChE
Ql9VU0VfJHtfc3FsX30pCkRCXyR7X3NxbF99X0RFRkFVTFQ/PQkke19TUUxfUEtHX0RFRkFVTFQu
JHtfc3FsX319CgpfJHtfc3FsX31fQUNDRVBURUQ/PQkke19TUUxfUEtHX0RFUEVORFMuJHtfc3Fs
X306Uy8tbGliLy86Uy8tY2xpZW50Ly99Cl8ke19zcWxffV9ERUZBVUxUPQkke0RCXyR7X3NxbF99
X0RFRkFVTFR9CgojIE1hcmsgdGhlIGFjY2VwdGFibGUgbXlzcWwgcGFja2FnZXMgYW5kIGNoZWNr
IHdoaWNoLCBpZiBhbnksIGFyZQojIGFscmVhZHkgaW5zdGFsbGVkLgojCi4gICAgICBmb3IgX3Br
Z18gaW4gJHtfJHtfc3FsX31fQUNDRVBURUR9Cl8ke19zcWxffV9PSy4ke19wa2dffT0JeWVzCi4g
ICAgICAgIGlmICFkZWZpbmVkKF8ke19zcWxffV9JTlNUQUxMRUQuJHtfcGtnX30pCl8ke19zcWxf
fV9JTlNUQUxMRUQuJHtfcGtnX30hPQkJCQkJCVwKCSAgaWYgJHtQS0dfSU5GT30gLXFlICR7X3Br
Z199OyB0aGVuCQkJCVwKCQkke0VDSE99ICJ5ZXMiOwkJCQkJCVwKCSAgZWxzZQkJCQkJCQkJXAoJ
CSR7RUNIT30gIm5vIjsJCQkJCQlcCiAgICAgICAgICBmaQpNQUtFRkxBR1MrPSAgICAgXyR7X3Nx
bF99X0lOU1RBTExFRC4ke19wa2dffT0ke18ke19zcWxffV9JTlNUQUxMRUQuJHtfcGtnX319Ci4g
ICAgICAgIGVuZGlmCi4gICAgICBlbmRmb3IKCi4gICAgICBpZiAhZGVmaW5lZChfJHtfc3FsX31f
UEtHKQojICAKIyBQcmVmZXIgdGhlIGRlZmF1bHQgb25lIGlmIGl0J3MgYWNjZXB0ZWQsLi4uCiMK
LiAgICAgICAgaWYgIWVtcHR5KF8ke19zcWxffV9ERUZBVUxUKSAmJiBcCglkZWZpbmVkKF8ke19z
cWxffV9PSy4ke18ke19zcWxffV9ERUZBVUxUfSkgJiYgXAoJIWVtcHR5KF8ke19zcWxffV9PSy4k
e18ke19zcWxffV9ERUZBVUxUfTpNW3lZXVtlRV1bc1NdKQpfJHtfc3FsX31fUEtHPQkke18ke19z
cWxffV9ERUZBVUxUfQouICAgICAgICBlbmRpZgojICAgIAojIC4uLm90aGVyd2lzZSwgdXNlIG9u
ZSBvZiB0aGUgaW5zdGFsbGVkIG15c3FsIHBhY2thZ2VzLC4uLgojCi4gICAgICAgIGZvciBfcGtn
XyBpbiAke18ke19zcWxffV9BQ0NFUFRFRH0KLiAgICAgICAgICBpZiAhZW1wdHkoXyR7X3NxbF99
X0lOU1RBTExFRC4ke19wa2dffTpNW3lZXVtlRV1bc1NdKQpfJHtfc3FsX31fUEtHPz0JJHtfcGtn
X30KLiAgICAgICAgICBlbHNlCl8ke19zcWxffV9GSVJTVEFDQ0VQVEVEPz0JJHtfcGtnX30KLiAg
ICAgICAgICBlbmRpZgouICAgICAgICBlbmRmb3IKIwojIC4uLm90aGVyd2lzZSwganVzdCB1c2Ug
dGhlIGZpcnN0IGFjY2VwdGVkIG15c3FsIHBhY2thZ2UuCiMKLiAgICAgICAgaWYgZGVmaW5lZChf
JHtfc3FsX31fRklSU1RBQ0NFUFRFRCkKXyR7X3NxbF99X1BLRz89CSR7XyR7X3NxbF99X0ZJUlNU
QUNDRVBURUR9Ci4gICAgICAgIGVuZGlmCl8ke19zcWxffV9QS0c/PQlub25lCk1BS0VGTEFHUys9
ICAgICBfJHtfc3FsX31fUEtHPSR7XyR7X3NxbF99X1BLR30KLiAgICAgIGVuZGlmCgoke19zcWxf
fV9QS0c9CSR7XyR7X3NxbF99X1BLR30KCi4gICAgICBpZiAkeyR7X3NxbF99X1BLR30gPT0gIm5v
bmUiClBLR19GQUlMX1JFQVNPTj0gICAgICAgICJObyBhY2NlcHRhYmxlICR7X3NxbF99IHBhY2th
Z2UgZm91bmQuIgouICAgICAgZWxzZQouICAgICAgICBpZiAkeyR7X3NxbF99X1BLR30gID09ICJt
eXNxbDQiCi4gICAgICAgICAgaW5jbHVkZSAiLi4vLi4vZGF0YWJhc2VzL215c3FsNC1jbGllbnQv
YnVpbGRsaW5rMy5tayIKLiAgICAgICAgZWxpZiAkeyR7X3NxbF99X1BLR30gPT0gIm15c3FsIgou
ICAgICAgICAgIGluY2x1ZGUgIi4uLy4uL2RhdGFiYXNlcy9teXNxbC1jbGllbnQvYnVpbGRsaW5r
My5tayIKLiAgICAgICAgZWxpZiAkeyR7X3NxbF99X1BLR30gPT0gInBvc3RncmVzcWw3NCIKLiAg
ICAgICAgICBpbmNsdWRlICIuLi8uLi9kYXRhYmFzZXMvcG9zdGdyZXNxbDc0LWxpYi9idWlsZGxp
bmszLm1rIgouICAgICAgICBlbGlmICR7JHtfc3FsX31fUEtHfSA9PSAicG9zdGdyZXNxbCIKLiAg
ICAgICAgICBpbmNsdWRlICIuLi8uLi9kYXRhYmFzZXMvcG9zdGdyZXNxbC1saWIvYnVpbGRsaW5r
My5tayIKLiAgICAgICAgZW5kaWYKLiAgICAgIGVuZGlmCgouICAgIGVuZGlmICMgREJfVVNFXyR7
X3NxbF99Ci4gIGVuZGZvciAjIFNRTF9QS0dfTkFNRVMKLmVuZGlmICMgREFUQUJBU0VTX01LCg==

--Multipart=_Thu__10_Jun_2004_07_45_06_+0200_VtEnL0YGTe9A_Kpl--

--Signature=_Thu__10_Jun_2004_07_45_06_+0200_VbGjpWnKa5VM/a.m
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (NetBSD)

iD8DBQFAx/ViypkLYVDran0RAngoAKCOhnglhSdGBHUMtXMqCQK/k318KgCgh4TD
JCLJogaHXPYOddrhuOsPP8w=
=Lx1o
-----END PGP SIGNATURE-----

--Signature=_Thu__10_Jun_2004_07_45_06_+0200_VbGjpWnKa5VM/a.m--