diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2004-10-29 03:24:48 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2004-10-29 03:24:48 +0000 |
| commit | 1b9ee0e7dd5696bfef43321c8d82b22516b4f484 (patch) | |
| tree | 6f2b310e3623f81dc68e5700ce444ef61f10babf /x11 | |
| parent | 0a992ce7c9fe41f5d68b1e91bc9ce039d5332d86 (diff) | |
| download | ports-1b9ee0e7dd5696bfef43321c8d82b22516b4f484.tar.gz ports-1b9ee0e7dd5696bfef43321c8d82b22516b4f484.zip | |
Notes
Diffstat (limited to 'x11')
3 files changed, 27 insertions, 3 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 60ff619c673c..eccf0cbdeb69 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -20,8 +20,6 @@ DISTFILES= XFree86-4.4.0-src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 client programs and related files -CONFLICTS= xorg-clients-* - RUN_DEPENDS= xterm-static:${PORTSDIR}/x11/xterm LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ expat.5:${PORTSDIR}/textproc/expat2 \ @@ -29,6 +27,8 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ Xft.2:${PORTSDIR}/x11-fonts/libXft +CONFLICTS= xorg-clients-[0-9]* + SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ InstallXinitConfig=${InstallXinitConfig} \ InstallAppDefFiles=${InstallAppDefFiles} @@ -45,7 +45,9 @@ XINSTALL_MAN_DIRS= programs patch-programs::Imakefile \ patch-programs::xdm::Imakefile \ patch-programs::xdm::session.c \ - patch-programs::xdm::socket.c + patch-programs::xdm::socket.c \ + patch-programs::xkbcomp::symbols::Imakefile \ + patch-programs::xkbcomp::symbols::pc::Imakefile EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor diff --git a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile new file mode 100644 index 000000000000..ce5b56ccaa60 --- /dev/null +++ b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile @@ -0,0 +1,11 @@ +--- programs/xkbcomp/symbols/Imakefile.orig Sun Sep 19 21:29:40 2004 ++++ programs/xkbcomp/symbols/Imakefile Sun Sep 19 21:30:09 2004 +@@ -15,7 +15,7 @@ + czsk cz cz_qwerty \ + de de_CH dev dk dvorak \ + ee el en_US es \ +- fi fr fr_CH \ ++ fi fo fr fr_CH \ + gb ge_la ge_ru group guj gur \ + hr hr_US hu hu_US hu_qwerty \ + ie il il_phonetic iso9995-3 inet ir is it iu \ diff --git a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile new file mode 100644 index 000000000000..672908b004e9 --- /dev/null +++ b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile @@ -0,0 +1,11 @@ +--- programs/xkbcomp/symbols/pc/Imakefile.orig Sun Sep 19 21:31:10 2004 ++++ programs/xkbcomp/symbols/pc/Imakefile Sun Sep 19 21:31:20 2004 +@@ -7,7 +7,7 @@ + cz cz_qwerty \ + de dev dk dvorak dz \ + ee el en_US es \ +- fi fr fr-latin9 \ ++ fi fo fr fr-latin9 \ + gb ge_la ge_ru guj gur \ + hr \ + ie il il_phonetic ir is it iu \ |