diff options
| author | hubertf <hubertf> | 1999-02-20 22:48:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-02-20 22:48:24 +0000 |
| commit | a4cbe4cb0445443d02c5d3c6f788d17367537b92 (patch) | |
| tree | f0ac98b899382f539e1e39385f1316edd18626bd /databases | |
| parent | 878b71762a717be3626e0baac746b75c52f812b6 (diff) | |
| download | pkgsrc-a4cbe4cb0445443d02c5d3c6f788d17367537b92.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql/Makefile | 4 | ||||
| -rw-r--r-- | databases/py-mysql/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 6bac0d8bfc0..4efb9187b57 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/02/04 21:35:01 frueauf Exp $ +# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:25 hubertf Exp $ # # note: if updated, update shlib version number in patch-aa @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.21/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.tcx.se/ -CONFLICTS= mysql-3.21.31 mysql-3.21.32a mysql-3.21.33 - NO_CDROM= "Restrictive license." MYSQL_DATADIR?= /var/mysql diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile index b660e062433..6582e60b5ee 100644 --- a/databases/py-mysql/Makefile +++ b/databases/py-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/12/18 00:42:39 tsarna Exp $ +# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:25 hubertf Exp $ DISTNAME= MySQLmodule-1.4 PKGNAME= py-mysql-1.4 @@ -13,8 +13,6 @@ HOMEPAGE= http://snail.earthlight.co.nz/projects.html DEPENDS+= python-1.5.1:../../lang/python \ mysql>=3.21:../../databases/mysql -CONFLICTS= py-mysql-1.1 - EXTRACT_ONLY= MySQLmodule-1.4${EXTRACT_SUFX} ALL_TARGET= default |