aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--irc/liece/Makefile14
-rw-r--r--irc/riece-emacs21/Makefile14
-rw-r--r--irc/riece/Makefile14
3 files changed, 30 insertions, 12 deletions
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index b4dfeb915822..f91e53d05739 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -14,16 +14,16 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
-FLIM_BRANCH= 1.13
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
+FLIM_TRUNK= 1.14
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
EMACS_PORT_NAME?= emacs21
CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
DIRSECTION?= "The Emacs editor and associated tools"
INFOENTRY?= "* Liece: (liece). IRC client on Emacsen."
+.if ${EMACS_PORT_NAME} == "emacs21"
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
+.endif
+
.if ${EMACS_PORT_NAME} == xemacs21-mule
EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages
LISPDIR= ${EMACS_PACKAGESDIR}/lisp
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index b4dfeb915822..f91e53d05739 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -14,16 +14,16 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
-FLIM_BRANCH= 1.13
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
+FLIM_TRUNK= 1.14
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
EMACS_PORT_NAME?= emacs21
CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
DIRSECTION?= "The Emacs editor and associated tools"
INFOENTRY?= "* Liece: (liece). IRC client on Emacsen."
+.if ${EMACS_PORT_NAME} == "emacs21"
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
+.endif
+
.if ${EMACS_PORT_NAME} == xemacs21-mule
EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages
LISPDIR= ${EMACS_PACKAGESDIR}/lisp
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index b4dfeb915822..f91e53d05739 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -14,16 +14,16 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
-FLIM_BRANCH= 1.13
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
+FLIM_TRUNK= 1.14
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
EMACS_PORT_NAME?= emacs21
CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
DIRSECTION?= "The Emacs editor and associated tools"
INFOENTRY?= "* Liece: (liece). IRC client on Emacsen."
+.if ${EMACS_PORT_NAME} == "emacs21"
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
+.endif
+
.if ${EMACS_PORT_NAME} == xemacs21-mule
EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages
LISPDIR= ${EMACS_PACKAGESDIR}/lisp