aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/bitmap-fonts/Makefile17
-rw-r--r--x11-fonts/bitmap-fonts/distinfo2
-rw-r--r--x11-fonts/bitmap-fonts/pkg-plist10
3 files changed, 14 insertions, 15 deletions
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 68cf9dbda545..d06201be5a71 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bitmap-fonts
-PORTVERSION= ${BITMAP_FONTS_VER}${BITMAP_FONTS_PREVER:S/pre/.p1/}
+PORTVERSION= ${BITMAP_FONTS_VER}${BITMAP_FONTS_PREVER:S/pre/.p/}
CATEGORIES= x11-fonts elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \
ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
@@ -18,9 +18,8 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
# distfile version
BITMAP_FONTS_VER= 1.0
-BITMAP_FONTS_PREVER= pre
-BITMAP_FONTS= etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap \
- etl10x20-bitmap etl12x24-bitmap
+BITMAP_FONTS_PREVER= pre4
+BITMAP_FONTS_SIZE= 12 14 16 20 24
FONTSDIR= lib/X11/fonts/local
PKGINSTALL= ${WRKDIR}/INSTALL
PKGDEINSTALL= ${WRKDIR}/DEINSTALL
@@ -38,9 +37,9 @@ RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
do-build:
@(cd ${WRKSRC}; \
- for i in ${BITMAP_FONTS} ; do \
- bdftopcf $${i}.bdf > $${i}.pcf ; \
- ${GZIP_CMD} $${i}.pcf ; \
+ for i in ${BITMAP_FONTS_SIZE} ; do \
+ bdftopcf bitmap$${i}.bdf > bitmap$${i}.pcf ; \
+ ${GZIP_CMD} bitmap$${i}.pcf ; \
done ; \
)
@for file in INSTALL DEINSTALL; do \
@@ -54,8 +53,8 @@ pre-install:
do-install:
@(cd ${WRKSRC}; \
- for i in ${BITMAP_FONTS} ; do \
- ${INSTALL_DATA} $${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \
+ for i in ${BITMAP_FONTS_SIZE} ; do \
+ ${INSTALL_DATA} bitmap$${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \
done ; \
)
diff --git a/x11-fonts/bitmap-fonts/distinfo b/x11-fonts/bitmap-fonts/distinfo
index e090966826eb..3605e92addf7 100644
--- a/x11-fonts/bitmap-fonts/distinfo
+++ b/x11-fonts/bitmap-fonts/distinfo
@@ -1 +1 @@
-MD5 (bitmap-fonts-1.0pre.tar.gz) = e16c18d1fc02a1a1d666ca62cf81ebad
+MD5 (bitmap-fonts-1.0pre4.tar.gz) = 2e165704ae4ad08e225491a1e901f0f8
diff --git a/x11-fonts/bitmap-fonts/pkg-plist b/x11-fonts/bitmap-fonts/pkg-plist
index d28c2b1b3ec3..978493d8e11e 100644
--- a/x11-fonts/bitmap-fonts/pkg-plist
+++ b/x11-fonts/bitmap-fonts/pkg-plist
@@ -1,5 +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
+%%FONTSDIR%%/bitmap12.pcf.gz
+%%FONTSDIR%%/bitmap14.pcf.gz
+%%FONTSDIR%%/bitmap16.pcf.gz
+%%FONTSDIR%%/bitmap20.pcf.gz
+%%FONTSDIR%%/bitmap24.pcf.gz