summaryrefslogtreecommitdiff
path: root/editors/bitmap
diff options
context:
space:
mode:
Diffstat (limited to 'editors/bitmap')
-rw-r--r--editors/bitmap/Makefile45
-rw-r--r--editors/bitmap/distinfo2
-rw-r--r--editors/bitmap/pkg-comment.emacs211
-rw-r--r--editors/bitmap/pkg-descr.emacs204
-rw-r--r--editors/bitmap/pkg-descr.emacs2118
-rw-r--r--editors/bitmap/pkg-descr.mule4
-rw-r--r--editors/bitmap/pkg-plist.emacs2034
-rw-r--r--editors/bitmap/pkg-plist.emacs2121
-rw-r--r--editors/bitmap/pkg-plist.mule36
-rw-r--r--editors/bitmap/scripts/configure15
10 files changed, 132 insertions, 48 deletions
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index e2234ddc6754..309def7cc4c3 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: bitmap for emacs20
+# New ports collection makefile for: bitmap for emacs21
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \
DISTNAME= bitmap-mule-${BITMAP_DISTVER}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
-MAINTAINER= shige@FreeBSD.org
+MAINTAINER?= shige@FreeBSD.org
# ports version
BITMAP_VER= ${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
@@ -22,28 +22,48 @@ BITMAP_MVER= 8.4
BITMAP_DISTVER= ${BITMAP_MVER}
# variables for snapshots version
BITMAP_SNAP_PREFIX= .p
-BITMAP_SNAP= 200102280240
+BITMAP_SNAP= 200109201221
BITMAP_DISTVER= ${BITMAP_SNAP}
BITMAPDOCDIR= share/doc/bitmap
+BITMAP_SETUPEL= bitmap-setupel.el
BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz
-# emacs20
-EMACS_PORT_NAME= emacs20
+# bitmap install lispdir
+BITMAP_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+BITMAP_VERSION_SPECIFIC_LISPDIR?=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+
+# This is MASTER port.
+PORTCLASS?= master
+
+# Setup EMACS_PORT_NAME variable.
+.if (${PORTCLASS} == "master")
+EMACS_PORT_NAME= emacs21
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
+.endif
+
+EMACS_MASTERDIR_PKGFILES= YES
# target name for make build
ALL_TARGET= elc
BUILD_DEPENDS= uncompface:${PORTSDIR}/mail/faces
RUN_DEPENDS= ${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-fonts
-PLIST_SUB= BITMAPDOCDIR=${BITMAPDOCDIR}
+PLIST_SUB= BITMAPDOCDIR=${BITMAPDOCDIR} \
+ BITMAP_SETUPEL=${BITMAP_SETUPEL}
+SCRIPTS_ENV= TARGETS=${BITMAP_SETUPEL}
+MAKE_ARGS= PREFIX="${LOCALBASE}" \
+ LISPDIR="${BITMAP_LISPDIR}" \
+ VERSION_SPECIFIC_LISPDIR="${BITMAP_VERSION_SPECIFIC_LISPDIR}"
.include <bsd.port.pre.mk>
.if defined(EMACS_PORT_NAME)
# depends on apel
-BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
@@ -51,7 +71,16 @@ RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${P
@${FALSE}
.endif
+pre-configure:
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
+ @${CP} ${FILESDIR}/${BITMAP_SETUPEL}.in ${WRKDIR}
+.endif
+
post-install:
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
+ @${INSTALL_DATA} ${WRKDIR}/${BITMAP_SETUPEL} \
+ ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/${BITMAP_SETUPEL}
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
@(cd ${WRKSRC} ; \
diff --git a/editors/bitmap/distinfo b/editors/bitmap/distinfo
index e989933c8386..ce69f77693eb 100644
--- a/editors/bitmap/distinfo
+++ b/editors/bitmap/distinfo
@@ -1 +1 @@
-MD5 (bitmap-mule-200102280240.tar.gz) = c17eb6b7e9a71b188a135b528121f2a4
+MD5 (bitmap-mule-200109201221.tar.gz) = cfdee57b9a75d8639a7a7ed3b67fa612
diff --git a/editors/bitmap/pkg-comment.emacs21 b/editors/bitmap/pkg-comment.emacs21
new file mode 100644
index 000000000000..a923bbab194f
--- /dev/null
+++ b/editors/bitmap/pkg-comment.emacs21
@@ -0,0 +1 @@
+Bitmap-mule, Package to use bitmap in Emacs21
diff --git a/editors/bitmap/pkg-descr.emacs20 b/editors/bitmap/pkg-descr.emacs20
index 9073ffc9d4db..b43e6f886f61 100644
--- a/editors/bitmap/pkg-descr.emacs20
+++ b/editors/bitmap/pkg-descr.emacs20
@@ -13,6 +13,6 @@ Bitmap-mule, Package to use bitmap in Emacs20.
- vm-bitmap.el: VM related functions for x-face-mule.el
Bitmap-mule is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/bitmap/ --- Bitmap-mule
+ ${LOCALBASE}/share/emacs/20.7/site-lisp/bitmap/
---- Porting by shige <shige@FreeBSD.org>
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap/pkg-descr.emacs21 b/editors/bitmap/pkg-descr.emacs21
new file mode 100644
index 000000000000..ff431f24b422
--- /dev/null
+++ b/editors/bitmap/pkg-descr.emacs21
@@ -0,0 +1,18 @@
+Bitmap-mule, Package to use bitmap in Emacs21.
+
+ Bitmap-mule is a package to use bitmap in Emacs21.
+ Bitmap-mule has following modules:
+
+ - bitmap.el: kernel of bitmap-mule
+ - bitmap-ci.el: functions for Emacs 20.3 or later
+ - bm-utils.el: utility functions.
+ - 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:
+ ${LOCALBASE}/share/emacs/21.1/site-lisp/bitmap/
+
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap/pkg-descr.mule b/editors/bitmap/pkg-descr.mule
index a67933c35c4d..f5e26c6ccfb4 100644
--- a/editors/bitmap/pkg-descr.mule
+++ b/editors/bitmap/pkg-descr.mule
@@ -13,11 +13,11 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule.
- 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
+ ${PREFIX}/share/mule/19.34/site-lisp/bitmap/
To use bitmap-mule, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'bitmap-setupel)
---- Porting by shige <shige@FreeBSD.org>
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap/pkg-plist.emacs20 b/editors/bitmap/pkg-plist.emacs20
index 7704f170ad3a..5e3b456f3c7d 100644
--- a/editors/bitmap/pkg-plist.emacs20
+++ b/editors/bitmap/pkg-plist.emacs20
@@ -1,20 +1,20 @@
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
-%%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/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.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
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/bitmap
%%BITMAPDOCDIR%%/ChangeLog
%%BITMAPDOCDIR%%/NEWS
%%BITMAPDOCDIR%%/README.en
diff --git a/editors/bitmap/pkg-plist.emacs21 b/editors/bitmap/pkg-plist.emacs21
new file mode 100644
index 000000000000..5e3b456f3c7d
--- /dev/null
+++ b/editors/bitmap/pkg-plist.emacs21
@@ -0,0 +1,21 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/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 e2371438f8d1..153106887f97 100644
--- a/editors/bitmap/pkg-plist.mule
+++ b/editors/bitmap/pkg-plist.mule
@@ -1,21 +1,21 @@
-%%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/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.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
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
-%%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
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-bi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-bi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/bitmap
+%%EMACS_VERSION_SITE_LISPDIR%%/%%BITMAP_SETUPEL%%
%%BITMAPDOCDIR%%/ChangeLog
%%BITMAPDOCDIR%%/NEWS
%%BITMAPDOCDIR%%/README.en
diff --git a/editors/bitmap/scripts/configure b/editors/bitmap/scripts/configure
new file mode 100644
index 000000000000..ffe214ba26f5
--- /dev/null
+++ b/editors/bitmap/scripts/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+for i in ${TARGETS}
+do
+ if [ -f ${WRKDIR}/${i}.in ]; then
+ cat ${WRKDIR}/${i}.in | /usr/bin/sed \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
+ -e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
+ -e "s;@@EMACS_VER@@;${EMACS_VER};g" \
+ -e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
+ -e "s;@@EMACS_SITE_LISPDIR@@;${EMACS_SITE_LISPDIR};g" \
+ -e "s;@@EMACS_VERSION_SITE_LISPDIR@@;${EMACS_VERSION_SITE_LISPDIR};g" \
+ > ${WRKDIR}/${i}
+ fi
+done