From ecf40d2a6837b577969dd569157afeaf4ab4fa83 Mon Sep 17 00:00:00 2001 From: lesi Date: Wed, 15 Jun 2005 02:40:03 +0000 Subject: Upgrade to XFree86 4.5.0. Ports changes: - Drop dependency on x11/wrapper. X server already contains this code (programs/Xserver/os/utils.c rev. 3.58). - Install default SecurityPolicy with XFree86-4-libraries, thus avoiding plists and who-owns-what complications between different fooServer ports. Copy default file to real one if that doesn't exist and remove both upon uninstall if they are the same. - Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since couple of ports break with this change (devel/imake-4/files/patch-Imake.rules) - Add grehans patches for PPC [1] - Several of directories that were previously in /etc/mtree/BSD.x11-4.dist were moved to respective ports pkg-plists PR: [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356 --- x11-fonts/XFree86-4-font100dpi/Makefile | 4 ++-- x11-fonts/XFree86-4-font100dpi/distinfo | 4 ++-- x11-fonts/XFree86-4-font100dpi/pkg-plist | 1 + x11-fonts/XFree86-4-font75dpi/Makefile | 4 ++-- x11-fonts/XFree86-4-font75dpi/distinfo | 4 ++-- x11-fonts/XFree86-4-font75dpi/pkg-plist | 1 + x11-fonts/XFree86-4-fontCyrillic/Makefile | 4 ++-- x11-fonts/XFree86-4-fontCyrillic/distinfo | 4 ++-- x11-fonts/XFree86-4-fontCyrillic/pkg-plist | 1 + x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile | 10 +++++----- x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo | 8 ++++---- x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist | 1 + x11-fonts/XFree86-4-fontEncodings/Makefile | 4 ++-- x11-fonts/XFree86-4-fontEncodings/distinfo | 4 ++-- x11-fonts/XFree86-4-fontEncodings/pkg-plist | 4 ++++ x11-fonts/XFree86-4-fontScalable/Makefile | 7 +++---- x11-fonts/XFree86-4-fontScalable/distinfo | 8 ++++---- x11-fonts/XFree86-4-fontScalable/pkg-plist | 6 ++++++ 18 files changed, 46 insertions(+), 33 deletions(-) (limited to 'x11-fonts') diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index cc18c68c45c1..5cf745b83d2f 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -6,12 +6,12 @@ # PORTNAME= font100dpi -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 bitmap 100 dpi fonts diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-font100dpi/distinfo +++ b/x11-fonts/XFree86-4-font100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-font100dpi/pkg-plist b/x11-fonts/XFree86-4-font100dpi/pkg-plist index e490a38b7b26..ce6bdbade4c1 100644 --- a/x11-fonts/XFree86-4-font100dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font100dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/100dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index f90c0f3bbc5c..0571cce61ea8 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -6,12 +6,12 @@ # PORTNAME= font75dpi -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 bitmap 75 dpi fonts diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-font75dpi/distinfo +++ b/x11-fonts/XFree86-4-font75dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-font75dpi/pkg-plist b/x11-fonts/XFree86-4-font75dpi/pkg-plist index a6fe936f64e8..e1d7affdc256 100644 --- a/x11-fonts/XFree86-4-font75dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font75dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/75dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/75dpi 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index f8f9cb348f39..3decc2f484e1 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -6,12 +6,12 @@ # PORTNAME= fontCyrillic -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 Cyrillic fonts diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/distinfo +++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist index e8570a82ca7a..fc2472baa0e6 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist +++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist @@ -84,3 +84,4 @@ lib/X11/fonts/cyrillic/koinil2.pcf.gz lib/X11/fonts/cyrillic/proof9x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16b.pcf.gz +@unexec rmdir %D/lib/X11/fonts/cyrillic 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile index daa771be138b..28f340abd17f 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile @@ -6,14 +6,14 @@ # PORTNAME= fontDefaultBitmaps -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-4.tgz -EXTRACT_ONLY= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-4.tgz +EXTRACT_ONLY= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 default bitmap fonts @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc post-extract: (cd ${WRKDIR} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/XFree86-4.4.0-src-1.tgz \ + ${DISTDIR}/${DIST_SUBDIR}/XFree86-${PORTVERSION}-src-1.tgz \ | ${TAR} -xf - xc/extras/fonts) do-configure: diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo index 77c31aba8b09..f9188477d037 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist index fc31cc8768d2..e058c34eb29f 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist @@ -411,3 +411,4 @@ lib/X11/fonts/misc/olgl10.pcf.gz lib/X11/fonts/misc/olgl12.pcf.gz lib/X11/fonts/misc/olgl14.pcf.gz lib/X11/fonts/misc/olgl19.pcf.gz +@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile index da8cf15f656c..f92ec6821769 100644 --- a/x11-fonts/XFree86-4-fontEncodings/Makefile +++ b/x11-fonts/XFree86-4-fontEncodings/Makefile @@ -6,12 +6,12 @@ # PORTNAME= fontEncodings -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font encoding files diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-fontEncodings/distinfo +++ b/x11-fonts/XFree86-4-fontEncodings/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist index 60a995f12bc5..41210b00ce0e 100644 --- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist +++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist @@ -16,6 +16,7 @@ lib/X11/fonts/encodings/iso8859-6.16.enc lib/X11/fonts/encodings/iso8859-6.8x.enc lib/X11/fonts/encodings/large/big5.eten-0.enc.gz lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz +lib/X11/fonts/encodings/large/cns11643-1.enc.gz lib/X11/fonts/encodings/large/encodings.dir lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz @@ -41,6 +42,9 @@ lib/X11/fonts/encodings/mulearabic-0.enc lib/X11/fonts/encodings/mulearabic-1.enc lib/X11/fonts/encodings/mulearabic-2.enc lib/X11/fonts/encodings/mulelao-1.enc +lib/X11/fonts/encodings/sun_eu_greek.enc lib/X11/fonts/encodings/tcvn-0.enc lib/X11/fonts/encodings/tis620-2.enc lib/X11/fonts/encodings/viscii1.1-1.enc.gz +@dirrm lib/X11/fonts/encodings/large +@dirrm lib/X11/fonts/encodings diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index 9b9a9a9c9af2..4e115e51df82 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -6,14 +6,13 @@ # PORTNAME= fontScalable -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz \ - XFree86-4.4.0-src-5.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz \ + XFree86-${PORTVERSION}-src-5.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 scalable fonts diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo index 5ad35a9bf4ee..adecc4e876fe 100644 --- a/x11-fonts/XFree86-4-fontScalable/distinfo +++ b/x11-fonts/XFree86-4-fontScalable/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 -MD5 (xc/XFree86-4.4.0-src-5.tgz) = 5c37f028efc6d54a9c725e333f9cc8ae -SIZE (xc/XFree86-4.4.0-src-5.tgz) = 4386587 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.5.0-src-5.tgz) = 598ce329eb06b8189f92704a5698253c +SIZE (xc/XFree86-4.5.0-src-5.tgz) = 4386592 diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist index 777c36610b26..fd858ea49042 100644 --- a/x11-fonts/XFree86-4-fontScalable/pkg-plist +++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist @@ -87,3 +87,9 @@ %%TYPE1:%%lib/X11/fonts/Type1/l049036t.afm %%TYPE1:%%lib/X11/fonts/Type1/l049036t.pfa @unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi +@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || true +@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/Speedo 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/CID 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true -- cgit