aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/bitmap-fonts/Makefile38
-rw-r--r--x11-fonts/bitmap-fonts/distinfo2
-rw-r--r--x11-fonts/bitmap-fonts/pkg-plist1
3 files changed, 23 insertions, 18 deletions
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index cef566e8aa12..a37ce1accb77 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -1,34 +1,38 @@
-# New ports collection makefile for: bitmap-font
+# New ports collection makefile for: bitmap-fonts
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= bitmap-font
-PORTVERSION= ${BITMAP_VER}
+PORTNAME= bitmap-fonts
+PORTVERSION= ${BITMAP_FONTS_VER}${BITMAP_FONTS_PREVER:S/pre/.p1/}
CATEGORIES= x11-fonts elisp
-MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/
-DISTNAME= bitmap-mule-${BITMAP_VER}
+MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \
+ ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
+DISTNAME= ${PORTNAME}-${BITMAP_FONTS_VER}${BITMAP_FONTS_PREVER}
MAINTAINER= shige@FreeBSD.org
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
# distfile version
-BITMAP_VER= 8.3
-BITMAP_FONT= etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap etl12x24-bitmap
-FONTSDIR= lib/X11/fonts/local
-PKGINSTALL= ${WRKDIR}/INSTALL
-PKGDEINSTALL= ${WRKDIR}/DEINSTALL
+BITMAP_FONTS_VER= 1.0
+BITMAP_FONTS_PREVER= pre
+BITMAP_FONTS= etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap \
+ etl10x20-bitmap etl12x24-bitmap
+FONTSDIR= lib/X11/fonts/local
+PKGINSTALL= ${WRKDIR}/INSTALL
+PKGDEINSTALL= ${WRKDIR}/DEINSTALL
+WRKSRC= ${WRKDIR}
USE_X_PREFIX= yes
PLIST_SUB= FONTSDIR=${FONTSDIR}
do-build:
- @(cd ${WRKSRC}/font; \
- for i in ${BITMAP_FONT} ; do \
+ @(cd ${WRKSRC}; \
+ for i in ${BITMAP_FONTS} ; do \
bdftopcf $${i}.bdf > $${i}.pcf ; \
${GZIP_CMD} $${i}.pcf ; \
done ; \
@@ -39,18 +43,18 @@ do-build:
done
pre-install:
- @${SETENV} PKG_PREFIX=${PREFIX} \
+ @${SETENV} PKG_PREFIX=${X11BASE} \
${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
do-install:
- @(cd ${WRKSRC}/font; \
- for i in ${BITMAP_FONT} ; do \
- ${INSTALL_DATA} $${i}.pcf.gz ${PREFIX}/${FONTSDIR} ; \
+ @(cd ${WRKSRC}; \
+ for i in ${BITMAP_FONTS} ; do \
+ ${INSTALL_DATA} $${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \
done ; \
)
post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} \
+ @${SETENV} PKG_PREFIX=${X11BASE} \
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/x11-fonts/bitmap-fonts/distinfo b/x11-fonts/bitmap-fonts/distinfo
index 54c6b669dec7..e090966826eb 100644
--- a/x11-fonts/bitmap-fonts/distinfo
+++ b/x11-fonts/bitmap-fonts/distinfo
@@ -1 +1 @@
-MD5 (bitmap-mule-8.3.tar.gz) = b5e6a7421630c0f3a39f7f7bb6485c3f
+MD5 (bitmap-fonts-1.0pre.tar.gz) = e16c18d1fc02a1a1d666ca62cf81ebad
diff --git a/x11-fonts/bitmap-fonts/pkg-plist b/x11-fonts/bitmap-fonts/pkg-plist
index a7f6edca330d..d28c2b1b3ec3 100644
--- a/x11-fonts/bitmap-fonts/pkg-plist
+++ b/x11-fonts/bitmap-fonts/pkg-plist
@@ -1,4 +1,5 @@
%%FONTSDIR%%/etl6x12-bitmap.pcf.gz
%%FONTSDIR%%/etl7x14-bitmap.pcf.gz
%%FONTSDIR%%/etl8x16-bitmap.pcf.gz
+%%FONTSDIR%%/etl10x20-bitmap.pcf.gz
%%FONTSDIR%%/etl12x24-bitmap.pcf.gz