diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
| commit | ac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch) | |
| tree | de7ec01912bcb217296d86bd4fad9fd5b211f0cf /x11-fonts | |
| parent | 7534bc4462725b61b62a62d09f6b0c18686624b9 (diff) | |
| download | ports-ac39221672c3c391a6c127d2fcc67a1fe3d4512e.tar.gz ports-ac39221672c3c391a6c127d2fcc67a1fe3d4512e.zip | |
Upgrade X.Org ports to 6.8.2.
Release notes are available at
http://www.x.org/X11R6.8.2/doc/RELNOTES.html
Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.
Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
Matthias Muthmann), which still appears to have problems with some
keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
by Anders Nor Berle; PR ports/74757)
Notes
Notes:
svn path=/head/; revision=131533
Diffstat (limited to 'x11-fonts')
30 files changed, 62 insertions, 150 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index c7a6dc9d7bbc..4dca71e2adf0 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -55,6 +55,7 @@ do-build: -e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \ -e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + -e 's,%%XWINSYS%%,${X_WINDOW_SYSTEM:L},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \ done diff --git a/x11-fonts/intlfonts/files/DEINSTALL.tmpl b/x11-fonts/intlfonts/files/DEINSTALL.tmpl index e4eae17628cb..b6e1d96284d7 100644 --- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl +++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl @@ -15,4 +15,6 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then [ `wc -c ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale # Remove a backup file made by type1inst rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale.bak + [ "%%XWINSYS%%" = "xorg" ] && \ + (rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true) fi diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index c7ac1e4967b5..c139c7fbe115 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -38,4 +38,12 @@ do-install: post-install: @-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist index 3569af4ac13f..0f12e178b894 100644 --- a/x11-fonts/tv-fonts/pkg-plist +++ b/x11-fonts/tv-fonts/pkg-plist @@ -20,3 +20,7 @@ lib/X11/fonts/misc/teletext2.pcf.gz lib/X11/fonts/misc/teletext2i.pcf.gz lib/X11/fonts/misc/teletext4.pcf.gz lib/X11/fonts/misc/teletext4i.pcf.gz +@unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true +@unexec fc-cache -f -v %D/lib/X11/fonts/misc || true +@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi +%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 8f850a082640..2e0abd02e9f6 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.8.1 -PORTREVISION= 2 +PORTVERSION= 6.8.2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ X11R${PORTVERSION}-src2.tar.gz diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index dd8c450c9273..c775fb959477 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 -MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed -SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 +MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f +SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936 diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 5f0e1b513095..7d070d3c6d79 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -2,3 +2,4 @@ bin/xfs etc/rc.d/xfs.sh @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default +@unexec rmdir %D/lib/X11/fs 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 915b435513a9..bfdc6eefe3a4 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-100dpi/distinfo +++ b/x11-fonts/xorg-fonts-100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 deleted file mode 100644 index 8b89779ba476..000000000000 --- a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 +++ /dev/null @@ -1,56 +0,0 @@ -Index: fonts/bdf/100dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/100dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else -Index: fonts/bdf/75dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/75dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-plist b/x11-fonts/xorg-fonts-100dpi/pkg-plist index e490a38b7b26..ce6bdbade4c1 100644 --- a/x11-fonts/xorg-fonts-100dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-100dpi/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/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 18087eb74a05..c3ce61dd17d4 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-75dpi -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-75dpi/distinfo +++ b/x11-fonts/xorg-fonts-75dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 deleted file mode 100644 index 8b89779ba476..000000000000 --- a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 +++ /dev/null @@ -1,56 +0,0 @@ -Index: fonts/bdf/100dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/100dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else -Index: fonts/bdf/75dpi/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 -+++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 -@@ -11,8 +11,10 @@ - - OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) - OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) -+OBJS3 = $(DERIVEDOBJS3) -+OBJS4 = $(DERIVEDOBJS4) - --OBJS = $(OBJS1) $(OBJS2) -+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) - - FONTINSTDIR = $(FONTDIR)/75dpi - -@@ -21,6 +23,8 @@ - #ifndef LynxOSArchitecture - InstallFontObjs($(OBJS1),$(FONTINSTDIR)) - InstallFontObjs($(OBJS2),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS3),$(FONTINSTDIR)) -+InstallFontObjs($(OBJS4),$(FONTINSTDIR)) - InstallFontAliases($(FONTINSTDIR)) - InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) - #else diff --git a/x11-fonts/xorg-fonts-75dpi/pkg-plist b/x11-fonts/xorg-fonts-75dpi/pkg-plist index a6fe936f64e8..e1d7affdc256 100644 --- a/x11-fonts/xorg-fonts-75dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-75dpi/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/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index cdf25cf198b7..1cc633dc8aa6 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-cyrillic/distinfo +++ b/x11-fonts/xorg-fonts-cyrillic/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-plist b/x11-fonts/xorg-fonts-cyrillic/pkg-plist index e8570a82ca7a..fc2472baa0e6 100644 --- a/x11-fonts/xorg-fonts-cyrillic/pkg-plist +++ b/x11-fonts/xorg-fonts-cyrillic/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/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile index d5db4af45e1f..e11867a226bb 100644 --- a/x11-fonts/xorg-fonts-encodings/Makefile +++ b/x11-fonts/xorg-fonts-encodings/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-encodings -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-encodings/distinfo b/x11-fonts/xorg-fonts-encodings/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-encodings/distinfo +++ b/x11-fonts/xorg-fonts-encodings/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist index a4b627981846..029682030d33 100644 --- a/x11-fonts/xorg-fonts-encodings/pkg-plist +++ b/x11-fonts/xorg-fonts-encodings/pkg-plist @@ -3,6 +3,7 @@ lib/X11/fonts/encodings/adobe-standard.enc.gz lib/X11/fonts/encodings/adobe-symbol.enc.gz lib/X11/fonts/encodings/ansi-1251.enc lib/X11/fonts/encodings/armscii-8.enc +lib/X11/fonts/encodings/ascii-0.enc lib/X11/fonts/encodings/dec-special.enc lib/X11/fonts/encodings/encodings.dir lib/X11/fonts/encodings/ibm-cp437.enc @@ -48,3 +49,5 @@ lib/X11/fonts/encodings/suneu-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 +@unexec rmdir %D/lib/X11/fonts/encodings/large 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/encodings 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index c17b3cd7ee00..ae4446289694 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo +++ b/x11-fonts/xorg-fonts-miscbitmaps/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist b/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist index fc31cc8768d2..e058c34eb29f 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist +++ b/x11-fonts/xorg-fonts-miscbitmaps/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/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index 63917a0d98fb..4f1334b7d35f 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-truetype -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-truetype/distinfo +++ b/x11-fonts/xorg-fonts-truetype/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-truetype/pkg-plist b/x11-fonts/xorg-fonts-truetype/pkg-plist index 3e12cc2d0088..06c742ea9b1a 100644 --- a/x11-fonts/xorg-fonts-truetype/pkg-plist +++ b/x11-fonts/xorg-fonts-truetype/pkg-plist @@ -13,4 +13,5 @@ lib/X11/fonts/TTF/luxisb.ttf lib/X11/fonts/TTF/luxisbi.ttf lib/X11/fonts/TTF/luxisr.ttf lib/X11/fonts/TTF/luxisri.ttf -@unexec %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 884dd35f415b..c826bf33a4a7 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xorg-fonts-type1 -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo index 1078854f7373..e65a2428ce69 100644 --- a/x11-fonts/xorg-fonts-type1/distinfo +++ b/x11-fonts/xorg-fonts-type1/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b -SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab +SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802 diff --git a/x11-fonts/xorg-fonts-type1/pkg-plist b/x11-fonts/xorg-fonts-type1/pkg-plist index 511c20f91bcb..f0bf3f2f6cd5 100644 --- a/x11-fonts/xorg-fonts-type1/pkg-plist +++ b/x11-fonts/xorg-fonts-type1/pkg-plist @@ -58,4 +58,5 @@ lib/X11/fonts/Type1/l049033t.afm lib/X11/fonts/Type1/l049033t.pfa lib/X11/fonts/Type1/l049036t.afm lib/X11/fonts/Type1/l049036t.pfa -@unexec %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true |