Page MenuHomeFreeBSD
Files F140687889

D13506.id37107.diff
No OneTemporary
Actions

D13506.id37107.diff
View Options

Index: Mk/bsd.emacs.mk
===================================================================
--- Mk/bsd.emacs.mk
+++ Mk/bsd.emacs.mk
@@ -1,19 +1,13 @@
+#-*- tab-width: 4; -*-
+# ex:ts=4
#
-# $FreeBSD$
-#
-# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
+# $FreeBSD$
+# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
-Emacs_Include= bsd.emacs.mk
+Emacs_Include= bsd.emacs.mk
Emacs_Include_MAINTAINER= ashish@FreeBSD.org
-EMACS_PORT_NAME?= emacs25
-
-#
-# This file for ports which depend on emacs family.
-# Define EMACS_PORT_NAME variable before bsd.port.[pre.]mk
-# and it will automatically include this file.
-#
# This file exports the following common variables:
#
# EMACS_NAME:
@@ -40,7 +34,7 @@
# EMACS_CMD:
# emacsen's command-line filename. (full path)
# ex.) "/usr/local/bin/emacs-20.6" when emacsen is a
-# emacs-20.6 and ${PREFIX} is "/usr/local".
+# emacs-20.6 and ${PREFIX} is "/usr/local".
#
# EMACS_SITE_LISPDIR:
# emacsen's site-lisp directory name without ${PREFIX}.
@@ -59,75 +53,53 @@
# EMACS_NO_RUN_DEPENDS:
# If set "YES" to this variable, port does not
# run-depend on EMACS_PORT_NAME's emacsen.
-#
-EMACS_MASTERDIR_PKGFILES?= NO
+.if defined(EMACS_NO_FLAVORS)
+FLAVORS= full
+.else
+FLAVORS= full canna lite devel_full devel_lite
+.for flavor in ${EMACS_EXCLUDE_FLAVORS}
+FLAVORS:= ${FLAVORS:N${flavor}}
+.endfor
+.endif
+
+EMACS_FLAVOR= ${FLAVOR}
-# Emacs-25.x
-.if (${EMACS_PORT_NAME} == "emacs25")
-EMACS_NAME= emacs
-EMACS_VER= 25.3
-EMACS_MAJOR_VER= 25
-EMACS_LIBDIR?= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
+.if ${FLAVOR:Mdevel*}
+EMACS_VER= 27.0.50
+EMACS_PORTDIR= editors/emacs-devel
+.else
+EMACS_VER= 25.3
EMACS_PORTDIR= editors/emacs
-EMACS_COMMON_PORT= NO
-EMACS_HAS_MULE= YES
-EMACS_NO_SUBDIRSEL= NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.endif
-# Emacs-26.x (development version)
-.elif (${EMACS_PORT_NAME} == "emacs-devel")
-EMACS_NAME= emacs
-EMACS_VER= 27.0.50
-EMACS_MAJOR_VER= 27
+EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//}
+EMACS_NAME= emacs
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTDIR= editors/emacs-devel
-EMACS_COMMON_PORT= NO
-EMACS_HAS_MULE= YES
-EMACS_NO_SUBDIRSEL= NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
-.elif (${EMACS_PORT_NAME} == "emacs-nox11")
-EMACS_NAME= emacs
-EMACS_VER= 25.3
-EMACS_MAJOR_VER= 25
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTDIR= editors/emacs-nox11
-EMACS_COMMON_PORT= NO
EMACS_HAS_MULE= YES
EMACS_NO_SUBDIRSEL= NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER}
+.if defined(EMACS_MASTERDIR_PKGFILES)
COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.endif
+.if ${FLAVOR:M*lite}
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_lite
+.elif ${FLAVOR:Mcanna}
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_canna
.else
-check-makevars::
- @${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
- @${ECHO} "Valid values are:"
- @${ECHO} " Emacs family: emacs25 emacs-devel emacs-nox11"
- @${FALSE}
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}
.endif
-
#
# Common Definitions
#
-# find where emacsen is installed
-# look for it in PREFIX first and fall back to LOCALBASE then
+# find where emacs is installed
+# look for it in PREFIX first, then fall back to LOCALBASE
.if exists(/bin/${EMACS_NAME}-${EMACS_VER})
EMACS_BASE?= ${PREFIX}
.else
@@ -142,18 +114,11 @@
EMACS_SITE_LISPDIR?= ${EMACS_LIBDIR}/site-lisp
EMACS_VERSION_SITE_LISPDIR?= ${EMACS_LIBDIR_WITH_VER}/site-lisp
-# build&run-dependency
-EMACS_NO_BUILD_DEPENDS?= NO
-EMACS_NO_RUN_DEPENDS?= NO
-.if (${EMACS_NO_BUILD_DEPENDS} == "NO")
-BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}
-.endif
-.if (${EMACS_NO_RUN_DEPENDS} == "NO")
-.if defined(EMACS_COMMON_PORT) && (${EMACS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_COREEL}:${EMACS_PORTDIR}-common
-.else
-RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}
+.if !defined(EMACS_NO_BUILD_DEPENDS)
+BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
.endif
+.if !defined(EMACS_NO_RUN_DEPENDS)
+RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
.endif
# environments for build
Index: audio/emms/Makefile
===================================================================
--- audio/emms/Makefile
+++ audio/emms/Makefile
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= emms
-PORTVERSION= 4.3
-PORTREVISION= 1
+DISTVERSION= 4.3
+PORTREVISION= 2
CATEGORIES= audio elisp
MASTER_SITES= GNU
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= The Emacs Multi-Media System
@@ -14,17 +15,12 @@
USES= gmake makeinfo
USE_EMACS= yes
+
MAKE_ENV= SITELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/emms" \
INSTALLINFO="${TRUE}"
INFO= emms
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} != "emacs25"
-PORTNAMESUFFIX= ${PKGNAMESUFFIX}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|^\(DESTDIR\)=|\1?=| ; \
@@ -37,4 +33,4 @@
s| \($$(INFODIR)\)| $$(DESTDIR)\1|g ; \
s| \($$(MAN1DIR)\)| $$(DESTDIR)\1|g' ${WRKSRC}/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: cad/dinotrace/Makefile
===================================================================
--- cad/dinotrace/Makefile
+++ cad/dinotrace/Makefile
@@ -2,36 +2,34 @@
# $FreeBSD$
PORTNAME= dinotrace
-PORTVERSION= 9.4c
-PORTREVISION= 5
+DISTVERSION= 9.4c
+PORTREVISION= 6
CATEGORIES= cad
MASTER_SITES= http://www.veripool.org/ftp/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical signal trace waveform viewer
-OPTIONS_DEFINE= EMACS
-OPTIONS_DEFAULT= EMACS
-EMACS_DESC= Install Emacs supplimentary files
+LICENSE= GPLv3+
-USE_XORG= x11 sm ice xmu xt
USES= gmake motif perl5 tar:tgz
+USE_XORG= x11 sm ice xmu xt
USE_PERL5= build
+
GNU_CONFIGURE= yes
INFO= dinotrace
PLIST_FILES= bin/dinotrace
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= EMACS
+OPTIONS_DEFAULT= EMACS
+EMACS_DESC= Install Emacs supplimentary files
-.if ${PORT_OPTIONS:MEMACS}
-RUN_DEPENDS+= verilog-mode.el>0:cad/verilog-mode.el
-USE_EMACS= yes
-EMACS_NO_BUILD_DEPENDS= yes
-.for F in dinotrace.el sim-log.el
-PLIST_FILES+= ${EMACS_SITE_LISPDIR}/${F}
-.endfor
-.endif
+EMACS_USE= emacs=yes
+EMACS_VARS= EMACS_NO_BUILD_DEPENDS= yes
+EMACS_RUN_DEPENDS= verilog-mode.el${PKGNAMESUFFIX}>0:cad/verilog-mode.el@${FLAVOR}
+EMACS_PLIST_FILES= ${EMACS_SITE_LISPDIR}/dinotrace.el ${EMACS_SITE_LISPDIR}/sim-log.el
post-patch:
@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
Index: cad/verilog-mode.el/Makefile
===================================================================
--- cad/verilog-mode.el/Makefile
+++ cad/verilog-mode.el/Makefile
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= verilog-mode.el
-PORTVERSION= 801
-PORTREVISION= 5
+DISTVERSION= 801
+PORTREVISION= 6
CATEGORIES= cad elisp
MASTER_SITES= http://www.veripool.org/ftp/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E}
EXTRACT_SUFX= .gz
Index: databases/bbdb/Makefile
===================================================================
--- databases/bbdb/Makefile
+++ databases/bbdb/Makefile
@@ -2,40 +2,41 @@
# $FreeBSD$
PORTNAME= bbdb
-PORTVERSION= 2.35
-PORTREVISION= 12
+DISTVERSION= 3.1.2
CATEGORIES= databases elisp
-MASTER_SITES= SF
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+MASTER_SITES= SAVANNAH
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= dryice@FreeBSD.org
COMMENT= Big Brother Database
-USE_EMACS= yes
+LICENSE= GPLv3+
USES= makeinfo
-ALL_TARGET= bbdb info
-MAKE_ARGS= MAKE="${MAKE} clean MAKEINFO=\"${MAKEINFO} --no-split\""
-BBDB_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+USE_EMACS= yes
+USE_TEX= latex:build
+
+BBDB_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB+= BBDB_LISPDIR=${BBDB_LISPDIR}
-MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
+PORTDOCS= bbdb.pdf
+INFO= bbdb
-.if ${PORT_OPTIONS:MDOCS}
-INFO= bbdb
-.endif
+NO_ARCH= yes
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
- ${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info ${STAGEDIR}${PREFIX}/info
-.endif
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
+ ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
+ ${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/bbdb.pdf ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Index: databases/bbdb/distinfo
===================================================================
--- databases/bbdb/distinfo
+++ databases/bbdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bbdb-2.35.tar.gz) = c71a46fcd9ae4d68d9fa970d175ff84cd85780dc3f9aec603688deff252aedb8
-SIZE (bbdb-2.35.tar.gz) = 767464
+TIMESTAMP = 1513893339
+SHA256 (bbdb-3.1.2.tar.gz) = 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf
+SIZE (bbdb-3.1.2.tar.gz) = 378935
Index: databases/bbdb/pkg-plist
===================================================================
--- databases/bbdb/pkg-plist
+++ databases/bbdb/pkg-plist
@@ -1,33 +1,33 @@
-%%BBDB_LISPDIR%%/bbdb.el
-%%BBDB_LISPDIR%%/bbdb.elc
-%%BBDB_LISPDIR%%/bbdb-autoloads.el
+%%BBDB_LISPDIR%%/bbdb-anniv.el
+%%BBDB_LISPDIR%%/bbdb-anniv.elc
%%BBDB_LISPDIR%%/bbdb-com.el
%%BBDB_LISPDIR%%/bbdb-com.elc
-%%BBDB_LISPDIR%%/bbdb-ftp.el
-%%BBDB_LISPDIR%%/bbdb-ftp.elc
%%BBDB_LISPDIR%%/bbdb-gnus.el
-%%BBDB_LISPDIR%%/bbdb-gui.el
-%%BBDB_LISPDIR%%/bbdb-gui.elc
-%%BBDB_LISPDIR%%/bbdb-hooks.el
-%%BBDB_LISPDIR%%/bbdb-hooks.elc
-%%BBDB_LISPDIR%%/bbdb-merge.el
-%%BBDB_LISPDIR%%/bbdb-merge.elc
+%%BBDB_LISPDIR%%/bbdb-gnus.elc
+%%BBDB_LISPDIR%%/bbdb-ispell.el
+%%BBDB_LISPDIR%%/bbdb-ispell.elc
+%%BBDB_LISPDIR%%/bbdb-loaddefs.el
+%%BBDB_LISPDIR%%/bbdb-message.el
+%%BBDB_LISPDIR%%/bbdb-message.elc
%%BBDB_LISPDIR%%/bbdb-mhe.el
+%%BBDB_LISPDIR%%/bbdb-mhe.elc
%%BBDB_LISPDIR%%/bbdb-migrate.el
%%BBDB_LISPDIR%%/bbdb-migrate.elc
+%%BBDB_LISPDIR%%/bbdb-mua.el
+%%BBDB_LISPDIR%%/bbdb-mua.elc
+%%BBDB_LISPDIR%%/bbdb-pgp.el
+%%BBDB_LISPDIR%%/bbdb-pgp.elc
+%%BBDB_LISPDIR%%/bbdb-pkg.el
%%BBDB_LISPDIR%%/bbdb-print.el
%%BBDB_LISPDIR%%/bbdb-print.elc
-%%BBDB_LISPDIR%%/bbdb-reportmail.el
%%BBDB_LISPDIR%%/bbdb-rmail.el
+%%BBDB_LISPDIR%%/bbdb-rmail.elc
%%BBDB_LISPDIR%%/bbdb-sc.el
%%BBDB_LISPDIR%%/bbdb-sc.elc
+%%BBDB_LISPDIR%%/bbdb-site.el
+%%BBDB_LISPDIR%%/bbdb-site.elc
%%BBDB_LISPDIR%%/bbdb-snarf.el
%%BBDB_LISPDIR%%/bbdb-snarf.elc
-%%BBDB_LISPDIR%%/bbdb-srv.el
%%BBDB_LISPDIR%%/bbdb-vm.el
-%%BBDB_LISPDIR%%/bbdb-w3.el
-%%BBDB_LISPDIR%%/bbdb-w3.elc
-%%BBDB_LISPDIR%%/bbdb-whois.el
-%%BBDB_LISPDIR%%/bbdb-whois.elc
-%%BBDB_LISPDIR%%/bbdb-xemacs.el
-%%BBDB_LISPDIR%%/bbdb-xemacs.elc
+%%BBDB_LISPDIR%%/bbdb.el
+%%BBDB_LISPDIR%%/bbdb.elc
Index: databases/gnats4/Makefile
===================================================================
--- databases/gnats4/Makefile
+++ databases/gnats4/Makefile
@@ -56,7 +56,8 @@
OPTIONS_DEFAULT=SERVER
OPTIONS_SUB= yes
EMACS_USE= EMACS=yes
-EMACS_DESC= Add support for default version of EMACS
+EMACS_DESC= Install Emacs Lisp support file
+EMACS_VARS= EMACS_NO_FLAVORS=yes EMACS_NO_BUILD_DEPENDS=yes EMACS_NO_RUNS_DEPENDS=yes
SERVER_DESC= Install the gnats server too
.include <bsd.port.options.mk>
Index: deskutils/etask/Makefile
===================================================================
--- deskutils/etask/Makefile
+++ deskutils/etask/Makefile
@@ -3,18 +3,22 @@
PORTNAME= etask
PORTVERSION= 0.3.91
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= deskutils elisp
MASTER_SITES= http://members.chello.at/rene.weichselbaum/ \
http://dryice.name/computer/FreeBSD/distfiles/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= dryice@dryice.name
COMMENT= Manage your projects or tasks within GNU Emacs
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/gpl.txt
+
RUN_DEPENDS= xpdf:graphics/xpdf
-USE_EMACS= yes
USES= ghostscript:run
+USE_EMACS= yes
USE_TEX= latex dvipsk
LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
Index: deskutils/howm/Makefile
===================================================================
--- deskutils/howm/Makefile
+++ deskutils/howm/Makefile
@@ -2,32 +2,39 @@
PORTNAME= howm
PORTVERSION= 1.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://howm.sourceforge.jp/a/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Write fragmentarily and read collectively
-GNU_CONFIGURE= yes
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
USE_EMACS= yes
-ELISP= action-lock.el bcomp.el cheat-font-lock.el \
- howm-common.el howm-date.el howm-menu.el howm-misc.el \
- howm-mode.el howm-reminder.el \
- howm-version.el howm-view.el howm.el riffle.el
-OPTIONS_DEFINE= COMPILED_ELISP DOCS EXAMPLES
-OPTIONS_DEFAULT=COMPILED_ELISP
-COMPILED_ELISP_DESC= Install pre-compiled ELISP files
-OPTIONS_SUB= yes
+GNU_CONFIGURE= yes
+
+PORTDOCS= *.html *.png
+PORTEXAMPLES= en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
+
+OPTIONS_DEFINE= DOCS EXAMPLES
+
+NO_ARCH= yes
do-install:
- (cd ${WRKSRC}; ${INSTALL_DATA} *.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
- (cd ${WRKSRC}; ${INSTALL_DATA} *.elc ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ja ${STAGEDIR}${EXAMPLESDIR}/en
- (cd ${WRKSRC}; ${INSTALL_DATA} ja/0* ${STAGEDIR}${EXAMPLESDIR}/ja)
- (cd ${WRKSRC}; ${INSTALL_DATA} en/0* ${STAGEDIR}${EXAMPLESDIR}/en)
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${STAGEDIR}${DOCSDIR})
+ cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \
+ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/en ${STAGEDIR}${EXAMPLESDIR}/ja
+ cd ${WRKSRC} && ${INSTALL_DATA} ja/0* ${STAGEDIR}${EXAMPLESDIR}/ja
+ cd ${WRKSRC} && ${INSTALL_DATA} en/0* ${STAGEDIR}${EXAMPLESDIR}/en
.include <bsd.port.mk>
Index: deskutils/howm/files/patch-howm-vars.el
===================================================================
--- deskutils/howm/files/patch-howm-vars.el
+++ deskutils/howm/files/patch-howm-vars.el
@@ -1,6 +1,6 @@
---- howm-vars.el.orig 2015-12-31 22:41:45.000000000 +0900
-+++ howm-vars.el 2016-11-26 22:46:32.596292000 +0900
-@@ -759,7 +759,7 @@
+--- howm-vars.el.orig 2015-12-31 13:41:45 UTC
++++ howm-vars.el
+@@ -759,7 +759,7 @@ When the value is elisp function, it is
This variable is obsolete and may be removed in future.")
(defvar howm-view-grep-default-option
;; "labels" causes a trouble in git-head emacs (d5e3922) [2015-01-31]
Index: deskutils/howm/pkg-plist
===================================================================
--- deskutils/howm/pkg-plist
+++ deskutils/howm/pkg-plist
@@ -1,66 +1,46 @@
%%EMACS_SITE_LISPDIR%%/action-lock.el
+%%EMACS_SITE_LISPDIR%%/action-lock.elc
%%EMACS_SITE_LISPDIR%%/bcomp.el
%%EMACS_SITE_LISPDIR%%/cheat-font-lock.el
+%%EMACS_SITE_LISPDIR%%/cheat-font-lock.elc
%%EMACS_SITE_LISPDIR%%/gfunc.el
+%%EMACS_SITE_LISPDIR%%/gfunc.elc
%%EMACS_SITE_LISPDIR%%/honest-report.el
+%%EMACS_SITE_LISPDIR%%/honest-report.elc
%%EMACS_SITE_LISPDIR%%/howm-backend.el
+%%EMACS_SITE_LISPDIR%%/howm-backend.elc
%%EMACS_SITE_LISPDIR%%/howm-cl.el
+%%EMACS_SITE_LISPDIR%%/howm-cl.elc
%%EMACS_SITE_LISPDIR%%/howm-common.el
+%%EMACS_SITE_LISPDIR%%/howm-common.elc
%%EMACS_SITE_LISPDIR%%/howm-date.el
+%%EMACS_SITE_LISPDIR%%/howm-date.elc
%%EMACS_SITE_LISPDIR%%/howm-lang-en.el
+%%EMACS_SITE_LISPDIR%%/howm-lang-en.elc
%%EMACS_SITE_LISPDIR%%/howm-lang-ja.el
+%%EMACS_SITE_LISPDIR%%/howm-lang-ja.elc
%%EMACS_SITE_LISPDIR%%/howm-menu-en.el
+%%EMACS_SITE_LISPDIR%%/howm-menu-en.elc
%%EMACS_SITE_LISPDIR%%/howm-menu-ja.el
+%%EMACS_SITE_LISPDIR%%/howm-menu-ja.elc
%%EMACS_SITE_LISPDIR%%/howm-menu.el
+%%EMACS_SITE_LISPDIR%%/howm-menu.elc
%%EMACS_SITE_LISPDIR%%/howm-misc.el
+%%EMACS_SITE_LISPDIR%%/howm-misc.elc
%%EMACS_SITE_LISPDIR%%/howm-mkmenu.el
%%EMACS_SITE_LISPDIR%%/howm-mode.el
+%%EMACS_SITE_LISPDIR%%/howm-mode.elc
%%EMACS_SITE_LISPDIR%%/howm-reminder.el
+%%EMACS_SITE_LISPDIR%%/howm-reminder.elc
%%EMACS_SITE_LISPDIR%%/howm-vars.el
+%%EMACS_SITE_LISPDIR%%/howm-vars.elc
%%EMACS_SITE_LISPDIR%%/howm-version.el
+%%EMACS_SITE_LISPDIR%%/howm-version.elc
%%EMACS_SITE_LISPDIR%%/howm-view.el
+%%EMACS_SITE_LISPDIR%%/howm-view.elc
%%EMACS_SITE_LISPDIR%%/howm.el
+%%EMACS_SITE_LISPDIR%%/howm.elc
%%EMACS_SITE_LISPDIR%%/illusion.el
+%%EMACS_SITE_LISPDIR%%/illusion.elc
%%EMACS_SITE_LISPDIR%%/riffle.el
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/action-lock.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/cheat-font-lock.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/gfunc.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/honest-report.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-backend.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-cl.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-common.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-date.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-lang-en.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-lang-ja.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu-en.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu-ja.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-misc.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-mode.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-reminder.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-vars.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-version.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-view.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/illusion.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/riffle.elc
-%%EXAMPLESDIR%%/en/0000-00-00-000000.txt
-%%EXAMPLESDIR%%/ja/0000-00-00-000000.txt
-%%DOCSDIR%%/README-j.html
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/cat.png
-%%DOCSDIR%%/come.png
-%%DOCSDIR%%/go.png
-%%DOCSDIR%%/index-j.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/menu.png
-%%DOCSDIR%%/s-cat.png
-%%DOCSDIR%%/s-menu.png
-%%DOCSDIR%%/s-screen-shot.png
-%%DOCSDIR%%/s-search.png
-%%DOCSDIR%%/s-source.png
-%%DOCSDIR%%/screen-shot.png
-%%DOCSDIR%%/search.png
-%%DOCSDIR%%/source.png
-%%DOCSDIR%%/todo.png
-%%DOCSDIR%%/updown.png
+%%EMACS_SITE_LISPDIR%%/riffle.elc
Index: devel/cask/Makefile
===================================================================
--- devel/cask/Makefile
+++ devel/cask/Makefile
@@ -1,19 +1,22 @@
# $FreeBSD$
PORTNAME= cask
-PORTVERSION= 0.8.1
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+DISTVERSION= 0.8.1
+PORTREVISION= 2
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Project management tool for Emacs
LICENSE= GPLv3
+USES= python shebangfix
USE_GITHUB= yes
USE_EMACS= yes
-USES= python
+
+NO_ARCH= yes
NO_BUILD= yes
PLIST_FILES= %%EMACS_SITE_LISPDIR%%/cask.el \
@@ -24,6 +27,8 @@
%%EMACS_SITE_LISPDIR%%/templates/init-dev.tpl \
bin/cask
+SHEBANG_FILES= bin/cask
+
post-patch:
@${REINPLACE_CMD} -e 's|os.path.dirname(CASK_BIN_DIRECTORY)|"${PREFIX}/${EMACS_SITE_LISPDIR}"|' \
${WRKSRC}/bin/cask
Index: devel/clojure-cider/Makefile
===================================================================
--- devel/clojure-cider/Makefile
+++ devel/clojure-cider/Makefile
@@ -4,16 +4,18 @@
PORTVERSION= 0.15.1
DISTVERSIONPREFIX= v
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= bofh@FreeBSD.org
COMMENT= Clojure IDE and REPL for Emacs
LICENSE= GPLv3+
-RUN_DEPENDS= clojure-mode.el>0:lang/clojure-mode.el \
- dash.el>0:devel/dash.el \
- epl.el>0:devel/epl.el \
- pkg-info.el>0:devel/pkg-info.el
+RUN_DEPENDS= clojure-mode.el${EMACS_PKGNAMESUFFIX}>0:lang/clojure-mode.el@${EMACS_FLAVOR} \
+ dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
+ epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \
+ pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR}
+
USE_GITHUB= yes
GH_ACCOUNT= clojure-emacs
Index: devel/dash.el/Makefile
===================================================================
--- devel/dash.el/Makefile
+++ devel/dash.el/Makefile
@@ -4,6 +4,7 @@
PORTVERSION= 2.13.0
PORTREVISION= 1
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Modern list library for Emacs
Index: devel/distel/Makefile
===================================================================
--- devel/distel/Makefile
+++ devel/distel/Makefile
@@ -4,6 +4,7 @@
PORTVERSION= 4.1.1
PORTREVISION= 1
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Distel extends Emacs Lisp with Erlang-style message passing
Index: devel/epl.el/Makefile
===================================================================
--- devel/epl.el/Makefile
+++ devel/epl.el/Makefile
@@ -4,6 +4,7 @@
PORTVERSION= 0.8
PORTREVISION= 1
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Emacs Package Library
Index: devel/git-modes/Makefile
===================================================================
--- devel/git-modes/Makefile
+++ devel/git-modes/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu@utahime.org
COMMENT= GNU Emacs modes for Git-related files
Index: devel/magit/Makefile
===================================================================
--- devel/magit/Makefile
+++ devel/magit/Makefile
@@ -3,8 +3,9 @@
PORTNAME= magit
PORTVERSION= 2.11.0
+PORTREVISION= 1
CATEGORIES= devel elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu@utahime.org
COMMENT= Interface to Git for Emacs
@@ -12,10 +13,10 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= dash.el>=2.12.1:devel/dash.el \
- with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
-RUN_DEPENDS= dash.el>=2.12.1:devel/dash.el \
- with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
+BUILD_DEPENDS= dash.el${PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+ with-editor${PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
+RUN_DEPENDS= dash.el${PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+ with-editor${PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
USES= gmake makeinfo
USE_EMACS= yes
Index: devel/p5-Sepia/Makefile
===================================================================
--- devel/p5-Sepia/Makefile
+++ devel/p5-Sepia/Makefile
@@ -7,6 +7,7 @@
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ashish@FreeBSD.org
COMMENT= Simple Emacs-Perl Interface
Index: devel/pkg-info.el/Makefile
===================================================================
--- devel/pkg-info.el/Makefile
+++ devel/pkg-info.el/Makefile
@@ -4,6 +4,7 @@
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Provide information about Emacs packages
Index: devel/psvn/Makefile
===================================================================
--- devel/psvn/Makefile
+++ devel/psvn/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 6
CATEGORIES= devel elisp
MASTER_SITES= http://www.xsteve.at/prg/emacs/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= psvn.el
EXTRACT_SUFX= # empty
Index: devel/pymacs/Makefile
===================================================================
--- devel/pymacs/Makefile
+++ devel/pymacs/Makefile
@@ -6,6 +6,7 @@
DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= devel editors python elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python package for scripting emacs
Index: editors/Makefile
===================================================================
--- editors/Makefile
+++ editors/Makefile
@@ -36,7 +36,6 @@
SUBDIR += editorconfig-core-c
SUBDIR += emacs
SUBDIR += emacs-devel
- SUBDIR += emacs-nox11
SUBDIR += encryptpad
SUBDIR += fileobj
SUBDIR += flim
Index: editors/apel/Makefile
===================================================================
--- editors/apel/Makefile
+++ editors/apel/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 14
CATEGORIES= editors elisp
MASTER_SITES= http://git.chise.org/elisp/dist/apel/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Portable Emacs Library
Index: editors/apel/files/patch-poe.el
===================================================================
--- editors/apel/files/patch-poe.el
+++ editors/apel/files/patch-poe.el
@@ -714,7 +714,7 @@
+ (prog1
+ (buffer-string)
+ (kill-buffer nil)))))
-
+
;; Emacs 20.1 and later: (combine-after-change-calls &rest BODY)
(defmacro-maybe combine-after-change-calls (&rest body)
@@ -1056,20 +1056,20 @@ STRING should be given if the last searc
@@ -752,7 +752,20 @@
If second arg FIXEDCASE is non-nil, do not alter case of replacement text.
Otherwise maybe capitalize the whole text, or maybe just word initials,
based on the replaced text.
-@@ -1090,38 +1090,38 @@ Leaves point at end of replacement text.
+@@ -1080,48 +1080,48 @@ then capitalize each word in NEWTEXT.
+
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+- `\&' in NEWTEXT means substitute original matched text.
+- `\N' means substitute what matched the Nth `\(...\)'.
++ `\\&' in NEWTEXT means substitute original matched text.
++ `\\N' means substitute what matched the Nth `\\(...\\)'.
+ If Nth parens didn't match, substitute nothing.
+- `\\' means insert one `\'.
++ `\\\\' means insert one `\\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+
The optional fourth argument STRING can be a string to modify.
In that case, this function creates and returns a new string
which is made by replacing the part of STRING that was matched."
@@ -823,7 +836,20 @@
If second arg FIXEDCASE is non-nil, do not alter case of replacement text.
Otherwise maybe capitalize the whole text, or maybe just word initials,
based on the replaced text.
-@@ -1142,24 +1142,24 @@ Leaves point at end of replacement text.
+@@ -1132,34 +1132,34 @@ then capitalize each word in NEWTEXT.
+
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+- `\&' in NEWTEXT means substitute original matched text.
+- `\N' means substitute what matched the Nth `\(...\)'.
++ `\\&' in NEWTEXT means substitute original matched text.
++ `\\N' means substitute what matched the Nth `\\(...\\)'.
+ If Nth parens didn't match, substitute nothing.
+- `\\' means insert one `\'.
++ `\\\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+
The optional fourth argument STRING can be a string to modify.
In that case, this function creates and returns a new string
which is made by replacing the part of STRING that was matched."
Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= emacs
DISTVERSION= ${EMACS_VER}.${EMACS_REV}
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
PKGNAMESUFFIX= -devel
@@ -13,7 +14,13 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS_INSTALL= emacs emacs-canna emacs-lite
+
+FLAVORS= full lite
+full_CONFLICTS_INSTALL= emacs-devel_lite
+full_PKGNAMESUFFIX= -devel
+lite_CONFLICTS_INSTALL= emacs-devel
+lite_PKGNAMESUFFIX= -devel_lite
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
@@ -180,6 +187,12 @@
XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
XWIDGETS_IMPLIES= GTK3
+.if ${FLAVOR:U} == lite
+OPTIONS_EXCLUDE= ACL ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+ LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
+ XAW XAW3D X11 XFT XIM XPM XWIDGETS
+.endif
+
.include <bsd.port.options.mk>
# has graphics/ImageMagick been compiled with OPENMP?
Index: editors/emacs-nox11/Makefile
===================================================================
--- editors/emacs-nox11/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: phoffman@proper.com
-# $FreeBSD$
-
-PKGNAMESUFFIX= -nox11
-
-CONFLICTS_INSTALL= emacs-[0-9]* emacs-devel-[0-9]*
-
-OPTIONS_EXCLUDE= CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK \
- MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
- XPM XWIDGETS
-OPTIONS_DEFAULT= GNUTLS MODULES SOURCES XML
-
-MASTERDIR= ${.CURDIR}/../emacs
-
-.include "${MASTERDIR}/Makefile"
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= emacs
-PORTVERSION= ${EMACS_VER}
-PORTREVISION= 1
+DISTVERSION= ${EMACS_VER}
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= GNU
-PKGNAMESUFFIX?= 25
PATCH_DIST_STRIP= -p1
@@ -17,15 +16,22 @@
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL?= emacs-devel-[0-9]* emacs-nox11-[0-9]*
+BROKEN_aarch64= Fails to link: missing sbrk
+CONFLICTS_INSTALL= emacs-devel emacs-devel_lite
-BROKEN_aarch64= Fails to link: missing sbrk
+FLAVORS= full canna lite
+full_CONFLICTS_INSTALL= emacs-canna emacs-lite
+canna_CONFLICTS_INSTALL= emacs emacs-lite
+canna_PKGNAMESUFFIX= -canna
+canna_DESCR= ${.CURDIR}/pkg-descr-canna
+canna_LIB_DEPENDS= libcanna.so:japanese/canna-lib
+lite_CONFLICTS_INSTALL= emacs emacs-canna
+lite_PKGNAMESUFFIX= -lite
+
+USES= cpe gmake makeinfo ncurses pkgconfig tar:xz
EMACS_VER= 25.3
GNU_CONFIGURE= yes
-USES= cpe gmake makeinfo ncurses pkgconfig tar:xz
-# Building with GCC 4.6+ requires it; remove after 9.3 EOL
-LDFLAGS+= ${ncurses_ARGS:Mport:C/.+/-ltinfo/}
INFO_PATH= ${DATADIR_REL}/info
CPE_VENDOR= gnu
@@ -45,20 +51,18 @@
rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
-OPTIONS_DEFINE= ACL CANNA DBUS GNUTLS LLDB MODULES SOURCES X11 XML
-
+OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
OPTIONS_RADIO_SOUND= ALSA OSS
OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
OPTIONS_GROUP= GRAPHICS NEEDX11
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
-OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \
+OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \
XWIDGETS
-
-OPTIONS_DEFAULT?= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
- M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
- TIFF X11 XFT XIM XML XPM
+OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG \
+ KQUEUE M17N MAGICK MODULES OSS OTF PNG \
+ SCROLLBARS SOURCES SVG TIFF X11 XFT XIM XML XPM
ACL_DESC= Access control list support
CAIRO_DESC= Experimental Cairo library support (implies PNG, XFT)
@@ -93,12 +97,6 @@
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
CAIRO_IMPLIES= PNG XFT X11
-CANNA_CONFIGURE_WITH= canna
-CANNA_PATCH_SITES= http://www.gentei.org/~yuuji/software/emacs25canna/ \
- http://distfiles.pirateparty.in/ashish/ \
- LOCAL/ashish
-CANNA_PATCHFILES= emacs25.1canna-20160919.diff.gz
-CANNA_LIB_DEPENDS= libcanna.so:japanese/canna-lib
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH= dbus
GCONF_USE= GNOME=gconf2
@@ -181,10 +179,27 @@
XPM_CONFIGURE_WITH= xpm
XPM_IMPLIES= X11
XWIDGETS_USE= XORG=xcomposite
-XWIDGETS_CONFIGURE_WITH=xwidgets
+XWIDGETS_CONFIGURE_WITH= xwidgets
XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
XWIDGETS_IMPLIES= GTK3
+.if ${FLAVOR:U} == canna
+CONFIGURE_WITH+= canna
+PATCH_SITES= http://www.gentei.org/~yuuji/software/emacs25canna/ \
+ http://distfiles.pirateparty.in/ashish/ \
+ LOCAL/ashish
+PATCHFILES= emacs25.2canna-20170507.diff.gz
+PLIST_FILES+= ${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
+ ${DATADIR}/${EMACS_VER}/lisp/canna.elc \
+ ${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz \
+ ${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc \
+ ${SOURCES}${DATADIR}/${EMACS_VER}/src/canna.c
+.elif ${FLAVOR:U} == lite
+OPTIONS_EXCLUDE= ACL ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+ M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF XAW \
+ XAW3D X11 XFT XIM XPM XWIDGETS
+.endif
+
.include <bsd.port.options.mk>
# has graphics/ImageMagick been compiled with OPENMP?
Index: editors/emacs/distinfo
===================================================================
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1505178274
SHA256 (emacs-25.3.tar.xz) = 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
SIZE (emacs-25.3.tar.xz) = 42854740
-SHA256 (emacs25.1canna-20160919.diff.gz) = b0ef90be88e8b947d41805713735a79c6f78e2401b749d5e6d1e3fd1bc7e5f32
-SIZE (emacs25.1canna-20160919.diff.gz) = 31671
+SHA256 (emacs25.2canna-20170507.diff.gz) = 16e05ef901fddafb16d8384ad9c047769e4c0757939036d1f8128359801bfd86
+SIZE (emacs25.2canna-20170507.diff.gz) = 31655
Index: editors/emacs/pkg-descr
===================================================================
--- editors/emacs/pkg-descr
+++ editors/emacs/pkg-descr
@@ -1,17 +1,17 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
+GNU Emacs is an extensible, customizable, free/libre text editor. At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+language with extensions to support text editing.
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser. It is easily
-extensible since its editing commands are written in Lisp.
+The features of GNU Emacs include:
+ - content-aware editing modes, including syntax coloring, for many file
+ types
+ - complete built-in documentation, including a tutorial for new users
+ - full Unicode support for nearly all human scripts
+ - powerful customizability, using Emacs Lisp code or a graphical
+ interface
+ - a vast ecosystem of functionality beyond text editing, including a
+ project planner, mail and news reader, debugger interface, calendar,
+ even a psychotherapist, and more
+ - a packaging system for downloading and installing extensions.
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
-
-WWW: http://www.gnu.org/software/emacs/
+WWW: https://www.gnu.org/software/emacs/
Index: editors/emacs/pkg-descr-canna
===================================================================
--- /dev/null
+++ editors/emacs/pkg-descr-canna
@@ -0,0 +1,19 @@
+GNU Emacs is an extensible, customizable, free/libre text editor. At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+language with extensions to support text editing.
+
+The features of GNU Emacs include:
+ - content-aware editing modes, including syntax coloring, for many file
+ types
+ - complete built-in documentation, including a tutorial for new users
+ - full Unicode support for nearly all human scripts
+ - powerful customizability, using Emacs Lisp code or a graphical
+ interface
+ - a vast ecosystem of functionality beyond text editing, including a
+ project planner, mail and news reader, debugger interface, calendar,
+ even a psychotherapist, and more
+ - a packaging system for downloading and installing extensions.
+
+Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
+
+WWW: https://www.gnu.org/software/emacs/
Index: editors/emacs/pkg-plist
===================================================================
--- editors/emacs/pkg-plist
+++ editors/emacs/pkg-plist
@@ -1201,8 +1201,6 @@
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/timeclock.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.elc
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.el.gz
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/canna.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
@@ -2392,8 +2390,6 @@
%%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.elc
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.el.gz
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/jka-cmpr-hook.el.gz
@@ -3980,7 +3976,6 @@
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
-%%CANNA%%%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/canna.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casefiddle.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casetab.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/category.c
Index: editors/flim/Makefile
===================================================================
--- editors/flim/Makefile
+++ editors/flim/Makefile
@@ -7,7 +7,7 @@
PORTEPOCH= 1
CATEGORIES= editors elisp
MASTER_SITES= http://git.chise.org/elisp/dist/flim/flim-1.14/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Message representation or encoding elisp library for emacs
@@ -26,7 +26,7 @@
FLIM_TRUNK= 1.14
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+FLIM_COOKIE= flim${EMACS_PKGNAMESUFFIX}-${FLIM_TRUNK}.FreeBSD-packages
# flim lispdir
FLIM_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
FLIM_VERSION_SPECIFIC_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
@@ -51,8 +51,8 @@
PLIST= ${PKGDIR}/pkg-plist.emacs21
# depends on apel
-BUILD_DEPENDS+= apel-${EMACS_PORT_NAME}>0:editors/apel
-RUN_DEPENDS+= apel-${EMACS_PORT_NAME}>0:editors/apel
+BUILD_DEPENDS+= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
+RUN_DEPENDS+= apel${EMACS_PKGNAMESUFFIX}>0:editors/apel@${EMACS_FLAVOR}
.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
# info files JIS to EUC
Index: editors/paredit-mode.el/Makefile
===================================================================
--- editors/paredit-mode.el/Makefile
+++ editors/paredit-mode.el/Makefile
@@ -5,6 +5,7 @@
PORTREVISION= 2
CATEGORIES= editors elisp
MASTER_SITES= http://mumble.net/~campbell/emacs/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= paredit-${PORTVERSION}.el
EXTRACT_SUFX=
EXTRACT_ONLY=
Index: editors/psgml/Makefile
===================================================================
--- editors/psgml/Makefile
+++ editors/psgml/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 3
CATEGORIES= editors elisp
MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}-1.3.2
PATCH_SITES= LOCAL/hrs
Index: editors/semi/Makefile
===================================================================
--- editors/semi/Makefile
+++ editors/semi/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 19
CATEGORIES= editors elisp
MASTER_SITES= http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs
@@ -23,8 +23,8 @@
SEMI_VER= ${SEMI_TRUNK}.6
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
+FLIM_COOKIE= flim${EMACS_PKGNAMESUFFIX}-${FLIM_TRUNK}.FreeBSD-packages
+SEMI_COOKIE= semi${EMACS_PKGNAMESUFFIX}-${SEMI_TRUNK}.FreeBSD-packages
# semi lispdir
SEMI_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
SEMI_VERSION_SPECIFIC_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
@@ -48,8 +48,8 @@
PLIST= ${PKGDIR}/pkg-plist.emacs20
# depends on flim
-BUILD_DEPENDS+= flim-${EMACS_PORT_NAME}>0:editors/flim
-RUN_DEPENDS+= flim-${EMACS_PORT_NAME}>0:editors/flim
+BUILD_DEPENDS+= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
+RUN_DEPENDS+= flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
# info files JIS to EUC
Index: editors/slime/Makefile
===================================================================
--- editors/slime/Makefile
+++ editors/slime/Makefile
@@ -3,9 +3,10 @@
PORTNAME= slime
PORTVERSION= 2.15
-PORTREVISION= 2
DISTVERSIONPREFIX=v
+PORTREVISION= 2
CATEGORIES= editors elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= joe@thrallingpenguin.com
COMMENT= Superior Lisp Interaction Mode for Emacs
Index: editors/tamago/Makefile
===================================================================
--- editors/tamago/Makefile
+++ editors/tamago/Makefile
@@ -3,10 +3,10 @@
PORTNAME= tamago
PORTVERSION= 4.0.6.0.20041122.19.14
-PORTREVISION= 2
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= editors elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Egg V4, Multilingual Input Method for Emacsen
@@ -14,6 +14,7 @@
LICENSE= GPLv2
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= devel_full # fails to build
USE_GITHUB= yes
GH_ACCOUNT= hrs-allbsd
GNU_CONFIGURE= yes
Index: editors/web-mode/Makefile
===================================================================
--- editors/web-mode/Makefile
+++ editors/web-mode/Makefile
@@ -2,10 +2,10 @@
PORTNAME= web-mode
PORTVERSION= 14
-PORTREVISION= 2
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= editors elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Autonomous Emacs major-mode for editing web templates
Index: editors/with-editor/Makefile
===================================================================
--- editors/with-editor/Makefile
+++ editors/with-editor/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 2.7.0
DISTVERSIONPREFIX= v
CATEGORIES= editors elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu@utahime.org
COMMENT= Use the Emacsclient as the $$EDITOR of child processes
Index: graphics/xface.el/Makefile
===================================================================
--- graphics/xface.el/Makefile
+++ graphics/xface.el/Makefile
@@ -7,7 +7,7 @@
CATEGORIES= graphics elisp
MASTER_SITES= http://www.jpl.org/ftp/pub/elisp/ \
ftp://ftp.jpl.org/pub/elisp/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= x-face-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -18,6 +18,7 @@
RUN_DEPENDS= compface:mail/faces
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= devel_full devel_lite
LISP_FILES= x-face
LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/x-face
Index: irc/riece/Makefile
===================================================================
--- irc/riece/Makefile
+++ irc/riece/Makefile
@@ -7,7 +7,7 @@
PORTEPOCH= 1
CATEGORIES= irc elisp
MASTER_SITES= SAVANNAH
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= IRC client for Emacs
Index: japanese/boiled-mozc/Makefile
===================================================================
--- japanese/boiled-mozc/Makefile
+++ japanese/boiled-mozc/Makefile
@@ -2,18 +2,18 @@
PORTNAME= boiled-mozc
PORTVERSION= 0.7
-PORTREVISION= 3
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTVERSIONPREFIX=v
+PORTREVISION= 3
CATEGORIES= japanese editors elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ume@FreeBSD.org
COMMENT= Wrapper to mozc.el that offers modeless ("boil"ed) input style
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el
-RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el
+BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el@${EMACS_FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz:japanese/mozc-el@${EMACS_FLAVOR}
GH_ACCOUNT= tadanagao
Index: japanese/ddskk/Makefile
===================================================================
--- japanese/ddskk/Makefile
+++ japanese/ddskk/Makefile
@@ -8,7 +8,7 @@
MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ \
ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
http://www.ring.gr.jp/archives/elisp/skk/maintrunk/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple Kana to Kanji conversion program on Emacsen
Index: japanese/lookup/Makefile
===================================================================
--- japanese/lookup/Makefile
+++ japanese/lookup/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 19
CATEGORIES= japanese elisp
MASTER_SITES= http://openlab.ring.gr.jp/edict/lookup/dist/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu@utahime.org
COMMENT= Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
Index: japanese/migemo-emacs23/Makefile
===================================================================
--- japanese/migemo-emacs23/Makefile
+++ japanese/migemo-emacs23/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTREVISION= 1
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
COMMENT= Japanese incremental search tool for emacs
MASTERDIR= ${.CURDIR}/../../japanese/migemo
PKGDIR= ${.CURDIR}
@@ -14,9 +14,6 @@
RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:editors/apel \
migemo:japanese/migemo
-CONFLICTS= ja-migemo-emacs22-[0-9]* \
- ja-migemo-emacs21-[0-9]*
-
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}
ALL_TARGET= migemo.elc
Index: japanese/migemo.el/Makefile
===================================================================
--- japanese/migemo.el/Makefile
+++ japanese/migemo.el/Makefile
@@ -5,6 +5,7 @@
PORTVERSION= 1.9.1
PORTREVISION= 1
CATEGORIES= japanese elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Japanese incremental search tool for Emacs
Index: japanese/mozc-el/Makefile
===================================================================
--- japanese/mozc-el/Makefile
+++ japanese/mozc-el/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTREVISION= 1
-PKGNAMESUFFIX= -el-${EMACS_PORT_NAME}
+PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX}
COMMENT= Emacs input method for Mozc
Index: japanese/navi2ch/Makefile
===================================================================
--- japanese/navi2ch/Makefile
+++ japanese/navi2ch/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= japanese www elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= 2ch.net and 2ch-like BBS navigator for Emacsen
Index: japanese/yc.el/Makefile
===================================================================
--- japanese/yc.el/Makefile
+++ japanese/yc.el/Makefile
@@ -7,6 +7,7 @@
PORTEPOCH= 1
CATEGORIES= japanese elisp
MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= yc-${PORTVERSION}.el
EXTRACT_SUFX= .gz
@@ -19,6 +20,7 @@
NO_WRKSUBDIR= yes
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= devel_full devel_lite # build failures
YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
PLIST_FILES= %%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
Index: lang/alchemist.el/Makefile
===================================================================
--- lang/alchemist.el/Makefile
+++ lang/alchemist.el/Makefile
@@ -2,23 +2,24 @@
PORTNAME= alchemist.el
PORTVERSION= 1.8.2
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= lang
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Elixir Tooling Integration Into Emacs
LICENSE= GPLv3
-RUN_DEPENDS= elixir-mode.el>=0:lang/elixir-mode.el
+RUN_DEPENDS= elixir-mode.el${PKGNAMESUFFIX}>=0:lang/elixir-mode.el@${EMACS_FLAVOR}
+USE_EMACS= yes
USE_GITHUB= yes
GH_ACCOUNT= tonini
NO_ARCH= yes
NO_BUILD= yes
-USE_EMACS= yes
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
Index: lang/clojure-mode.el/Makefile
===================================================================
--- lang/clojure-mode.el/Makefile
+++ lang/clojure-mode.el/Makefile
@@ -3,21 +3,21 @@
PORTNAME= clojure-mode.el
PORTVERSION= 5.6.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= lang elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= harrigan-s@outlook.com
COMMENT= Emacs lisp module for the Clojure language
LICENSE= GPLv3
+USE_EMACS= yes
USE_GITHUB= yes
GH_ACCOUNT= clojure-emacs
GH_PROJECT= clojure-mode
-USE_EMACS= yes
-
NO_ARCH= yes
NO_BUILD= yes
Index: lang/csharp-mode.el/Makefile
===================================================================
--- lang/csharp-mode.el/Makefile
+++ lang/csharp-mode.el/Makefile
@@ -3,21 +3,23 @@
PORTNAME= csharp-mode.el
PORTVERSION= 0.9.0
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= lang elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Emacs/XEmacs major mode for editing C\# source code
+COMMENT= Emacs major mode for editing C\# source code
LICENSE= GPLv2
+USE_EMACS= yes
USE_GITHUB= yes
GH_ACCOUNT= josteink
GH_PROJECT= csharp-mode
+NO_ARCH= yes
NO_BUILD= yes
-USE_EMACS= yes
PLIST_FILES= ${EMACS_SITE_LISPDIR}/csharp-mode.el
Index: lang/elixir-mode.el/Makefile
===================================================================
--- lang/elixir-mode.el/Makefile
+++ lang/elixir-mode.el/Makefile
@@ -2,20 +2,22 @@
PORTNAME= elixir-mode.el
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= lang
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Emacs major mode for Elixir
LICENSE= GPLv3
+USE_EMACS= yes
USE_GITHUB= yes
GH_ACCOUNT= elixir-lang
GH_PROJECT= emacs-elixir
-USE_EMACS= yes
+NO_ARCH= yes
NO_BUILD= yes
do-install:
Index: lang/gcl/Makefile
===================================================================
--- lang/gcl/Makefile
+++ lang/gcl/Makefile
@@ -106,6 +106,8 @@
.if ${PORT_OPTIONS:MEMACS}
EMACS_NO_BUILD_DEPENDS=yes
+EMACS_NO_RUN_DEPENDS= yes
+EMACS_NO_FLAVORS= yes
.endif
post-patch:
Index: lang/haskell-mode.el/Makefile
===================================================================
--- lang/haskell-mode.el/Makefile
+++ lang/haskell-mode.el/Makefile
@@ -2,27 +2,28 @@
# $FreeBSD$
PORTNAME= haskell-mode
-PORTVERSION= 16.1
-PORTREVISION= 1
DISTVERSIONPREFIX=v
+DISTVERSION= 16.1
+PORTREVISION= 2
CATEGORIES= lang elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= aehlig@linta.de
COMMENT= Emacs lisp mode for editing haskell programs
LICENSE= GPLv3
+USES= gmake
USE_EMACS= yes
-
-OPTIONS_DEFINE= DOCS
-
+USE_GITHUB= yes
GH_ACCOUNT= haskell
+
PORTDOCS= NEWS README.md
-USE_GITHUB= yes
-USES= gmake
ALL_TARGET= haskell-mode-autoloads.el
NO_ARCH= yes
+OPTIONS_DEFINE= DOCS
+
ELISPDIR= ${PREFIX}/${PLIST_DIRS}
ELISPFILES= ghc-core.el ghci-script-mode.el haskell-align-imports.el \
haskell-c2hs.el \
Index: lang/pure/Makefile
===================================================================
--- lang/pure/Makefile
+++ lang/pure/Makefile
@@ -76,6 +76,8 @@
.if ${PORT_OPTIONS:MEMACS}
USE_EMACS= yes
+EMACS_NO_FLAVORS= yes
+EMACS_NO_RUN_DEPENDS= yes
MAKE_ARGS+= emacs_prefix=${PREFIX}
.endif
Index: lang/quack/Makefile
===================================================================
--- lang/quack/Makefile
+++ lang/quack/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 2
CATEGORIES= lang scheme elisp
MASTER_SITES= http://www.neilvandyke.org/quack/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .el
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
Index: lang/tuareg-mode.el/Makefile
===================================================================
--- lang/tuareg-mode.el/Makefile
+++ lang/tuareg-mode.el/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= lang elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= michipili@gmail.com
COMMENT= Emacs major mode for editing Caml code
Index: mail/anubis/Makefile
===================================================================
--- mail/anubis/Makefile
+++ mail/anubis/Makefile
@@ -44,6 +44,8 @@
EMACS_DESC= Install EMACS lisp files (requires emacs)
EMACS_USE= EMACS=yes
+EMACS_NO_RUN_DEPENDS= yes
+EMACS_NO_FLAVORS= yes
EMACS_CONFIGURE_ON= --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis
EMACS_CONFIGURE_OFF= --with-lispdir=no
Index: mail/c-sig/Makefile
===================================================================
--- mail/c-sig/Makefile
+++ mail/c-sig/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 18
CATEGORIES= mail elisp
MASTER_SITES= LOCAL/tota/${PORTNAME}
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= yasu@utahime.org
Index: mail/mailest/Makefile
===================================================================
--- mail/mailest/Makefile
+++ mail/mailest/Makefile
@@ -5,6 +5,7 @@
DISTVERSIONPREFIX= ${PORTNAME}-
PORTREVISION= 3
CATEGORIES= mail
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Hyper Estraier backend for Mew
@@ -18,7 +19,7 @@
LIB_DEPENDS= libevent.so:devel/libevent \
libqdbm.so:databases/qdbm \
libestraier.so:textproc/hyperestraier
-RUN_DEPENDS= mewl:mail/mew
+RUN_DEPENDS= mewl:mail/mew@${EMACS_FLAVOR}
USES= iconv fakeroot
USE_EMACS= yes
Index: mail/mailutils/Makefile
===================================================================
--- mail/mailutils/Makefile
+++ mail/mailutils/Makefile
@@ -41,6 +41,8 @@
DEBUG_CONFIGURE_ON= --enable-debug
EMACS_USE= EMACS=yes
+EMACS_NO_RUN_DEPENDS= yes
+EMACS_NO_FLAVORS= yes
EMACS_IMPLIES= MH
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
@@ -89,12 +91,6 @@
TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
TOKYOCABINET_CONFIGURE_WITH= tokyocabinet
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMH} && exists(${LOCALBASE}/bin/emacs)
-USE_EMACS= yes
-.endif
-
post-patch:
@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
${WRKSRC}/lib/gnu/Makefile.in
Index: mail/mew/Makefile
===================================================================
--- mail/mew/Makefile
+++ mail/mew/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 1
CATEGORIES= mail elisp
MASTER_SITES= http://www.mew.org/Release/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= Messaging in the Emacs World for emacs
Index: mail/mu4e-maildirs/Makefile
===================================================================
--- mail/mu4e-maildirs/Makefile
+++ mail/mu4e-maildirs/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 0.8.20160126
PORTREVISION= 2
CATEGORIES= mail
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Maildirs extension for Mu4e
@@ -12,8 +12,8 @@
LICENSE= GPLv3
BUILD_DEPENDS:= ${RUN_DEPENDS}
-RUN_DEPENDS= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/dash.el:devel/dash.el \
- ${LOCALBASE}/${EMACS_SITE_LISPDIR}/mu4e/mu4e.elc:mail/mu4e
+RUN_DEPENDS= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/dash.el:devel/dash.el@${EMACS_FLAVOR} \
+ ${LOCALBASE}/${EMACS_SITE_LISPDIR}/mu4e/mu4e.elc:mail/mu4e@${EMACS_FLAVOR}
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME}-extension
Index: mail/mu4e/Makefile
===================================================================
--- mail/mu4e/Makefile
+++ mail/mu4e/Makefile
@@ -2,10 +2,10 @@
PORTNAME= mu4e
PORTVERSION= 0.9.16
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= mail
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Emacs frontend for Mu
Index: mail/notmuch/Makefile
===================================================================
--- mail/notmuch/Makefile
+++ mail/notmuch/Makefile
@@ -17,7 +17,7 @@
libxapian.so:databases/xapian-core \
libtalloc.so:devel/talloc
TEST_DEPENDS= bash:shells/bash \
- emacs:editors/emacs-nox11 \
+ emacs:editors/emacs@lite \
dtach:misc/dtach \
gdate:sysutils/coreutils \
gbase64:sysutils/coreutils \
@@ -62,6 +62,7 @@
EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
EMACS_USE= EMACS=yes
+EMACS_VARS= PKGNAMESUFFIX=${EMACS_PKGNAMESUFFIX}
MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
MUTT_RUN_DEPENDS= p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
p5-Mail-Tools>0:mail/p5-Mail-Tools \
Index: mail/wanderlust-devel/Makefile
===================================================================
--- mail/wanderlust-devel/Makefile
+++ mail/wanderlust-devel/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 2.15.9.b.${SNAPDATE}
PORTREVISION= 2
CATEGORIES= mail elisp
-PKGNAMESUFFIX= -devel-${EMACS_PORT_NAME}
+PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Yet another message interface on Emacsen
@@ -29,21 +29,21 @@
MIMEUI_PORT_NAME= ${MIMEUI_PRODUCT}
MIMEUI_PRODUCT= semi
MIMEUI_VERSION= 1.14
-MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}${EMACS_PKGNAMESUFFIX}-${MIMEUI_VERSION}.FreeBSD-packages
-BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
+BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}@${EMACS_FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}@${EMACS_FLAVOR}
.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} >= 22)
-RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21@${EMACS_FLAVOR}
.endif
EMACS_W3M_PORT_NAME= emacs-w3m
EMACS_W3M_LISP_FILE= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
.if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
+BUILD_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}@${EMACS_FLAVOR}
+RUN_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}@${EMACS_FLAVOR}
SHIMBUN= ""
.else
SHIMBUN= "@comment "
Index: mail/wanderlust/Makefile
===================================================================
--- mail/wanderlust/Makefile
+++ mail/wanderlust/Makefile
@@ -7,13 +7,14 @@
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \
http://www.jpl.org/elips/wl/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT?= Yet another message interface on Emacsen
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= devel_full devel_lite
NO_ARCH= yes
CONFLICTS= wanderlust-*-2.15.*
@@ -30,16 +31,16 @@
MIMEUI_VERSION= 1.14
MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
-BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}
+BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}@${EMACS_FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:editors/${MIMEUI_PORT_NAME}@${EMACS_FLAVOR}
.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} == 23)
-RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:mail/x-face-e21@${EMACS_FLAVOR}
.endif
.if exists(${EMACS_W3M_LISP_FILE})
-BUILD_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
-RUN_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}
+BUILD_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}@${EMACS_FLAVOR}
+RUN_DEPENDS+= ${EMACS_W3M_LISP_FILE}:www/${EMACS_W3M_PORT_NAME}@${EMACS_FLAVOR}
SHIMBUN= ""
.else
SHIMBUN= "@comment "
Index: mail/x-face-e21/Makefile
===================================================================
--- mail/x-face-e21/Makefile
+++ mail/x-face-e21/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 15
CATEGORIES= mail elisp
MASTER_SITES= http://www.jpl.org/elips/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}.el
EXTRACT_SUFX= .gz
Index: mail/xcite/Makefile
===================================================================
--- mail/xcite/Makefile
+++ mail/xcite/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 10
CATEGORIES= mail elisp
MASTER_SITES= http://www.gentei.org/~yuuji/software/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}.el
EXTRACT_SUFX= # empty
Index: math/coq/Makefile
===================================================================
--- math/coq/Makefile
+++ math/coq/Makefile
@@ -7,6 +7,7 @@
CATEGORIES= math
MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
ftp://ftp.stack.nl/pub/users/johans/coq/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Theorem prover based on lambda-C
Index: math/ess/Makefile
===================================================================
--- math/ess/Makefile
+++ math/ess/Makefile
@@ -7,6 +7,7 @@
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/ \
http://stat.ethz.ch/ESS/downloads/ess/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= rhurlin@gwdg.de
COMMENT= R support for Emacsen
Index: math/proofgeneral/Makefile
===================================================================
--- math/proofgeneral/Makefile
+++ math/proofgeneral/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 11
CATEGORIES= math elisp
MASTER_SITES= http://proofgeneral.inf.ed.ac.uk/releases/
-PKGNAMESUFFIX= -${EMACS_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ProofGeneral-${PORTVERSION}
MAINTAINER= beyert@cs.ucr.edu
@@ -19,6 +19,7 @@
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= lite devel_lite
INSTALLS_ICONS= yes
USES= gmake perl5 shebangfix tar:tgz
SHEBANG_FILES= lego/legotags coq/coqtags isar/isartags
Index: misc/elscreen/Makefile
===================================================================
--- misc/elscreen/Makefile
+++ misc/elscreen/Makefile
@@ -7,11 +7,12 @@
CATEGORIES= misc elisp
MASTER_SITES= ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= GNU screen like utility on Emacsen
-RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel
+RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel@${EMACS_FLAVOR}
USE_EMACS= yes
Index: net-im/jabber.el/Makefile
===================================================================
--- net-im/jabber.el/Makefile
+++ net-im/jabber.el/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 5
CATEGORIES= net-im elisp
MASTER_SITES= SF/emacs-jabber/emacs-jabber%20beta%20versions/${PORTVERSION}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= emacs-jabber-${PORTVERSION}
MAINTAINER= max.n.boyarov@gmail.com
Index: net/gnu-radius/Makefile
===================================================================
--- net/gnu-radius/Makefile
+++ net/gnu-radius/Makefile
@@ -54,6 +54,8 @@
DBM_CONFIGURE_ENABLE= dbm=ndbm
EMACS_USE= emacs=yes
EMACS_CONFIGURE_WITH= lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}
+EMACS_NO_BUILD_DPENDS= yes
+EMACS_NO_RUN_DEPENDS= yes
NLS_USES= gettext
NLS_CONFIGURE_OFF= --disable-nls
PAM_CONFIGURE_ENABLE= pam
Index: net/tramp/Makefile
===================================================================
--- net/tramp/Makefile
+++ net/tramp/Makefile
@@ -3,18 +3,20 @@
PORTNAME= tramp
PORTVERSION= 2.3.0
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= net elisp
MASTER_SITES= GNU
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= kuriyama@FreeBSD.org
-COMMENT= Transparent remote file access tool for emacsen
+COMMENT= Transparent remote file access tool for Emacs
-USE_EMACS= yes
+LICENSE= GPLv3+
+LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe gmake makeinfo
USE_AUTOTOOLS= autoconf
+USE_EMACS= yes
CPE_VENDOR= gnu
TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
@@ -31,23 +33,8 @@
INFO+= tramp
.endif
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} == emacs20
-PLIST_SUB+= EMACS20_ONLY=""
-.else
-PLIST_SUB+= EMACS20_ONLY="@comment "
-.endif
-
-pre-build:
-.if ${EMACS_PORT_NAME} == emacs20
- (cd ${WRKSRC}/contrib; ${MAKE_CMD})
-.endif
- ${LN} -sf ../contrib/password.el ${WRKSRC}/lisp
-
-post-install:
-.if ${EMACS_PORT_NAME} == emacs20
- (cd ${WRKSRC}/contrib; ${MAKE_CMD} install)
+.if ${FLAVOR:U} != lite && ${FLAVOR:U} != devel_lite
+PLIST_FILES+= ${TRAMP_LISPDIR}/tramp-gvfs.el ${TRAMP_LISPDIR}/tramp-gvfs.elc
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net/tramp/files/patch-configure.ac
===================================================================
--- net/tramp/files/patch-configure.ac
+++ net/tramp/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2016-06-26 19:35:17.000000000 +0900
-+++ configure.ac 2016-11-26 22:49:34.137729000 +0900
-@@ -140,4 +140,4 @@
+--- configure.ac.orig 2016-06-26 10:35:17 UTC
++++ configure.ac
+@@ -140,4 +140,4 @@ AC_OUTPUT
# Regenerate autoloads.
AC_MSG_NOTICE([regenerate autoloads])
rm -f lisp/tramp-loaddefs.el
Index: net/tramp/files/patch-texi-Makefile.in
===================================================================
--- net/tramp/files/patch-texi-Makefile.in
+++ net/tramp/files/patch-texi-Makefile.in
@@ -1,6 +1,6 @@
---- texi/Makefile.in.orig 2016-01-25 20:09:17.000000000 +0900
-+++ texi/Makefile.in 2016-11-29 15:30:25.384280000 +0900
-@@ -45,8 +45,8 @@
+--- texi/Makefile.in.orig 2016-01-25 11:09:17 UTC
++++ texi/Makefile.in
+@@ -45,8 +45,8 @@ DESTDIR =
TEXI_FILES = tramp.texi trampver.texi doclicense.texi docstyle.texi \
$(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
@@ -11,7 +11,7 @@
CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
# To be used by maintainer only.
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ all: tramp dvi html pdf
tramp: $(INFO_FILES) $(localinfodir)/dir
Index: net/tramp/pkg-plist
===================================================================
--- net/tramp/pkg-plist
+++ net/tramp/pkg-plist
@@ -1,13 +1,3 @@
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/base64.el
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/base64.elc
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.el
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.elc
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/md5.el
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/md5.elc
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.el
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.elc
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.el
-%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc
%%TRAMP_LISPDIR%%/tramp-adb.el
%%TRAMP_LISPDIR%%/tramp-adb.elc
%%TRAMP_LISPDIR%%/tramp-cmds.el
@@ -16,8 +6,6 @@
%%TRAMP_LISPDIR%%/tramp-compat.elc
%%TRAMP_LISPDIR%%/tramp-ftp.el
%%TRAMP_LISPDIR%%/tramp-ftp.elc
-%%TRAMP_LISPDIR%%/tramp-gvfs.el
-%%TRAMP_LISPDIR%%/tramp-gvfs.elc
%%TRAMP_LISPDIR%%/tramp-gw.el
%%TRAMP_LISPDIR%%/tramp-gw.elc
%%TRAMP_LISPDIR%%/tramp-loaddefs.el
Index: print/a2ps/Makefile
===================================================================
--- print/a2ps/Makefile
+++ print/a2ps/Makefile
@@ -44,6 +44,7 @@
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
EMACS_USE= EMACS=yes
+EMACS_VARS= EMACS_NO_FLAVORS=yes EMACS_NO_RUN_DEPENDS=yes
EMACS_CONFIGURE_ON= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
.include <bsd.port.options.mk>
Index: print/auctex/Makefile
===================================================================
--- print/auctex/Makefile
+++ print/auctex/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 2
CATEGORIES= print elisp
MASTER_SITES= GNU
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Integrated environment for writing LaTeX using GNU Emacs
Index: print/hyperlatex/Makefile
===================================================================
--- print/hyperlatex/Makefile
+++ print/hyperlatex/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Produce HTML and printed documents from LaTeX source
Index: print/yatex/Makefile
===================================================================
--- print/yatex/Makefile
+++ print/yatex/Makefile
@@ -5,6 +5,7 @@
PORTVERSION= 1.77
CATEGORIES?= print elisp
MASTER_SITES= http://www.yatex.org/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
Index: security/starttls/Makefile
===================================================================
--- security/starttls/Makefile
+++ security/starttls/Makefile
@@ -5,6 +5,7 @@
PORTREVISION= 16
CATEGORIES= security
MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
Index: sysutils/lr/Makefile
===================================================================
--- sysutils/lr/Makefile
+++ sysutils/lr/Makefile
@@ -29,6 +29,7 @@
OPTIONS_SUB= yes
EMACS_USE= emacs=yes
+EMACS_NO_FLAVORS= yes
EMACS_NO_BUILD_DEPENDS= yes
EMACS_NO_RUN_DEPENDS= yes
Index: sysutils/puppet-mode.el/Makefile
===================================================================
--- sysutils/puppet-mode.el/Makefile
+++ sysutils/puppet-mode.el/Makefile
@@ -3,19 +3,24 @@
PORTNAME= puppet-mode.el
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= demon@FreeBSD.org
COMMENT= Simple mode for editing puppet manifests
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USE_EMACS= yes
USE_GITHUB= yes
-GH_PROJECT= puppet-syntax-emacs
GH_ACCOUNT= puppetlabs
+GH_PROJECT= puppet-syntax-emacs
GH_TAGNAME= be5d708
+NO_ARCH= yes
NO_BUILD= yes
-USE_EMACS= yes
PLIST_FILES= %%EMACS_SITE_LISPDIR%%/puppet-mode.el
Index: textproc/dictem/Makefile
===================================================================
--- textproc/dictem/Makefile
+++ textproc/dictem/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 4
CATEGORIES= textproc net elisp
MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION}
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= max.n.boyarov@gmail.com
COMMENT= DictEm is a dict client for [X]Emacs
Index: textproc/dictionary/Makefile
===================================================================
--- textproc/dictionary/Makefile
+++ textproc/dictionary/Makefile
@@ -7,7 +7,7 @@
CATEGORIES= textproc net elisp
MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \
http://bsdchat.com/dist/dryice/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Dictionary client for Emacs
Index: textproc/doc-mode.el/Makefile
===================================================================
--- textproc/doc-mode.el/Makefile
+++ textproc/doc-mode.el/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 14
CATEGORIES= textproc elisp
MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= doc-mode-${PORTVERSION}
EXTRACT_SUFX= .tgz
Index: textproc/emacs-wiki/Makefile
===================================================================
--- textproc/emacs-wiki/Makefile
+++ textproc/emacs-wiki/Makefile
@@ -7,7 +7,7 @@
CATEGORIES= textproc elisp
MASTER_SITES= http://www.mwolson.org/static/dist/emacs-wiki/ \
http://dryice.name/computer/FreeBSD/distfiles/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= dryice@FreeBSD.org
COMMENT= Create and use hyperlinks and simple formatting in plain text files
@@ -19,8 +19,8 @@
CONTRIB_DESC= Install extra packages. This can shadow versions already there.
OPTIONS_SUB= yes
-RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:textproc/xml-parse.el
-RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:textproc/htmlize.el
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:textproc/xml-parse.el@${EMACS_FLAVOR}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:textproc/htmlize.el@${EMACS_FLAVOR}
INFO= emacs-wiki
LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
Index: textproc/htmlize.el/Makefile
===================================================================
--- textproc/htmlize.el/Makefile
+++ textproc/htmlize.el/Makefile
@@ -6,6 +6,7 @@
PORTREVISION= 4
CATEGORIES= textproc elisp
MASTER_SITES= http://fly.srk.fer.hr/~hniksic/emacs/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}.cgi
EXTRACT_SUFX=
DIST_SUBDIR= repacked
Index: textproc/ibus-el/Makefile
===================================================================
--- textproc/ibus-el/Makefile
+++ textproc/ibus-el/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 5
CATEGORIES= textproc elisp
MASTER_SITES= http://www11.atwiki.jp/s-irie/pub/emacs/ibus/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ume@FreeBSD.org
COMMENT= IBus client for GNU Emacs
@@ -14,7 +14,7 @@
RUN_DEPENDS= ibus-daemon:textproc/ibus \
${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
-USES= python:2.7,run
+USES= python:2.7,run shebangfix
USE_EMACS= yes
LICENSE= GPLv3
@@ -24,6 +24,7 @@
${EMACS_VERSION_SITE_LISPDIR}/ibus.elc \
libexec/ibus-el-agent
PORTDOCS= README
+SHEBANG_FILES= ibus-el-agent
OPTIONS_DEFINE= DOCS
Index: textproc/markdown-mode.el/Makefile
===================================================================
--- textproc/markdown-mode.el/Makefile
+++ textproc/markdown-mode.el/Makefile
@@ -5,6 +5,7 @@
PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://jblevins.org/projects/markdown-mode/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= markdown-mode.el
EXTRACT_SUFX= # empty
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
Index: textproc/muse/Makefile
===================================================================
--- textproc/muse/Makefile
+++ textproc/muse/Makefile
@@ -8,7 +8,7 @@
MASTER_SITES= http://download.gna.org/muse-el/ \
LOCAL/dryice \
http://dryice.name/computer/FreeBSD/distfiles/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Authoring and publishing environment for Emacs
Index: textproc/uim-el/Makefile
===================================================================
--- textproc/uim-el/Makefile
+++ textproc/uim-el/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= https://github.com/uim/uim/releases/download/uim-${PORTVERSION}/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= uim-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
Index: textproc/xml-lite.el/Makefile
===================================================================
--- textproc/xml-lite.el/Makefile
+++ textproc/xml-lite.el/Makefile
@@ -7,6 +7,7 @@
PORTEPOCH= 1
CATEGORIES= textproc elisp
MASTER_SITES= http://dogbiscuit.org/mdub/software/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= # empty
Index: textproc/xml-parse.el/Makefile
===================================================================
--- textproc/xml-parse.el/Makefile
+++ textproc/xml-parse.el/Makefile
@@ -8,7 +8,7 @@
MASTER_SITES= http://dryice.name/computer/FreeBSD/distfiles/ \
http://sacha.free.net.ph/notebook/emacs/ \
http://ports.toco-domains.de/
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}
EXTRACT_SUFX=
EXTRACT_ONLY=
Index: textproc/yaml-mode.el/Makefile
===================================================================
--- textproc/yaml-mode.el/Makefile
+++ textproc/yaml-mode.el/Makefile
@@ -3,10 +3,10 @@
PORTNAME= yaml-mode.el
PORTVERSION= 0.0.13
-PORTREVISION= 2
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= textproc elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu@utahime.org
COMMENT= Simple major mode to edit YAML file for Emacsen
Index: www/emacs-w3m/Makefile
===================================================================
--- www/emacs-w3m/Makefile
+++ www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
PORTREVISION= 2
CATEGORIES= www elisp
MASTER_SITES= LOCAL/nobutaka
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME}-1.4.598-${SNAPDATE}
MAINTAINER= nobutaka@FreeBSD.org
@@ -17,6 +17,7 @@
USES= autoreconf tar:bzip2
USE_EMACS= yes
+EMACS_EXCLUDE_FLAVORS= devel_full devel_lite # fails during configure stage
SNAPDATE= 20170903
@@ -63,31 +64,16 @@
.include <bsd.port.pre.mk>
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} >= 23
FLIM_PORT= editors/flim
SEMI_PORT= editors/semi
INSTALL_TARGET= install install-icons
PLIST_SUB+= EMACS23=""
-.else
-PLIST_SUB+= EMACS23="@comment "
-.endif
-
-.if ${EMACS_PORT_NAME} == "emacs22"
-INSTALL_TARGET= install install-icons
-.endif
-
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
-MULE_UCS_PORT= converters/mule-ucs
-INSTALL_TARGET= install install-icons
-.endif
FLIM_TRUNK= 1.14
-FLIM_COOKIE= ${LOCALBASE}/share/flim/flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-FLIM_PORT?= editors/flim-${EMACS_PORT_NAME}
+FLIM_COOKIE= ${LOCALBASE}/share/flim/flim${EMACS_PKGNAMESUFFIX}-${FLIM_TRUNK}.FreeBSD-packages
SEMI_TRUNK= 1.14
-SEMI_COOKIE= ${LOCALBASE}/share/semi/semi-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-SEMI_PORT?= editors/semi-${EMACS_PORT_NAME}
+SEMI_COOKIE= ${LOCALBASE}/share/semi/semi${EMACS_PKGNAMESUFFIX}-${FLIM_TRUNK}.FreeBSD-packages
MULE_UCS_PORT?= converters/mule-ucs-${EMACS_PORT_NAME}
MULE_UCS_ELISP_FILE= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
@@ -95,19 +81,16 @@
BUILD_DEPENDS+= w3m:www/w3m
RUN_DEPENDS+= w3m:www/w3m
.if ${PORT_OPTIONS:MSHIMBUN}
-BUILD_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT}
-RUN_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT}
+BUILD_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT}@${EMACS_FLAVOR}
+RUN_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT}@${EMACS_FLAVOR}
.endif
.if ${PORT_OPTIONS:MOCTET_VIEWER}
-RUN_DEPENDS+= ${SEMI_COOKIE}:${SEMI_PORT} \
+RUN_DEPENDS+= ${SEMI_COOKIE}:${SEMI_PORT}@${EMACS_FLAVOR} \
wvHtml:textproc/wv \
xlhtml:textproc/xlhtml
PLIST_SUB+= OCTET_VIEWER=""
.else
PLIST_SUB+= OCTET_VIEWER="@comment "
-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
-RUN_DEPENDS+= ${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
-.endif
.endif
post-patch:

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 27, 10:00 PM (7 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27313885
Default Alt Text
D13506.id37107.diff (79 KB)

Event Timeline