summaryrefslogtreecommitdiff
path: root/editors/bitmap
diff options
context:
space:
mode:
authorShigeyuki Fukushima <shige@FreeBSD.org>1999-10-11 06:19:16 +0000
committerShigeyuki Fukushima <shige@FreeBSD.org>1999-10-11 06:19:16 +0000
commitdc2b6c0250c6beda23a3bed9d8a39e0d19ac6b35 (patch)
tree4557f0097c75368337a32eef52db52f301744c7c /editors/bitmap
parentUpdate to 1.13.2. (diff)
Update to 7.19.04.
Notes
Notes: svn path=/head/; revision=22346
Diffstat (limited to 'editors/bitmap')
-rw-r--r--editors/bitmap/Makefile29
-rw-r--r--editors/bitmap/distinfo2
-rw-r--r--editors/bitmap/files/patch-ab32
-rw-r--r--editors/bitmap/pkg-descr.emacs2010
-rw-r--r--editors/bitmap/pkg-descr.mule11
-rw-r--r--editors/bitmap/pkg-plist.emacs207
-rw-r--r--editors/bitmap/pkg-plist.mule7
7 files changed, 60 insertions, 38 deletions
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index acdd22c154bc..6fa76503da7a 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -1,23 +1,24 @@
# New ports collection makefile for: bitmap for emacs20
-# Version required: 7.18.19980702
+# Version required: 7.19.05
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bitmap-mule-${BITMAP_ORIG_VER}
+DISTNAME= bitmap-mule-${BITMAP_VENDOR}-${BITMAP_SNAPSHOT_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/bitmap-mule/snapshots/
+MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/yamaoka/bitmap/snapshots/
MAINTAINER= shige@FreeBSD.org
# distfile version
-BITMAP_ORIG_VER=19980702
-BITMAP_VER= 7.18.19980702
+BITMAP_VER= 7.19
+BITMAP_SNAPSHOT_VER= 05
+BITMAP_VENDOR= kory
+BITMAP_PKG_VER= ${BITMAP_VER}.${BITMAP_SNAPSHOT_VER}
BITMAPDOCDIR= share/doc/bitmap
BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
-WRKSRC= ${WRKDIR}/bitmap-mule
# emacs20
EMACS_NAME= emacs
@@ -29,12 +30,10 @@ EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
# target name for make build
ALL_TARGET= elc
-PKGNAME= bitmap-${EMACS_PORT}-${BITMAP_VER}
+PKGNAME= bitmap-${EMACS_PORT}-${BITMAP_PKG_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
- ${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
- ${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT} \
${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
SCRIPTS_ENV= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
@@ -43,10 +42,18 @@ PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
BITMAPDOCDIR=${BITMAPDOCDIR}
MAKE_FLAGS= EMACS=${EMACS_CMD}
+# depends on apel
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+
+# depends on flim
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/flim/std11.el:${PORTSDIR}/editors/flim-${EMACS_PORT}
+RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/flim/std11.el:${PORTSDIR}/editors/flim-${EMACS_PORT}
+
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
- @for i in ChangeLog README.* ; do \
+ @for i in ChangeLog NEWS README.* ; do \
${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
done
.endif
diff --git a/editors/bitmap/distinfo b/editors/bitmap/distinfo
index dbe0902974c8..0542d6cc8e5e 100644
--- a/editors/bitmap/distinfo
+++ b/editors/bitmap/distinfo
@@ -1 +1 @@
-MD5 (bitmap-mule-19980702.tar.gz) = 4e547bec046676a016374612de21b4ab
+MD5 (bitmap-mule-kory-05.tar.gz) = 8bdae18d05f702992fe427480a6fe9c6
diff --git a/editors/bitmap/files/patch-ab b/editors/bitmap/files/patch-ab
index 91cf46b23852..6fca06a63190 100644
--- a/editors/bitmap/files/patch-ab
+++ b/editors/bitmap/files/patch-ab
@@ -1,23 +1,15 @@
---- BITMAP-CFG.orig Sun Dec 27 23:11:27 1998
-+++ BITMAP-CFG Sun Dec 27 23:16:00 1998
-@@ -16,11 +16,15 @@
- (add-to-list 'load-path
- (expand-file-name "../../site-lisp/apel" data-directory))
+--- BITMAP-CFG.orig Wed Jul 28 20:10:09 1999
++++ BITMAP-CFG Sat Oct 9 20:43:07 1999
+@@ -20,6 +20,12 @@
+ (add-to-list 'load-path (expand-file-name "flim" LISPDIR))
+ ))
--(when (boundp 'LISPDIR)
-- (add-to-list 'default-load-path LISPDIR)
-- (add-to-list 'load-path LISPDIR)
-- (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
-- )
-+(if (boundp 'LISPDIR)
-+ (progn
-+ (add-to-list 'default-load-path LISPDIR)
-+ (add-to-list 'load-path LISPDIR)
-+ (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
-+ ))
-+
+(if (not (fboundp 'normal-top-level-add-subdirs-to-load-path))
-+ (require 'apel-setupel))
-
- (require 'install)
++ (progn
++ (require 'apel-setupel)
++ (require 'flim-setupel)
++ ))
++
+ (if (boundp 'VERSION_SPECIFIC_LISPDIR)
+ (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
diff --git a/editors/bitmap/pkg-descr.emacs20 b/editors/bitmap/pkg-descr.emacs20
index fd230bbf7f39..a4098412d5b6 100644
--- a/editors/bitmap/pkg-descr.emacs20
+++ b/editors/bitmap/pkg-descr.emacs20
@@ -3,9 +3,13 @@ Bitmap-mule, Package to use bitmap in Emacs20.
Bitmap-mule is a package to use bitmap in Emacs20.
Bitmap-mule has following modules:
- - bitmap.el: kernel of bitmap-mule
- - po.el: tiny BDF font editor
- - smiley-mule.el: smiley-mark encoder/decoder
+ - bitmap.el: kernel of bitmap-mule
+ - bitmap-ci.el: functions for Emacs 20.3 or later
+ - po.el: tiny BDF font editor
+ - smiley-mule.el: smiley-mark encoder/decoder
+ - x-face-mule.el: inline X-Face decoder
+ - gnus-bitmap.el: Gnus/gnus related functions for x-face-mule.el
+ - vm-bitmap.el: VM related functions for x-face-mule.el
Bitmap-mule is installed the following directory tree:
${PREFIX}/share/emacs/site-lisp/bitmap/ --- Bitmap-mule
diff --git a/editors/bitmap/pkg-descr.mule b/editors/bitmap/pkg-descr.mule
index 4f1b90f61fc7..8b19445bd754 100644
--- a/editors/bitmap/pkg-descr.mule
+++ b/editors/bitmap/pkg-descr.mule
@@ -3,9 +3,13 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule.
Bitmap-mule is a package to use bitmap in MULE or Emacs/mule.
Bitmap-mule has following modules:
- - bitmap.el: kernel of bitmap-mule
- - po.el: tiny BDF font editor
- - smiley-mule.el: smiley-mark encoder/decoder
+ - bitmap.el: kernel of bitmap-mule
+ - bitmap-ci.el: functions for Emacs 20.3 or later
+ - po.el: tiny BDF font editor
+ - smiley-mule.el: smiley-mark encoder/decoder
+ - x-face-mule.el: inline X-Face decoder
+ - gnus-bitmap.el: Gnus/gnus related functions for x-face-mule.el
+ - vm-bitmap.el: VM related functions for x-face-mule.el
Bitmap-mule is installed the following directory tree:
${PREFIX}/share/mule/site-lisp/bitmap/ --- Bitmap-mule
@@ -13,6 +17,7 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule.
To use bitmap-mule, put the following setup into your ~/.emacs:
(require 'apel-setupel)
+ (require 'flim-setupel)
(require 'bitmap-setupel)
--- Porting by shige <shige@FreeBSD.org>
diff --git a/editors/bitmap/pkg-plist.emacs20 b/editors/bitmap/pkg-plist.emacs20
index eb51d62ade90..ffd3133d90bd 100644
--- a/editors/bitmap/pkg-plist.emacs20
+++ b/editors/bitmap/pkg-plist.emacs20
@@ -2,11 +2,18 @@
%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.elc
+%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
+%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
+@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
+@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
%%BITMAPDOCDIR%%/ChangeLog
+%%BITMAPDOCDIR%%/NEWS
%%BITMAPDOCDIR%%/README.en
@dirrm %%BITMAPDOCDIR%%
diff --git a/editors/bitmap/pkg-plist.mule b/editors/bitmap/pkg-plist.mule
index 075d92143bb6..634aef597d1b 100644
--- a/editors/bitmap/pkg-plist.mule
+++ b/editors/bitmap/pkg-plist.mule
@@ -1,9 +1,16 @@
%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
+%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.elc
+%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
+%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
+%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%BITMAP_SETUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
%%BITMAPDOCDIR%%/ChangeLog