diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-26 18:32:46 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-26 18:32:46 +0000 |
| commit | cf80d22f0c2870eb5efba6e1e5529ec9958bd51f (patch) | |
| tree | 80753c1ca698256a05918ac0ebf81cfa69560399 /x11-toolkits | |
| parent | * Replace scripts/configure with OPTIONS [1] (diff) | |
Register missing CONFLICTS, mostly on xorg-libraries-*
Reported by: Kent Stewart <kstewart@owt.com>
Notes
Notes:
svn path=/head/; revision=114790
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/libXaw/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/libXmu/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/libXt/Makefile | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 5889141037e7..2a539d733945 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -22,6 +22,8 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \ ${LIB_PC_DEPENDS} RUN_DEPENDS= ${LIB_PC_DEPENDS} +CONFLICTS= XFree86-libraries-* xorg-libraries-* + USE_BZIP2= yes PREFIX?= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11-4.dist diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 69a1852d6f98..560ab485c340 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -18,6 +18,8 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ BUILD_DEPENDS= ${LIB_PC_DEPENDS} RUN_DEPENDS= ${LIB_PC_DEPENDS} +CONFLICTS= XFree86-libraries-* xorg-libraries-* + USE_BZIP2= yes PREFIX?= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11-4.dist diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index d8edc6586f38..67409fb95f01 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \ ${LIB_PC_DEPENDS} RUN_DEPENDS= ${LIB_PC_DEPENDS} -CONFLICTS= XFree86-libraries-* +CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} |