aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-08-25 10:35:22 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-08-25 10:35:22 +0000
commit036dd8c105cb7f94338b4e5d80f68f6e2f33b49d (patch)
tree6204e84f9bdea3944eb76a398968a1cfcd18bec6 /x11-fonts
parentd3ed5696bd848f6cfe178cc559ee873dcf754f95 (diff)
downloadports-036dd8c105cb7f94338b4e5d80f68f6e2f33b49d.tar.gz
ports-036dd8c105cb7f94338b4e5d80f68f6e2f33b49d.zip
Notes
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/XFree86-4-font100dpi/Makefile32
-rw-r--r--x11-fonts/XFree86-4-font100dpi/distinfo2
-rw-r--r--x11-fonts/XFree86-4-font75dpi/Makefile33
-rw-r--r--x11-fonts/XFree86-4-font75dpi/distinfo2
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/Makefile30
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/distinfo2
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile36
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo4
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist62
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/Makefile28
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/distinfo2
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/pkg-plist2
-rw-r--r--x11-fonts/XFree86-4-fontLatin2/Makefile30
-rw-r--r--x11-fonts/XFree86-4-fontLatin2/distinfo2
-rw-r--r--x11-fonts/XFree86-4-fontLatin2/pkg-plist3
-rw-r--r--x11-fonts/XFree86-4-fontScalable/Makefile42
-rw-r--r--x11-fonts/XFree86-4-fontScalable/distinfo2
-rw-r--r--x11-fonts/XFree86-4-fontScalable/pkg-plist1
18 files changed, 188 insertions, 127 deletions
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index fa24e91e46f6..b5de7e21f48f 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86Xfont100dpi-4.0
+# New ports collection makefile for: XFree86-4-font100dpi
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,27 +6,27 @@
#
PORTNAME= font100dpi
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
-RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS= ${X11_BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/bdf/100dpi
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/bdf/100dpi
do-configure:
(cd ${WRKDIR}/xc/fonts/encodings && \
diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-font100dpi/distinfo
+++ b/x11-fonts/XFree86-4-font100dpi/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 5b8bd16a980d..6b9cbf9d54ec 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86Xfont75dpi-4.0
+# New ports collection makefile for: XFree86-4-font75dpi
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,27 +6,27 @@
#
PORTNAME= font75dpi
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/bdf/75dpi
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/bdf/75dpi
do-configure:
(cd ${WRKDIR}/xc/fonts/encodings && \
@@ -46,7 +46,4 @@ pre-build:
(cd ${WRKDIR}/xc/fonts/encodings && \
${MAKE} all)
-post-install:
- @echo "DEBUG: PREFIX=${PREFIX}"
-
.include <bsd.port.mk>
diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-font75dpi/distinfo
+++ b/x11-fonts/XFree86-4-font75dpi/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 2a6b854465c3..30b8f1090c70 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86XfontCyrillic-4.0
+# New ports collection makefile for: XFree86-4-fontCyrillic
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,27 +6,27 @@
#
PORTNAME= fontCyrillic
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic
do-configure:
(cd ${WRKDIR}/xc/fonts/encodings && \
diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/distinfo
+++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index d2e531b12c3b..ed52733ed0c5 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86XfontDefaultBitmap-4.0
+# New ports collection makefile for: XFree86-4-fontDefaultBitmap
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,34 +6,34 @@
#
PORTNAME= fontDefaultBitmap
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-1.tgz X400src-2.tgz
-EXTRACT_ONLY= X400src-2.tgz
+DISTFILES= X401src-1.tgz X401src-2.tgz
+EXTRACT_ONLY= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc
post-extract:
(cd ${WRKDIR} && \
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${DISTDIR}/${DIST_SUBDIR}/X400src-1.tgz \
- ${EXTRACT_AFTER_ARGS} xc/extras/fonts)
+ ${DISTDIR}/${DIST_SUBDIR}/X401src-1.tgz \
+ | ${TAR} -xf - xc/extras/fonts)
do-configure:
(cd ${WRKDIR}/xc/fonts/encodings && \
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
index 98920201219e..d88dbd78fa11 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
index 24e5b6897a1e..3d6ba789ca1c 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@@ -1,3 +1,65 @@
+lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13O.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13O.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13O.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/18x18ko.pcf.gz
lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
lib/X11/fonts/misc/10x20.pcf.gz
lib/X11/fonts/misc/12x13ja.pcf.gz
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index e734bff979c9..86332c1a53fb 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -6,26 +6,26 @@
#
PORTNAME= fontEncodings
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/encodings
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/encodings
do-configure:
(cd ${WRKSRC} && \
diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-fontEncodings/distinfo
+++ b/x11-fonts/XFree86-4-fontEncodings/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
index 3207ab16400d..a22a38718b2a 100644
--- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist
+++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
@@ -31,5 +31,3 @@ lib/X11/fonts/encodings/mulearabic-2.enc
lib/X11/fonts/encodings/mulelao-1.enc
lib/X11/fonts/encodings/tcvn-0.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-fontLatin2/Makefile b/x11-fonts/XFree86-4-fontLatin2/Makefile
index 01c0fc738603..763c675c1721 100644
--- a/x11-fonts/XFree86-4-fontLatin2/Makefile
+++ b/x11-fonts/XFree86-4-fontLatin2/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86XfontLatin2-4.0
+# New ports collection makefile for: XFree86-4-fontLatin2
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,27 +6,27 @@
#
PORTNAME= fontLatin2
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts/bdf/latin2
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts/bdf/latin2
# User Config:
# If you want to disable 100dpi font, set following variable to "NO"
Build100DpiFonts?= YES
diff --git a/x11-fonts/XFree86-4-fontLatin2/distinfo b/x11-fonts/XFree86-4-fontLatin2/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-fontLatin2/distinfo
+++ b/x11-fonts/XFree86-4-fontLatin2/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontLatin2/pkg-plist b/x11-fonts/XFree86-4-fontLatin2/pkg-plist
index 429cc8721ac2..633ec1df61e3 100644
--- a/x11-fonts/XFree86-4-fontLatin2/pkg-plist
+++ b/x11-fonts/XFree86-4-fontLatin2/pkg-plist
@@ -332,6 +332,3 @@ lib/X11/fonts/latin2/75dpi/timR12.pcf.gz
lib/X11/fonts/latin2/75dpi/timR14.pcf.gz
lib/X11/fonts/latin2/75dpi/timR18.pcf.gz
lib/X11/fonts/latin2/75dpi/timR24.pcf.gz
-@dirrm lib/X11/fonts/latin2/100dpi
-@dirrm lib/X11/fonts/latin2/75dpi
-@dirrm lib/X11/fonts/latin2
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 42f8fca0318c..17cef02dc6fd 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: XFree86XfontScalable-4.0
+# New ports collection makefile for: XFree86-4-fontScalable
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
@@ -6,27 +6,33 @@
#
PORTNAME= fontScalable
-PORTVERSION= 4.0
+PORTVERSION= 4.0.1
CATEGORIES= x11-fonts
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
PKGNAMEPREFIX= XFree86-
-DISTFILES= X400src-2.tgz
+DISTFILES= X401src-2.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 \
- mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-PREFIX?= ${X11BASE}
-PROJECTROOT= -DProjectRoot=${PREFIX}
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/fonts
+XFREE86_VERSION= 4
+USE_IMAKE= YES
+PROJECTROOT= -DProjectRoot=${PREFIX}
+DIST_SUBDIR= xc
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts
+WRKSRC= ${WRKDIR}/xc/fonts
+# User Config:
+# To disable following fonts, set variable to "NO"
+BuildSpeedoFonts?= YES
+BuildType1Fonts?= YES
+BuildCIDFonts?= YES
+BuildTTFonts?= YES
do-configure:
(cd ${WRKDIR}/xc/fonts/encodings && \
@@ -37,8 +43,10 @@ do-configure:
${MAKE} depend)
(cd ${WRKSRC} && \
imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
- -DBuildSpeedoFonts=YES -DBuildType1Fonts=YES \
- -DBuildCIDFonts=YES -DBuildTTFonts=YES \
+ -DBuildSpeedoFonts=${BuildSpeedoFonts} \
+ -DBuildType1Fonts=${BuildType1Fonts} \
+ -DBuildCIDFonts=${BuildCIDFonts} \
+ -DBuildTTFonts=${BuildTTFonts} \
-DMakeLocalFontDir=YES \
-DFreeBSDBuildXscl=YES \
-DTOPDIR=.. -DCURDIR=.; \
diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo
index c25030bdcf52..1102a3a2abd1 100644
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist
index 4fb55d43fcd6..66e739af014b 100644
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@@ -61,5 +61,4 @@ lib/X11/fonts/Type1/lcdxso.afm
lib/X11/fonts/Type1/lcdxso.pfa
lib/X11/fonts/Type1/lcdxsr.afm
lib/X11/fonts/Type1/lcdxsr.pfa
-@dirrm lib/X11/fonts/CID
@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