Add @conflict markers. robert@ will teach php4 how to use the pear port

later.

ok robert@
This commit is contained in:
bernd 2007-05-07 13:46:59 +00:00
parent b456ec78d5
commit 66f7d340be
6 changed files with 14 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2007/03/20 11:12:22 robert Exp $
# $OpenBSD: Makefile,v 1.3 2007/05/07 13:46:59 bernd Exp $
COMMENT-main= "base classes for common PHP tasks"
COMMENT-utils= "utilities for managing pear extensions"
@ -6,8 +6,8 @@ COMMENT-utils= "utilities for managing pear extensions"
VERSION= 1.5.0
DISTNAME= pear-${VERSION}
PKGNAME= ${DISTNAME}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= pear-utils-${VERSION}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-utils= pear-utils-${VERSION}p0
CATEGORIES= www devel
EXTRACT_SUFX= .tar.bz2

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/05/07 13:46:59 bernd Exp $
@conflict php5-pear-*
@conflict php4-pear-*
@pkgpath www/php5/core,-pear
@group daemon
pear/

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-utils,v 1.2 2007/03/20 11:12:22 robert Exp $
@comment $OpenBSD: PLIST-utils,v 1.3 2007/05/07 13:46:59 bernd Exp $
@conflict php4-core-*
@group daemon
bin/pear
bin/peardev

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.35 2006/11/23 20:08:32 espie Exp $
# $OpenBSD: Makefile,v 1.36 2007/05/07 13:46:59 bernd Exp $
MULTI_PACKAGES= -main -pear
COMMENT-main= "server-side HTML-embedded scripting language"
COMMENT-pear= "base classes for common PHP tasks"
PKGNAME-main= php4-core-${V}p2
FULLPKGNAME-pear= php4-pear-${V}p1
PKGNAME-main= php4-core-${V}p3
FULLPKGNAME-pear= php4-pear-${V}p2
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--without-mysql \

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/23 20:08:33 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/05/07 13:46:59 bernd Exp $
@conflict php5-core-*
@conflict pear-utils-*
@pkgpath www/php4/core
bin/pear
bin/php

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-pear,v 1.17 2006/11/23 20:08:33 espie Exp $
@comment $OpenBSD: PLIST-pear,v 1.18 2007/05/07 13:46:59 bernd Exp $
@conflict php5-pear-*
@conflict pear-*
@group daemon
pear/
pear/build/