fix the gd extension's conflict with php4; bump its no_x11 flavor's PKGNAME;

spotted and ok by naddy@
This commit is contained in:
robert 2005-03-16 21:09:21 +00:00
parent f78d86f930
commit 9e86609375
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2005/03/16 20:09:41 robert Exp $
# $OpenBSD: Makefile,v 1.7 2005/03/16 21:09:21 robert Exp $
FULLPKGNAME= php5-extensions-${V}p1
COMMENT= "informational package about PHP5 extensions"
@ -117,7 +117,7 @@ GD_WANTLIB+= X11 Xpm
. endif
. else
CONFIGURE_ARGS+= --without-xpm-dir
FULLPKGNAME-gd= php5-gd-${V}-no_x11
FULLPKGNAME-gd= php5-gd-${V}p1-no_x11
. endif
.endif

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-gd,v 1.2 2004/12/21 12:15:02 espie Exp $
@conflict php4-db-*
@comment $OpenBSD: PLIST-gd,v 1.3 2005/03/16 21:09:22 robert Exp $
@conflict php4-gd-*
lib/php/modules/gd.so