diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile index ba9d5b1b6c52..7e602a3c7e89 100644 --- a/editors/bitmap-emacs20/Makefile +++ b/editors/bitmap-emacs20/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: bitmap for emacs20 -# Version required: 8.0 +# Version required: 8.1 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ MAINTAINER= shige@FreeBSD.org # distfile version -BITMAP_VER= 8.0 +BITMAP_VER= 8.1 BITMAP_PKG_VER= ${BITMAP_VER} BITMAPDOCDIR= share/doc/bitmap BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz diff --git a/editors/bitmap-emacs20/distinfo b/editors/bitmap-emacs20/distinfo index 1344fa7d38e2..765ec8bb4f94 100644 --- a/editors/bitmap-emacs20/distinfo +++ b/editors/bitmap-emacs20/distinfo @@ -1 +1 @@ -MD5 (bitmap-mule-8.0.tar.gz) = 6f385f2e18533ac95bc271a7e3078196 +MD5 (bitmap-mule-8.1.tar.gz) = dae481bd1a441ffe31c2334a0217d592 diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile index af015071b97a..a5c531a68771 100644 --- a/editors/bitmap-mule/Makefile +++ b/editors/bitmap-mule/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: bitmap for mule -# Version required: 8.0 +# Version required: 8.1 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ MAINTAINER= shige@FreeBSD.org # distfile version -BITMAP_VER= 8.0 +BITMAP_VER= 8.1 BITMAP_PKG_VER= ${BITMAP_VER} BITMAPDOCDIR= share/doc/bitmap BITMAP_SETUPEL= bitmap-setupel.el diff --git a/editors/bitmap-mule/distinfo b/editors/bitmap-mule/distinfo index 1344fa7d38e2..765ec8bb4f94 100644 --- a/editors/bitmap-mule/distinfo +++ b/editors/bitmap-mule/distinfo @@ -1 +1 @@ -MD5 (bitmap-mule-8.0.tar.gz) = 6f385f2e18533ac95bc271a7e3078196 +MD5 (bitmap-mule-8.1.tar.gz) = dae481bd1a441ffe31c2334a0217d592 diff --git a/editors/bitmap-mule/pkg-descr b/editors/bitmap-mule/pkg-descr index 8b19445bd754..6da6996f8423 100644 --- a/editors/bitmap-mule/pkg-descr +++ b/editors/bitmap-mule/pkg-descr @@ -4,7 +4,7 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule. Bitmap-mule has following modules: - bitmap.el: kernel of bitmap-mule - - bitmap-ci.el: functions for Emacs 20.3 or later + - bitmap-bi.el: functions for Emacs 20.2 or earlier - po.el: tiny BDF font editor - smiley-mule.el: smiley-mark encoder/decoder - x-face-mule.el: inline X-Face decoder diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile index ba9d5b1b6c52..7e602a3c7e89 100644 --- a/editors/bitmap/Makefile +++ b/editors/bitmap/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: bitmap for emacs20 -# Version required: 8.0 +# Version required: 8.1 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ MAINTAINER= shige@FreeBSD.org # distfile version -BITMAP_VER= 8.0 +BITMAP_VER= 8.1 BITMAP_PKG_VER= ${BITMAP_VER} BITMAPDOCDIR= share/doc/bitmap BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz diff --git a/editors/bitmap/distinfo b/editors/bitmap/distinfo index 1344fa7d38e2..765ec8bb4f94 100644 --- a/editors/bitmap/distinfo +++ b/editors/bitmap/distinfo @@ -1 +1 @@ -MD5 (bitmap-mule-8.0.tar.gz) = 6f385f2e18533ac95bc271a7e3078196 +MD5 (bitmap-mule-8.1.tar.gz) = dae481bd1a441ffe31c2334a0217d592 diff --git a/editors/bitmap/pkg-descr.mule b/editors/bitmap/pkg-descr.mule index 8b19445bd754..6da6996f8423 100644 --- a/editors/bitmap/pkg-descr.mule +++ b/editors/bitmap/pkg-descr.mule @@ -4,7 +4,7 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule. Bitmap-mule has following modules: - bitmap.el: kernel of bitmap-mule - - bitmap-ci.el: functions for Emacs 20.3 or later + - bitmap-bi.el: functions for Emacs 20.2 or earlier - po.el: tiny BDF font editor - smiley-mule.el: smiley-mark encoder/decoder - x-face-mule.el: inline X-Face decoder diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile index c4e2ee2f8b9f..230ab1b855d0 100644 --- a/x11-fonts/bitmap-fonts/Makefile +++ b/x11-fonts/bitmap-fonts/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: bitmap-font -# Version required: 8.0 +# Version required: 8.1 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # @@ -14,8 +14,8 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ MAINTAINER= shige@FreeBSD.org # distfile version -BITMAP_VER= 8.0 -BITMAP_FONT= etl8x16-bitmap +BITMAP_VER= 8.1 +BITMAP_FONT= etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap etl12x24-bitmap FONTSDIR= lib/X11/fonts/local PKGINSTALL= ${WRKDIR}/INSTALL PKGDEINSTALL= ${WRKDIR}/DEINSTALL @@ -24,12 +24,14 @@ USE_X_PREFIX= yes BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86 -PLIST_SUB= FONTSDIR=${FONTSDIR} BITMAP_FONT=${BITMAP_FONT} +PLIST_SUB= FONTSDIR=${FONTSDIR} do-build: - @(cd ${WRKSRC}; \ - bdftopcf ${BITMAP_FONT}.bdf > ${BITMAP_FONT}.pcf ; \ - ${GZIP_CMD} ${BITMAP_FONT}.pcf ; \ + @(cd ${WRKSRC}/font; \ + for i in ${BITMAP_FONT} ; do \ + bdftopcf $${i}.bdf > $${i}.pcf ; \ + ${GZIP_CMD} $${i}.pcf ; \ + done ; \ ) @for file in INSTALL DEINSTALL; do \ ${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \ @@ -42,8 +44,10 @@ pre-install: ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL do-install: - @(cd ${WRKSRC}; \ - ${INSTALL_DATA} ${BITMAP_FONT}.pcf.gz ${PREFIX}/${FONTSDIR} ; \ + @(cd ${WRKSRC}/font; \ + for i in ${BITMAP_FONT} ; do \ + ${INSTALL_DATA} $${i}.pcf.gz ${PREFIX}/${FONTSDIR} ; \ + done ; \ ) post-install: diff --git a/x11-fonts/bitmap-fonts/distinfo b/x11-fonts/bitmap-fonts/distinfo index 1344fa7d38e2..765ec8bb4f94 100644 --- a/x11-fonts/bitmap-fonts/distinfo +++ b/x11-fonts/bitmap-fonts/distinfo @@ -1 +1 @@ -MD5 (bitmap-mule-8.0.tar.gz) = 6f385f2e18533ac95bc271a7e3078196 +MD5 (bitmap-mule-8.1.tar.gz) = dae481bd1a441ffe31c2334a0217d592 diff --git a/x11-fonts/bitmap-fonts/pkg-comment b/x11-fonts/bitmap-fonts/pkg-comment index 40128b917fb7..03547860f82e 100644 --- a/x11-fonts/bitmap-fonts/pkg-comment +++ b/x11-fonts/bitmap-fonts/pkg-comment @@ -1 +1 @@ -Bitmap font, 8 dots x 16 dots bitmap font +Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font diff --git a/x11-fonts/bitmap-fonts/pkg-plist b/x11-fonts/bitmap-fonts/pkg-plist index a2e0d068876f..a7f6edca330d 100644 --- a/x11-fonts/bitmap-fonts/pkg-plist +++ b/x11-fonts/bitmap-fonts/pkg-plist @@ -1 +1,4 @@ -%%FONTSDIR%%/%%BITMAP_FONT%%.pcf.gz +%%FONTSDIR%%/etl6x12-bitmap.pcf.gz +%%FONTSDIR%%/etl7x14-bitmap.pcf.gz +%%FONTSDIR%%/etl8x16-bitmap.pcf.gz +%%FONTSDIR%%/etl12x24-bitmap.pcf.gz