Date: Thu, 25 Oct 2012 19:21:28 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306392 - in head: Mk databases databases/postgresql90-pgtcl databases/postgresql91-pgtcl databases/postgresql92-pgtcl Message-ID: <201210251921.q9PJLSrP028138@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Thu Oct 25 19:21:28 2012 New Revision: 306392 URL: http://svn.freebsd.org/changeset/ports/306392 Log: Stop creating duplicate packages, and add CONFLICTS Thanks to erwin for limiting the damage I caused in the meantime Feature safe: yes Modified: head/Mk/bsd.database.mk head/databases/Makefile head/databases/postgresql90-pgtcl/Makefile head/databases/postgresql91-pgtcl/Makefile head/databases/postgresql92-pgtcl/Makefile Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Thu Oct 25 18:02:31 2012 (r306391) +++ head/Mk/bsd.database.mk Thu Oct 25 19:21:28 2012 (r306392) @@ -240,7 +240,7 @@ IGNORE?= cannot install: does not work LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client -_USE_PGSQL_DEP= contrib docs pltcl plperl server +_USE_PGSQL_DEP= contrib docs pgtcl pltcl plperl server _USE_PGSQL_DEP_contrib= pgbench _USE_PGSQL_DEP_docs= postgresql-docs>0 _USE_PGSQL_DEP_pgtcl= ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Thu Oct 25 18:02:31 2012 (r306391) +++ head/databases/Makefile Thu Oct 25 19:21:28 2012 (r306392) @@ -649,18 +649,21 @@ SUBDIR += postgresql90-client SUBDIR += postgresql90-contrib SUBDIR += postgresql90-docs + SUBDIR += postgresql90-pgtcl SUBDIR += postgresql90-plperl SUBDIR += postgresql90-pltcl SUBDIR += postgresql90-server SUBDIR += postgresql91-client SUBDIR += postgresql91-contrib SUBDIR += postgresql91-docs + SUBDIR += postgresql91-pgtcl SUBDIR += postgresql91-plperl SUBDIR += postgresql91-pltcl SUBDIR += postgresql91-server SUBDIR += postgresql92-client SUBDIR += postgresql92-contrib SUBDIR += postgresql92-docs + SUBDIR += postgresql92-pgtcl SUBDIR += postgresql92-plperl SUBDIR += postgresql92-pltcl SUBDIR += postgresql92-server Modified: head/databases/postgresql90-pgtcl/Makefile ============================================================================== --- head/databases/postgresql90-pgtcl/Makefile Thu Oct 25 18:02:31 2012 (r306391) +++ head/databases/postgresql90-pgtcl/Makefile Thu Oct 25 19:21:28 2012 (r306392) @@ -1,6 +1,9 @@ # $FreeBSD$ WANT_PGSQL_VER= 90 +PKGNAMESUFFIX= -postgresql${WANT_PGSQL_VER} + +CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[12]-[0-9]* MASTERDIR= ${.CURDIR}/../pgtcl Modified: head/databases/postgresql91-pgtcl/Makefile ============================================================================== --- head/databases/postgresql91-pgtcl/Makefile Thu Oct 25 18:02:31 2012 (r306391) +++ head/databases/postgresql91-pgtcl/Makefile Thu Oct 25 19:21:28 2012 (r306392) @@ -1,6 +1,9 @@ # $FreeBSD$ WANT_PGSQL_VER= 91 +PKGNAMESUFFIX= -postgresql${WANT_PGSQL_VER} + +CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[02]-[0-9]* MASTERDIR= ${.CURDIR}/../pgtcl Modified: head/databases/postgresql92-pgtcl/Makefile ============================================================================== --- head/databases/postgresql92-pgtcl/Makefile Thu Oct 25 18:02:31 2012 (r306391) +++ head/databases/postgresql92-pgtcl/Makefile Thu Oct 25 19:21:28 2012 (r306392) @@ -1,6 +1,9 @@ # $FreeBSD$ WANT_PGSQL_VER= 92 +PKGNAMESUFFIX= -postgresql${WANT_PGSQL_VER} + +CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01]-[0-9]* MASTERDIR= ${.CURDIR}/../pgtcl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210251921.q9PJLSrP028138>