aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-05-31 06:13:24 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-05-31 06:13:24 +0000
commit44848d54e4f3db72694aebc961876c92ffdf1372 (patch)
tree1a498a162dc7da73ccf586a09934e40054565208 /x11-fonts
parente1fed8d2953992cf74617d8fb4d6ea63c6d48b6c (diff)
downloadports-44848d54e4f3db72694aebc961876c92ffdf1372.tar.gz
ports-44848d54e4f3db72694aebc961876c92ffdf1372.zip
Notes
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/XFree86-4-font100dpi/Makefile2
-rw-r--r--x11-fonts/XFree86-4-font75dpi/Makefile2
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/Makefile2
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile2
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/Makefile2
-rw-r--r--x11-fonts/XFree86-4-fontScalable/Makefile2
6 files changed, 12 insertions, 0 deletions
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index 366ece1d3514..3877fb660bc9 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -19,6 +19,8 @@ COMMENT= XFree86-4 bitmap 100 dpi fonts
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+CONFLICTS= xorg-fonts-100dpi-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 1c654c381ceb..13249a193fb7 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -19,6 +19,8 @@ COMMENT= XFree86-4 bitmap 75 dpi fonts
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+CONFLICTS= xorg-fonts-75dpi-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 9d1127a63388..cbc13f62210f 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -19,6 +19,8 @@ COMMENT= XFree86-4 Cyrillic fonts
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+CONFLICTS= xorg-fonts-cyrillic-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index 11a008b7d8ec..4ba471326ee7 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -20,6 +20,8 @@ COMMENT= XFree86-4 default bitmap fonts
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+CONFLICTS= xorg-fonts-miscbitmaps-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index f687d6eff745..64f5e34d8a1b 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -18,6 +18,8 @@ COMMENT= XFree86-4 font encoding files
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
+CONFLICTS= xorg-fonts-encodings-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 81632d4ffb3e..abd68cb5fd1e 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -19,6 +19,8 @@ COMMENT= XFree86-4 scalable fonts
BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-*
+
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}