aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fonts
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2004-12-23 09:35:49 +0800
committeranholt <anholt@FreeBSD.org>2004-12-23 09:35:49 +0800
commit65440fcd9bcb20a1d534ae744432598de80568e0 (patch)
tree9c8108a587ba53bd91384e5c3a89b90f40ff9344 /x11-fonts
parent941f91a0158ef5a224f924902fa9c60d2b342648 (diff)
downloadfreebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.tar.gz
freebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.tar.zst
freebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.zip
Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been repocopied to graphics/xfree86-dri. Also note that with this commit the html manpages are going away, and with it the runtime dependency on perl for the imake port. Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt Props to: kris (multiple cluster runs and sorting through logs) lesi (fixing all the issues in those logs, and more)
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/xfs/Makefile11
-rw-r--r--x11-fonts/xfs/distinfo8
-rw-r--r--x11-fonts/xfs/pkg-plist1
-rw-r--r--x11-fonts/xorg-fonts-100dpi/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-100dpi/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-100dpi/files/patch-bug-156056
-rw-r--r--x11-fonts/xorg-fonts-75dpi/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-75dpi/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-75dpi/files/patch-bug-156056
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-encodings/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-encodings/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-encodings/pkg-plist4
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-truetype/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-truetype/distinfo4
-rw-r--r--x11-fonts/xorg-fonts-type1/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-type1/distinfo4
20 files changed, 168 insertions, 59 deletions
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 633aa5e3b32..05a37a85afd 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -6,13 +6,12 @@
#
PORTNAME= xorg-fontserver
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-servers
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTFILES= X11R6.7.0-src1.tar.gz \
- X11R6.7.0-src2.tar.gz
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
+ X11R${PORTVERSION}-src2.tar.gz
MAINTAINER= x11@FreeBSD.org
COMMENT= X font server from X.Org
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 5407fad4d65..dd8c450c927 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,4 +1,4 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
+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
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index 745bd3781c4..ce88bda544d 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,2 +1,3 @@
bin/xfs
+@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
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 58221ada604..915b435513a 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-100dpi
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org 100dpi bitmap fonts
diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-100dpi/distinfo
+++ b/x11-fonts/xorg-fonts-100dpi/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560
new file mode 100644
index 00000000000..8b89779ba47
--- /dev/null
+++ b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560
@@ -0,0 +1,56 @@
+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/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index f3c478552c2..18087eb74a0 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-75dpi
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org 75dpi bitmap fonts
diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-75dpi/distinfo
+++ b/x11-fonts/xorg-fonts-75dpi/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560
new file mode 100644
index 00000000000..8b89779ba47
--- /dev/null
+++ b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560
@@ -0,0 +1,56 @@
+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-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 4a1735acea2..cdf25cf198b 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-cyrillic
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org Cyrillic bitmap fonts
diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-cyrillic/distinfo
+++ b/x11-fonts/xorg-fonts-cyrillic/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile
index cdded6cd29e..d5db4af45e1 100644
--- a/x11-fonts/xorg-fonts-encodings/Makefile
+++ b/x11-fonts/xorg-fonts-encodings/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-encodings
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org font encoding files
diff --git a/x11-fonts/xorg-fonts-encodings/distinfo b/x11-fonts/xorg-fonts-encodings/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-encodings/distinfo
+++ b/x11-fonts/xorg-fonts-encodings/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist
index 60a995f12bc..a4b62798184 100644
--- a/x11-fonts/xorg-fonts-encodings/pkg-plist
+++ b/x11-fonts/xorg-fonts-encodings/pkg-plist
@@ -16,6 +16,9 @@ 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/cns11643-2.enc.gz
+lib/X11/fonts/encodings/large/cns11643-3.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 +44,7 @@ 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/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
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 13289263cf8..c17b3cd7ee0 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-miscbitmaps
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org miscellaneous bitmap fonts
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo
+++ b/x11-fonts/xorg-fonts-miscbitmaps/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index da9b83cbd42..63917a0d98f 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-truetype
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org TrueType fonts
diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-truetype/distinfo
+++ b/x11-fonts/xorg-fonts-truetype/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index d8df64a5bde..884dd35f415 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= xorg-fonts-type1
-PORTVERSION= 6.7.0
+PORTVERSION= 6.8.1
CATEGORIES= x11-fonts
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= R6.7/tars
-DISTNAME= X11R6.7.0-src1
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars
+DISTNAME= X11R${PORTVERSION}-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org Type1 fonts
diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo
index 3b6121dc89e..1078854f737 100644
--- a/x11-fonts/xorg-fonts-type1/distinfo
+++ b/x11-fonts/xorg-fonts-type1/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
generated by cgit (git 2.34.1) at 2025-03-06 09:12:34 +0800