diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-05-31 02:13:21 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-05-31 02:13:21 +0000 |
| commit | d826c524213dda5343c988e44528ce96812eb241 (patch) | |
| tree | 6eacc93db7cb2516ecd1fee70e0a2c3acbb3531f /x11 | |
| parent | Unbreak on 4.x and get rid of USE_GCC. (diff) | |
Register CONFLICTS on new xorg ports.
Notes
Notes:
svn path=/head/; revision=110442
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-manuals/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index e15ba4a24769..2422d617e863 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -33,7 +33,7 @@ CONFLICTS= libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \ libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \ libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \ panoramixext-* printext-* randrext-* renderext-* resourceext-* \ - xextensions-* xf86ext-* xlibs-* xproto-* + xextensions-* xf86ext-* xlibs-* xorg-libraries-* xproto-* USE_X_PREFIX= no PREFIX?= ${X11BASE} diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 84cdd9df93c7..9cf48d43cee8 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -16,6 +16,8 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 man pages +CONFLICTS= xorg-manpages-* + XFREE86_VERSION= 4 USE_IMAKE= YES EXTRACT_TARGET= xc/doc/man \ |