aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/xemacs21-mule-common/Makefile12
-rw-r--r--editors/xemacs21-mule-common/pkg-descr4
-rw-r--r--editors/xemacs21-mule-common/pkg-install2
-rw-r--r--editors/xemacs21-mule/Makefile91
-rw-r--r--editors/xemacs21-mule/pkg-descr4
-rw-r--r--editors/xemacs21-mule/pkg-plist1
-rw-r--r--japanese/xemacs21-canna/pkg-descr4
7 files changed, 59 insertions, 59 deletions
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 2ebf011baed8..5e754081d8f6 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -84,11 +84,11 @@ post-install::
fi
@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
-# for make DESCR and COMMENT (only maintainer use)
-pre-arrange::
- ${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
- -e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
- ${INSTALL_TMPL} > ${PKGINSTALL}
- ${CHOWN} kiri:staff ${PKGINSTALL}
+## for make DESCR and COMMENT (only maintainer use)
+#pre-arrange::
+# ${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+# -e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
+# ${INSTALL_TMPL} > ${PKGINSTALL}
+# ${CHOWN} kiri:staff ${PKGINSTALL}
.include "${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/Makefile"
diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index 2ae58cf88599..30eb00ab1707 100644
--- a/editors/xemacs21-mule-common/pkg-descr
+++ b/editors/xemacs21-mule-common/pkg-descr
@@ -1,9 +1,9 @@
This is XEmacs lisp files, info pages, and so on (except executables)
-for XEmacs with Mule(version 21.1.8), the next generation of Emacs.
+for XEmacs with Mule(version 21.1.9), the next generation of Emacs.
You must install one of packages, xemacs-mule-21.1,
ja-xemacs-*-21.1 (ja-xemacs-canna-21.1, ja-xemacs-canna+wnn4-21.1, etc.),
-each of which contains only the executables for XEmacs with Mule(vresion 21.1.8).
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.9).
This package and the above package of the executables *will* clobber any
existing XEmacs installation. In particular, the executables and man
diff --git a/editors/xemacs21-mule-common/pkg-install b/editors/xemacs21-mule-common/pkg-install
index b3f8e41baeef..f50fc365f2a9 100644
--- a/editors/xemacs21-mule-common/pkg-install
+++ b/editors/xemacs21-mule-common/pkg-install
@@ -3,5 +3,5 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
echo "################################################################"
echo "You must install one of packages, xemacs-mule and "
echo " ja-xemacs-*-21.1 (ja-xemacs-21.1, ja-xemacs-canna-21.1, etc.)"
-echo ", each of which contains only the executables for XEmacs(version 21.1.8)"
+echo ", each of which contains only the executables for XEmacs(version 21.1.9)"
echo "################################################################"
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 89b5de6c5da9..ed929f3a5fe7 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -27,14 +27,14 @@ MULE_SLAVE= yes
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
-BUILD_DEPENDS= ${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
- ${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages \
+BUILD_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
+ ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages \
${BUILD_INPUT_METHOD}
.if defined(MULE_SLAVE)
-RUN_DEPENDS= ${PREFIX}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule-common \
- ${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule-common \
+ ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
.else
-RUN_DEPENDS= ${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
.endif
LIB_DEPENDS= compface.1:${PORTSDIR}/mail/faces \
${LIB_INPUT_METHOD}
@@ -70,6 +70,7 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
STRIP=
INSTALL_TARGET?=install-arch-dep
FILESDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
+PATCHDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/patches
PLIST?= ${PKGLDIR}/PLIST
XEMACS_MAJOR_VER?= 21
@@ -104,45 +105,45 @@ post-install::
post-package:
@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
-# for make DESCR and COMMENT (only maintainer use)
-pre-arrange::
- @${MKDIR} ${PKGDIR}
- @${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
-.if (${PKGNAMEEXT} == "-canna") || (${PKGNAMEEXT} == "-mule") || (${PKGNAMEEXT} == "-mule-common")
- @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
- -e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
- -e "s/%%XEMACS_MAJOR_VER%%/${XEMACS_MAJOR_VER}/g" \
- ${DESCR_TMPL} > ${DESCR}
-.endif
- ${CHOWN} kiri:staff ${COMMENT} ${DESCR}
-
-# for make PLIST (only maintainer use)
-arrange::
-.if (${PKGNAMEEXT} == "-mule")||(${PKGNAMEEXT} == "-mule-common")
- ${RM} -f ${PLIST}
-.if (${PKGNAMEEXT} == "-mule")
- ${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
- DIRRMDEPTH=2 plist
-.endif
-.if (${PKGNAMEEXT} == "-mule-common")
- ${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" DIRRMDEPTH=1 plist
-.for dirp in site mule xemacs
-.for dir in etc info man pkginfo
- ${ECHO} "@exec mkdir -p %D/lib/xemacs/${dirp}-packages/${dir}" >> ${PLIST}
- ${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages/${dir} 2>/dev/null || true" >> ${PLIST}
-.endfor
- ${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages 2>/dev/null || true" >> ${PLIST}
-.endfor
- ${ECHO} "@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock" >> ${PLIST}
-.endif
- ${CAT} ${WRKPLIST} >> ${PLIST}
- ${CHOWN} kiri:staff ${PLIST}
-.endif
-
-.if (${PKGNAMEEXT} != "-mule-common")
-pre-plist:
- ${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults
-.endif
-
+## for make DESCR and COMMENT (only maintainer use)
+#pre-arrange::
+# @${MKDIR} ${PKGDIR}
+# @${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
+#.if (${PKGNAMEEXT} == "-canna") || (${PKGNAMEEXT} == "-mule") || (${PKGNAMEEXT} == "-mule-common")
+# @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+# -e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
+# -e "s/%%XEMACS_MAJOR_VER%%/${XEMACS_MAJOR_VER}/g" \
+# ${DESCR_TMPL} > ${DESCR}
+#.endif
+# ${CHOWN} kiri:staff ${COMMENT} ${DESCR}
+#
+## for make PLIST (only maintainer use)
+#arrange::
+#.if (${PKGNAMEEXT} == "-mule")||(${PKGNAMEEXT} == "-mule-common")
+# ${RM} -f ${PLIST}
+#.if (${PKGNAMEEXT} == "-mule")
+# ${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
+# DIRRMDEPTH=2 plist
+#.endif
+#.if (${PKGNAMEEXT} == "-mule-common")
+# ${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" DIRRMDEPTH=1 plist
+#.for dirp in site mule xemacs
+#.for dir in etc info man pkginfo
+# ${ECHO} "@exec mkdir -p %D/lib/xemacs/${dirp}-packages/${dir}" >> ${PLIST}
+# ${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages/${dir} 2>/dev/null || true" >> ${PLIST}
+#.endfor
+# ${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages 2>/dev/null || true" >> ${PLIST}
+#.endfor
+# ${ECHO} "@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock" >> ${PLIST}
+# ${CAT} ${WRKPLIST} >> ${PLIST}
+# ${CHOWN} kiri:staff ${PLIST}
+#.endif
+#.endif
+#
+#.if (${PKGNAMEEXT} != "-mule-common")
+#pre-plist:
+# @${ECHO} "===> pre-plist of ${PKGNAME}"
+# ${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults
+#.endif
.include "${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/Makefile"
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index 3e1f56a9227f..650ed8d32c4c 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -1,9 +1,9 @@
This is a package containing only the executables for XEmacs with
-Mule(version 21.1.8), the next generation of Emacs.
+Mule(version 21.1.9), the next generation of Emacs.
You need to install a package, xemacs-common-21.1, containing emacs
lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.8).
+XEmacs with Mule(version 21.1.9).
This package is not built with any particular language support except for
already built-in Imput Method - SKK and SJ3. If you want other built-in
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index aebe68a899dc..b97b3c998b7e 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -5,7 +5,6 @@ bin/gnuattach
bin/gnuclient
bin/gnudoit
bin/ootags
-bin/pstogif
bin/rcs-checkin
bin/xemacs
bin/xemacs-%%XEMACS_VER%%
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
index fcc78d904841..ef0115b9751d 100644
--- a/japanese/xemacs21-canna/pkg-descr
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -1,9 +1,9 @@
This is a package containing only the executables for XEmacs with
-Mule(version 21.1.8), the next generation of Emacs.
+Mule(version 21.1.9), the next generation of Emacs.
You need to install a package, xemacs-common-21.1, containing emacs
lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.8).
+XEmacs with Mule(version 21.1.9).
This package is built with Japanese support by using SKK, SJ3, Canna,
Wnn4 or Wnn6 as an external input engine. Each input method would be
generated by cgit (git 2.34.1) at 2024-11-27 17:37:39 +0800