summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/Makefile12
-rw-r--r--irc/liece-emacs20/Makefile11
-rw-r--r--irc/liece/Makefile11
-rw-r--r--irc/riece-emacs20/Makefile11
-rw-r--r--irc/riece-emacs21/Makefile11
-rw-r--r--irc/riece/Makefile11
-rw-r--r--mail/emh-emacs20/Makefile6
-rw-r--r--mail/emh/Makefile6
-rw-r--r--mail/wanderlust-emacs/Makefile6
-rw-r--r--mail/wanderlust/Makefile6
-rw-r--r--news/t-gnus-emacs20/Makefile6
-rw-r--r--news/t-gnus/Makefile6
12 files changed, 52 insertions, 51 deletions
diff --git a/editors/Makefile b/editors/Makefile
index a29584fc159c..aee1712a0063 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -34,14 +34,10 @@
SUBDIR += emacs21
SUBDIR += fb
SUBDIR += fine
- SUBDIR += flim-emacs
- SUBDIR += flim-emacs-current
- SUBDIR += flim-emacs20
- SUBDIR += flim-emacs20-current
- SUBDIR += flim-mule
- SUBDIR += flim-mule-current
- SUBDIR += flim-xemacs21-mule
- SUBDIR += flim-xemacs21-mule-current
+ SUBDIR += flim113-emacs
+ SUBDIR += flim113-emacs20
+ SUBDIR += flim113-mule
+ SUBDIR += flim113-xemacs21-mule
SUBDIR += fte
SUBDIR += gate
SUBDIR += gedit
diff --git a/irc/liece-emacs20/Makefile b/irc/liece-emacs20/Makefile
index 52461d759ca7..27d6f51343bc 100644
--- a/irc/liece-emacs20/Makefile
+++ b/irc/liece-emacs20/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
EMACS_PORT_NAME?= emacs20
@@ -40,12 +40,13 @@ PLIST_SUB= EMACS_NAME=${EMACS_NAME} \
ETCDIR=${ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
PKGINFODIR=${PKGINFODIR} \
- DIRSECTION=${DIRSECTION}
+ DIRSECTION=${DIRSECTION} \
+ INFOENTRY=${INFOENTRY}
DOCS= AUTHORS lisp/ChangeLog
-FLIM_VER= 1.13.2
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_BRANCH= 1.13
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
.include <bsd.port.pre.mk>
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 52461d759ca7..27d6f51343bc 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
EMACS_PORT_NAME?= emacs20
@@ -40,12 +40,13 @@ PLIST_SUB= EMACS_NAME=${EMACS_NAME} \
ETCDIR=${ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
PKGINFODIR=${PKGINFODIR} \
- DIRSECTION=${DIRSECTION}
+ DIRSECTION=${DIRSECTION} \
+ INFOENTRY=${INFOENTRY}
DOCS= AUTHORS lisp/ChangeLog
-FLIM_VER= 1.13.2
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_BRANCH= 1.13
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
.include <bsd.port.pre.mk>
diff --git a/irc/riece-emacs20/Makefile b/irc/riece-emacs20/Makefile
index 52461d759ca7..27d6f51343bc 100644
--- a/irc/riece-emacs20/Makefile
+++ b/irc/riece-emacs20/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
EMACS_PORT_NAME?= emacs20
@@ -40,12 +40,13 @@ PLIST_SUB= EMACS_NAME=${EMACS_NAME} \
ETCDIR=${ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
PKGINFODIR=${PKGINFODIR} \
- DIRSECTION=${DIRSECTION}
+ DIRSECTION=${DIRSECTION} \
+ INFOENTRY=${INFOENTRY}
DOCS= AUTHORS lisp/ChangeLog
-FLIM_VER= 1.13.2
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_BRANCH= 1.13
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
.include <bsd.port.pre.mk>
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 52461d759ca7..27d6f51343bc 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
EMACS_PORT_NAME?= emacs20
@@ -40,12 +40,13 @@ PLIST_SUB= EMACS_NAME=${EMACS_NAME} \
ETCDIR=${ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
PKGINFODIR=${PKGINFODIR} \
- DIRSECTION=${DIRSECTION}
+ DIRSECTION=${DIRSECTION} \
+ INFOENTRY=${INFOENTRY}
DOCS= AUTHORS lisp/ChangeLog
-FLIM_VER= 1.13.2
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_BRANCH= 1.13
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
.include <bsd.port.pre.mk>
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 52461d759ca7..27d6f51343bc 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -14,9 +14,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@eken.phys.nagoya-u.ac.jp
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
EMACS_PORT_NAME?= emacs20
@@ -40,12 +40,13 @@ PLIST_SUB= EMACS_NAME=${EMACS_NAME} \
ETCDIR=${ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
PKGINFODIR=${PKGINFODIR} \
- DIRSECTION=${DIRSECTION}
+ DIRSECTION=${DIRSECTION} \
+ INFOENTRY=${INFOENTRY}
DOCS= AUTHORS lisp/ChangeLog
-FLIM_VER= 1.13.2
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_BRANCH= 1.13
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
.include <bsd.port.pre.mk>
diff --git a/mail/emh-emacs20/Makefile b/mail/emh-emacs20/Makefile
index 80a8775b3d60..d62a548fcf4b 100644
--- a/mail/emh-emacs20/Makefile
+++ b/mail/emh-emacs20/Makefile
@@ -17,9 +17,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${M
RUN_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
MIMEUI_PRODUCT?= semi
-MIMEUI_VERSION?= 1.13.7
-MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
EMACS_PORT_NAME?= emacs20
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 80a8775b3d60..d62a548fcf4b 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -17,9 +17,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${M
RUN_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
MIMEUI_PRODUCT?= semi
-MIMEUI_VERSION?= 1.13.7
-MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
EMACS_PORT_NAME?= emacs20
diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index 0275e3bf6132..7b0cdb5e2313 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -19,9 +19,9 @@ DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
MIMEUI_PRODUCT?= semi
-MIMEUI_VERSION?= 1.13.7
-MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
.if !defined (IS_SLAVE)
# for emacs19
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 0275e3bf6132..7b0cdb5e2313 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -19,9 +19,9 @@ DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
MIMEUI_PRODUCT?= semi
-MIMEUI_VERSION?= 1.13.7
-MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
.if !defined (IS_SLAVE)
# for emacs19
diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile
index 583239c46dd1..e3c5f8e174b8 100644
--- a/news/t-gnus-emacs20/Makefile
+++ b/news/t-gnus-emacs20/Makefile
@@ -22,9 +22,9 @@ CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
USE_GMAKE= yes
TGNUSVERSION= 6_14_6-04
MIMEUI_PRODUCT?=semi
-MIMEUI_VERSION?=1.13.7
-MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
EMACS_PORT_NAME?=emacs20
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index 583239c46dd1..e3c5f8e174b8 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -22,9 +22,9 @@ CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
USE_GMAKE= yes
TGNUSVERSION= 6_14_6-04
MIMEUI_PRODUCT?=semi
-MIMEUI_VERSION?=1.13.7
-MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_BRANCH?= 1.13
+MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
EMACS_PORT_NAME?=emacs20
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:15:49 +0000