From cf80d22f0c2870eb5efba6e1e5529ec9958bd51f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 26 Jul 2004 18:32:46 +0000 Subject: Register missing CONFLICTS, mostly on xorg-libraries-* Reported by: Kent Stewart --- x11-fonts/libXfont/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'x11-fonts/libXfont') diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index 1deaf0bbe6ee..cf8c153baa2a 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \ ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -CONFLICTS= XFree86-libraries-* +CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} -- cgit v1.2.3