svn commit: r460621 - in head: . Mk Mk/Uses audio/emms audio/emms/files cad/dinotrace cad/verilog-mode.el databases/bbdb databases/gnats4 deskutils/howm deskutils/howm/files devel/cask devel/cdash ...
Joseph Mingrone
jrm at FreeBSD.org
Thu Feb 1 18:03:13 UTC 2018
Author: jrm
Date: Thu Feb 1 18:03:09 2018
New Revision: 460621
URL: https://svnweb.freebsd.org/changeset/ports/460621
Log:
Flavorize and modernize Emacs ports
- Convert USE_EMACS to USES=emacs
- Remove editors/emacs-nox11 (refer to nox flavors of editors/emacs and
editors/emacs-devel)
- Permit default Emacs flavor to be specified in make.conf
- Rename japanese/migemo-emacs23 to japanese/migemo-emacs
- Update and simplify audio/emms and fix build on FreeBSD 10 [1]
- Update databases/bbdd and fix build on FreeBSD 10 [1]
- Update editors/emacs-devel
- Ensure Makefile shell commands that change directory are executed in a
subshell
- Silence some portlint warnings
[1] By not depending on base texinfo
PR: 225404
Reviewed by: antoine
Approved by: portmgr (mat) ashish (maintainer)
Differential Revision: https://reviews.freebsd.org/D13506
Added:
head/Mk/Uses/emacs.mk (contents, props changed)
head/audio/emms/files/
head/audio/emms/files/patch-Makefile (contents, props changed)
head/audio/emms/files/patch-doc_Makefile (contents, props changed)
head/editors/emacs/pkg-descr-canna (contents, props changed)
head/editors/flim/pkg-plist (contents, props changed)
head/editors/semi/pkg-plist (contents, props changed)
head/japanese/migemo-emacs/
head/japanese/migemo-emacs/Makefile (contents, props changed)
- copied, changed from r460620, head/japanese/migemo-emacs23/Makefile
head/japanese/migemo-emacs/pkg-descr (contents, props changed)
- copied, changed from r460620, head/japanese/migemo-emacs23/pkg-descr
head/mail/wanderlust/pkg-plist (contents, props changed)
Deleted:
head/Mk/bsd.emacs.mk
head/editors/emacs-nox11/
head/editors/flim/files/_pkg.el
head/editors/flim/pkg-plist.emacs21
head/editors/semi/pkg-plist.emacs20
head/japanese/migemo-emacs23/
head/mail/wanderlust/pkg-plist.emacs
head/misc/elscreen/pkg-plist
head/www/emacs-w3m/files/_pkg.el
Modified:
head/MOVED
head/Mk/bsd.default-versions.mk (contents, props changed)
head/Mk/bsd.port.mk (contents, props changed)
head/UPDATING
head/audio/emms/Makefile (contents, props changed)
head/audio/emms/distinfo (contents, props changed)
head/cad/dinotrace/Makefile (contents, props changed)
head/cad/verilog-mode.el/Makefile (contents, props changed)
head/databases/bbdb/Makefile (contents, props changed)
head/databases/bbdb/distinfo (contents, props changed)
head/databases/bbdb/pkg-plist (contents, props changed)
head/databases/gnats4/Makefile (contents, props changed)
head/deskutils/howm/Makefile (contents, props changed)
head/deskutils/howm/files/patch-howm-vars.el (contents, props changed)
head/deskutils/howm/pkg-plist (contents, props changed)
head/devel/cask/Makefile (contents, props changed)
head/devel/cdash/Makefile (contents, props changed)
head/devel/clojure-cider/Makefile (contents, props changed)
head/devel/dash.el/Makefile (contents, props changed)
head/devel/distel/Makefile (contents, props changed)
head/devel/epl.el/Makefile (contents, props changed)
head/devel/git-modes/Makefile (contents, props changed)
head/devel/magit/Makefile (contents, props changed)
head/devel/p5-Sepia/Makefile (contents, props changed)
head/devel/pkg-info.el/Makefile (contents, props changed)
head/devel/psvn/Makefile (contents, props changed)
head/devel/pymacs/Makefile (contents, props changed)
head/editors/Makefile (contents, props changed)
head/editors/apel/Makefile (contents, props changed)
head/editors/apel/files/patch-poe.el (contents, props changed)
head/editors/apel/pkg-plist (contents, props changed)
head/editors/emacs-devel/Makefile (contents, props changed)
head/editors/emacs-devel/distinfo (contents, props changed)
head/editors/emacs-devel/pkg-plist (contents, props changed)
head/editors/emacs/Makefile (contents, props changed)
head/editors/emacs/distinfo (contents, props changed)
head/editors/emacs/pkg-descr (contents, props changed)
head/editors/emacs/pkg-plist (contents, props changed)
head/editors/flim/Makefile (contents, props changed)
head/editors/paredit-mode.el/Makefile (contents, props changed)
head/editors/psgml/Makefile (contents, props changed)
head/editors/semi/Makefile (contents, props changed)
head/editors/slime/Makefile (contents, props changed)
head/editors/tamago/Makefile (contents, props changed)
head/editors/web-mode/Makefile (contents, props changed)
head/editors/with-editor/Makefile (contents, props changed)
head/graphics/xface.el/Makefile (contents, props changed)
head/irc/riece/Makefile (contents, props changed)
head/japanese/Makefile (contents, props changed)
head/japanese/boiled-mozc/Makefile (contents, props changed)
head/japanese/ddskk/Makefile (contents, props changed)
head/japanese/lookup/Makefile (contents, props changed)
head/japanese/lookup/pkg-plist (contents, props changed)
head/japanese/migemo.el/Makefile (contents, props changed)
head/japanese/migemo/Makefile (contents, props changed)
head/japanese/mozc-el/Makefile (contents, props changed)
head/japanese/mozc-server/Makefile (contents, props changed)
head/japanese/navi2ch/Makefile (contents, props changed)
head/japanese/yc.el/Makefile (contents, props changed)
head/japanese/yc.el/pkg-message (contents, props changed)
head/lang/alchemist.el/Makefile (contents, props changed)
head/lang/clojure-mode.el/Makefile (contents, props changed)
head/lang/csharp-mode.el/Makefile (contents, props changed)
head/lang/elixir-mode.el/Makefile (contents, props changed)
head/lang/haskell-mode.el/Makefile (contents, props changed)
head/lang/pure/Makefile (contents, props changed)
head/lang/quack/Makefile (contents, props changed)
head/lang/tuareg-mode.el/Makefile (contents, props changed)
head/mail/anubis/Makefile (contents, props changed)
head/mail/c-sig/Makefile (contents, props changed)
head/mail/mailest/Makefile (contents, props changed)
head/mail/mailutils/Makefile (contents, props changed)
head/mail/mew/Makefile (contents, props changed)
head/mail/mu4e-maildirs/Makefile (contents, props changed)
head/mail/mu4e/Makefile (contents, props changed)
head/mail/notmuch/Makefile (contents, props changed)
head/mail/wanderlust-devel/Makefile (contents, props changed)
head/mail/wanderlust-devel/files/patch-Makefile (contents, props changed)
head/mail/wanderlust-devel/files/patch-WL-MK (contents, props changed)
head/mail/wanderlust-devel/files/patch-samples_en_dot.wl (contents, props changed)
head/mail/wanderlust-devel/files/patch-samples_ja_dot.wl (contents, props changed)
head/mail/wanderlust-devel/pkg-plist (contents, props changed)
head/mail/wanderlust/Makefile (contents, props changed)
head/mail/wanderlust/files/patch-Makefile (contents, props changed)
head/mail/wanderlust/files/patch-samples_en_dot.wl (contents, props changed)
head/mail/wanderlust/files/patch-samples_ja_dot.wl (contents, props changed)
head/mail/wanderlust/files/patch-utils_ptexinfmt.el (contents, props changed)
head/mail/wanderlust/files/patch-wl_wl-draft.el (contents, props changed)
head/mail/wanderlust/pkg-message (contents, props changed)
head/mail/x-face-e21/Makefile (contents, props changed)
head/mail/xcite/Makefile (contents, props changed)
head/math/coq/Makefile (contents, props changed)
head/math/ess/Makefile (contents, props changed)
head/math/proofgeneral/Makefile (contents, props changed)
head/misc/elscreen/Makefile (contents, props changed)
head/net-im/jabber.el/Makefile (contents, props changed)
head/net/gnu-radius/Makefile (contents, props changed)
head/net/tramp/Makefile (contents, props changed)
head/net/tramp/files/patch-texi-Makefile.in (contents, props changed)
head/net/tramp/pkg-plist (contents, props changed)
head/print/a2ps/Makefile (contents, props changed)
head/print/auctex/Makefile (contents, props changed)
head/print/hyperlatex/Makefile (contents, props changed)
head/print/yatex/Makefile (contents, props changed)
head/security/starttls/Makefile (contents, props changed)
head/sysutils/lr/Makefile (contents, props changed)
head/sysutils/puppet-mode.el/Makefile (contents, props changed)
head/textproc/dictem/Makefile (contents, props changed)
head/textproc/dictionary/Makefile (contents, props changed)
head/textproc/doc-mode.el/Makefile (contents, props changed)
head/textproc/emacs-wiki/Makefile (contents, props changed)
head/textproc/htmlize.el/Makefile (contents, props changed)
head/textproc/ibus-el/Makefile (contents, props changed)
head/textproc/markdown-mode.el/Makefile (contents, props changed)
head/textproc/muse/Makefile (contents, props changed)
head/textproc/uim-el/Makefile (contents, props changed)
head/textproc/xml-lite.el/Makefile (contents, props changed)
head/textproc/xml-parse.el/Makefile (contents, props changed)
head/textproc/yaml-mode.el/Makefile (contents, props changed)
head/www/emacs-w3m/Makefile (contents, props changed)
head/www/emacs-w3m/files/extra-patch-Makefile.in (contents, props changed)
head/www/emacs-w3m/files/patch-Makefile.in (contents, props changed)
head/www/emacs-w3m/pkg-plist (contents, props changed)
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Feb 1 17:31:35 2018 (r460620)
+++ head/MOVED Thu Feb 1 18:03:09 2018 (r460621)
@@ -9907,3 +9907,5 @@ www/rubygem-jekyll-watch1|www/rubygem-jekyll-watch|201
www/rubygem-puma2|www/rubygem-puma|2018-01-31|Has expired: Use www/rubygem-puma instead
www/rubygem-turbolinks-classic|www/rubygem-turbolinks|2018-01-31|Has expired: Use www/rubygem-turbolinks instead
databases/mysql-proxy||2018-01-31|Has expired: No longer maintained and not recommended for production use
+japanese/migemo-emacs23|japanese/migemo-emacs|2018-02-01|Moved to version agnostic name
+editors/emacs-nox11|editors/emacs at nox|2018-02-01|Moved to a flavored version
Added: head/Mk/Uses/emacs.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/Mk/Uses/emacs.mk Thu Feb 1 18:03:09 2018 (r460621)
@@ -0,0 +1,133 @@
+# $FreeBSD$
+#
+# Provide support for ports requiring Emacs. This includes flavors with proper
+# dependencies and useful variables.
+#
+# Feature: emacs
+# Usage: USES=emacs or USES=emacs:args
+# Valid ARGS: build, run
+#
+# build Indicates that Emacs is needed at build time.
+# run Indicates that Emacs is needed at run time.
+#
+# If build and run are omitted from the argument list, Emacs will be added to
+# BUILD_DEPENDS and RUN_DEPENDS. EMACS_NO_DEPENDS can be set to prevent both
+# Emacs dependencies.
+#
+# Variables, which can be set in make.conf:
+# DEFAULT_VERSIONS+= The default flavor for Emacs ports can be added to
+# DEFAULT_VERSIONS. For example,
+# DEFAULT_VERSIONS+= emacs=nox
+# Valid flavors: full canna nox devel_full devel_nox
+# Flavors specified on the command line take precedence.
+#
+# Variables, which can be set by ports:
+# EMACS_FLAVORS_EXCLUDE: Do NOT build these Emacs flavors.
+# If EMACS_FLAVORS_EXCLUDE is not define then all
+# valid Emacs flavors are assumed.
+#
+# EMACS_NO_DEPENDS: Do NOT add build or run dependencies on Emacs.
+#
+# Variables, which can be read by ports:
+# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-25.3)
+# EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
+# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs)
+# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/25.3)
+# EMACS_MAJOR_VER: Emacs major version (e.g. 25)
+# EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors
+# EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
+# EMACS_VER: Emacs version (e.g. 25.3)
+# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/25.3/site-lisp)
+#-------------------------------------------------------------------------------
+#
+# MAINTAINER: emacs at FreeBSD.org
+
+.if !defined(_INCLUDE_USES_EMACS_MK)
+_INCLUDE_USES_EMACS_MK= yes
+
+# Make sure that no dependency or some other environment variable
+# pollutes the build/run dependency detection
+.undef _EMACS_BUILD_DEP
+.undef _EMACS_RUN_DEP
+_EMACS_ARGS= ${emacs_ARGS:S/,/ /g}
+.if ${_EMACS_ARGS:Mbuild}
+_EMACS_BUILD_DEP= yes
+_EMACS_ARGS:= ${_EMACS_ARGS:Nbuild}
+.endif
+.if ${_EMACS_ARGS:Mrun}
+_EMACS_RUN_DEP= yes
+_EMACS_ARGS:= ${_EMACS_ARGS:Nrun}
+.endif
+
+# If the port does not specify a build or run dependency, and does not define
+# EMACS_NO_DEPENDS, assume both dependencies are required.
+.if !defined(_EMACS_BUILD_DEP) && !defined(_EMACS_RUN_DEP) && \
+ !defined(EMACS_NO_DEPENDS)
+_EMACS_BUILD_DEP= yes
+_EMACS_RUN_DEP= yes
+.endif
+
+.if defined(_EMACS_RUN_DEP)
+FLAVORS= full canna nox devel_full devel_nox
+.for flavor in ${EMACS_FLAVORS_EXCLUDE}
+FLAVORS:= ${FLAVORS:N${flavor}}
+.endfor
+.else
+FLAVORS= full
+.endif
+
+.if empty(FLAVOR)
+.if defined(EMACS_DEFAULT)
+FLAVOR= ${EMACS_DEFAULT}
+.else
+FLAVOR= ${FLAVORS:[1]}
+.endif
+.endif
+EMACS_FLAVOR= ${FLAVOR}
+
+.if ${FLAVOR:Mdevel*}
+EMACS_VER= 27.0.50
+EMACS_PORTDIR= editors/emacs-devel
+.else
+EMACS_VER= 25.3
+EMACS_PORTDIR= editors/emacs
+.endif
+
+EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//}
+EMACS_LIBDIR= share/emacs
+EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER}
+EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER}
+
+.if ${FLAVOR:M*nox}
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_nox
+.elif ${FLAVOR:Mcanna}
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}_canna
+.else
+EMACS_PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+.endif
+
+EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER}
+EMACS_SITE_LISPDIR= ${EMACS_LIBDIR}/site-lisp
+EMACS_VERSION_SITE_LISPDIR= ${EMACS_LIBDIR_WITH_VER}/site-lisp
+
+.if defined(_EMACS_BUILD_DEP)
+BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
+.endif
+.if defined(_EMACS_RUN_DEP)
+RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
+.endif
+
+MAKE_ARGS+= EMACS=${EMACS_CMD}
+SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} \
+ EMACS_VER=${EMACS_VER} \
+ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
+ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
+
+PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} \
+ EMACS_VER=${EMACS_VER} \
+ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \
+ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}
+
+.endif # _INCLUDE_USES_EMACS_MK
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Thu Feb 1 17:31:35 2018 (r460620)
+++ head/Mk/bsd.default-versions.mk Thu Feb 1 18:03:09 2018 (r460621)
@@ -15,8 +15,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes
LOCALBASE?= /usr/local
-.for lang in APACHE BDB FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA MYSQL \
- PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
+.for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
+ MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
.if defined(${lang}_DEFAULT)
ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
.endif
@@ -32,6 +32,8 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
APACHE_DEFAULT?= 2.4
# Possible values: 48, 5, 6
BDB_DEFAULT?= 5
+# Possible_values: full canna nox devel_full devel_nox
+#EMACS_DEFAULT?= let the flavor be the default if not explicitly set
# Possible values: 2.5
FIREBIRD_DEFAULT?= 2.5
# Possible values: flang (experimental), gfortran
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Feb 1 17:31:35 2018 (r460620)
+++ head/Mk/bsd.port.mk Thu Feb 1 18:03:09 2018 (r460621)
@@ -1365,10 +1365,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif
-.if defined(USE_EMACS)
-.include "${PORTSDIR}/Mk/bsd.emacs.mk"
-.endif
-
.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php"
USES+= php
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Feb 1 17:31:35 2018 (r460620)
+++ head/UPDATING Thu Feb 1 18:03:09 2018 (r460621)
@@ -5,6 +5,45 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20180201:
+ AFFECTS: users of editors/emacs* and all ports using Emacs via USES=emacs
+ AUTHOR: jrm at FreeBSD.org
+
+ The Emacs ports framework has been updated to support flavors and the
+ editors/emacs-nox11 port has been replaced by the nox flavors of
+ editors/emacs and editors/emacs-devel.
+
+ Supported Flavors
+ --------------------------------------------------------
+ editor/emacs: full canna nox
+ editors/emacs-devel: full nox
+ ports using Emacs: full canna nox devel_full devel_nox
+ --------------------------------------------------------
+
+ For those using pre-built packages, if
+
+ # pkg upgrade
+
+ does not install the new Emacs package, use one of
+
+ # pkg install emacs
+ # pkg install emacs-canna
+ # pkg install emacs-nox
+ # pkg install emacs-devel
+ # pkg install emacs-devel_nox
+
+ For those building their own packages, a flavor other than the default must be
+ specified. For example, to build editors/emacs with the nox flavor, or to
+ build a port using Emacs with the devel_full flavor use
+
+ # make FLAVOR=nox install
+ # make FLAVOR=devel_full
+
+ An alternative to the default flavor, full, can be set in make.conf. For
+ example, to set the nox flavor as the default, use
+
+ DEFAULT_VERSIONS+=emacs=nox
+
20180117:
AFFECTS: users of x11-toolkits/kf5-kirigami2 and x11/kf5-plasma-framework
AUTHOR: kde at FreeBSD.org
Modified: head/audio/emms/Makefile
==============================================================================
--- head/audio/emms/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/audio/emms/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,39 +2,22 @@
# $FreeBSD$
PORTNAME= emms
-PORTVERSION= 4.3
-PORTREVISION= 1
+DISTVERSION= 4.4
CATEGORIES= audio elisp
MASTER_SITES= GNU
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports at FreeBSD.org
-COMMENT= The Emacs Multi-Media System
+COMMENT= Emacs Multi-Media System
LICENSE= GPLv3
-USES= gmake makeinfo
-USE_EMACS= yes
-MAKE_ENV= SITELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/emms" \
- INSTALLINFO="${TRUE}"
+# do not depend on base texinfo on 10
+BUILD_DEPENDS= texi2dvi:print/texinfo
+USES= emacs gmake
+
INFO= emms
+NO_ARCH= yes
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} != "emacs25"
-PORTNAMESUFFIX= ${PKGNAMESUFFIX}
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|^\(DESTDIR\)=|\1?=| ; \
- s|^\(PREFIX\)=$$(DESTDIR)|\1?=| ; \
- s|^\(INFODIR\)=|\1?=| ; \
- s|^\(MAN1DIR\)=$$(PREFIX)/share|\1?=$$(PREFIX)| ; \
- s|^\(SITELISP\)=|\1?=| ; \
- s|^\(INSTALLINFO\) =|INSTALLINFO ?=| ; \
- s| \($$(SITELISP)\)| $$(DESTDIR)\1|g ; \
- s| \($$(INFODIR)\)| $$(DESTDIR)\1|g ; \
- s| \($$(MAN1DIR)\)| $$(DESTDIR)\1|g' ${WRKSRC}/Makefile
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/emms/distinfo
==============================================================================
--- head/audio/emms/distinfo Thu Feb 1 17:31:35 2018 (r460620)
+++ head/audio/emms/distinfo Thu Feb 1 18:03:09 2018 (r460621)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495277936
-SHA256 (emms-4.3.tar.gz) = 00112d631eee0cfee80a85c048bfbf7c2d25886067ee02152376208ae87c2c36
-SIZE (emms-4.3.tar.gz) = 287153
+TIMESTAMP = 1515254365
+SHA256 (emms-4.4.tar.gz) = 10ecc2e9c957ca1f80bbf8d9a0473b9eae552218aaea278dc8b10564215513ac
+SIZE (emms-4.4.tar.gz) = 288922
Added: head/audio/emms/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/emms/files/patch-Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -0,0 +1,18 @@
+--- Makefile.orig 2018-01-06 17:26:53 UTC
++++ Makefile
+@@ -10,13 +10,13 @@ ALLCOMPILED=$(wildcard $(LISPDIR)/*.elc)
+ DESTDIR=
+ PREFIX=$(DESTDIR)/usr/local
+ INFODIR=$(PREFIX)/info
+-MAN1DIR=$(PREFIX)/share/man/man1
++MAN1DIR=$(PREFIX)/man/man1
+ BINDIR=$(PREFIX)/bin
+ SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
+
+ GINSTALLINFO = /usr/bin/ginstall-info --info-dir=$(INFODIR)
+ # For systems without ginstall-info
+-INSTALLINFO = /usr/bin/install-info --info-dir=$(INFODIR)
++INSTALLINFO = /usr/local/bin/install-info --info-dir=$(INFODIR)
+ CHANGELOG_CMD = git log --pretty=medium --no-merges
+
+ # The currently released version of EMMS
Added: head/audio/emms/files/patch-doc_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/emms/files/patch-doc_Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -0,0 +1,12 @@
+--- doc/Makefile.orig 2018-01-06 17:09:29 UTC
++++ doc/Makefile
+@@ -7,7 +7,7 @@ clean:
+ rm -f *.info
+
+ %.info: %.texinfo
+- makeinfo --no-split $<
++ ${LOCALBASE}/bin/makeinfo --no-split $<
+
+ %.html: %.texinfo
+- makeinfo --html --no-split $<
++ ${LOCALBASE}/bin/makeinfo --html --no-split $<
Modified: head/cad/dinotrace/Makefile
==============================================================================
--- head/cad/dinotrace/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/cad/dinotrace/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,35 +3,32 @@
PORTNAME= dinotrace
PORTVERSION= 9.4c
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= cad
MASTER_SITES= http://www.veripool.org/ftp/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports at 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_USES= emacs:run
+EMACS_RUN_DEPENDS= verilog-mode.el${EMACS_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
Modified: head/cad/verilog-mode.el/Makefile
==============================================================================
--- head/cad/verilog-mode.el/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/cad/verilog-mode.el/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,9 +3,10 @@
PORTNAME= verilog-mode.el
PORTVERSION= 801
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= cad elisp
MASTER_SITES= http://www.veripool.org/ftp/
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
DISTNAME= ${PORTNAME:R}-${PORTVERSION}.${PORTNAME:E}
EXTRACT_SUFX= .gz
@@ -21,8 +22,7 @@ EXTRACT_AFTER_ARGS= > ${PORTNAME}
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_EMACS= yes
-EMACS_NO_BUILD_DEPENDS= yes
+USES= emacs:run
PLIST_FILES= ${EMACS_SITE_LISPDIR}/${PORTNAME}
Modified: head/databases/bbdb/Makefile
==============================================================================
--- head/databases/bbdb/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/databases/bbdb/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,40 +2,40 @@
# $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 at 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}
-PLIST_SUB+= BBDB_LISPDIR=${BBDB_LISPDIR}
-MAKE_JOBS_UNSAFE= yes
+# do not depend on base texinfo on 10
+BUILD_DEPENDS= texi2dvi:print/texinfo
+USES= emacs
+USE_TEX= latex:build
+
+BBDB_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME}
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-emacs=${EMACS_CMD}
+INFO= bbdb
+PORTDOCS= bbdb.pdf
+NO_ARCH= yes
+PLIST_SUB+= BBDB_LISPDIR=${BBDB_LISPDIR}
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INFO= bbdb
-.endif
-
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>
Modified: head/databases/bbdb/distinfo
==============================================================================
--- head/databases/bbdb/distinfo Thu Feb 1 17:31:35 2018 (r460620)
+++ head/databases/bbdb/distinfo Thu Feb 1 18:03:09 2018 (r460621)
@@ -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
Modified: head/databases/bbdb/pkg-plist
==============================================================================
--- head/databases/bbdb/pkg-plist Thu Feb 1 17:31:35 2018 (r460620)
+++ head/databases/bbdb/pkg-plist Thu Feb 1 18:03:09 2018 (r460621)
@@ -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
Modified: head/databases/gnats4/Makefile
==============================================================================
--- head/databases/gnats4/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/databases/gnats4/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -55,8 +55,9 @@ PORTDOCS= NEWS UPGRADING
OPTIONS_DEFINE= DOCS EMACS SERVER
OPTIONS_DEFAULT=SERVER
OPTIONS_SUB= yes
-EMACS_USE= EMACS=yes
-EMACS_DESC= Add support for default version of EMACS
+EMACS_USES= emacs
+EMACS_DESC= Install Emacs Lisp support file
+EMACS_VARS= EMACS_NO_DEPENDS=yes
SERVER_DESC= Install the gnats server too
.include <bsd.port.options.mk>
Modified: head/deskutils/howm/Makefile
==============================================================================
--- head/deskutils/howm/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/deskutils/howm/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -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 at FreeBSD.org
COMMENT= Write fragmentarily and read collectively
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= emacs
+
GNU_CONFIGURE= yes
-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
+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>
Modified: head/deskutils/howm/files/patch-howm-vars.el
==============================================================================
--- head/deskutils/howm/files/patch-howm-vars.el Thu Feb 1 17:31:35 2018 (r460620)
+++ head/deskutils/howm/files/patch-howm-vars.el Thu Feb 1 18:03:09 2018 (r460621)
@@ -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]
Modified: head/deskutils/howm/pkg-plist
==============================================================================
--- head/deskutils/howm/pkg-plist Thu Feb 1 17:31:35 2018 (r460620)
+++ head/deskutils/howm/pkg-plist Thu Feb 1 18:03:09 2018 (r460621)
@@ -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
Modified: head/devel/cask/Makefile
==============================================================================
--- head/devel/cask/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/cask/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,38 +2,42 @@
PORTNAME= cask
PORTVERSION= 0.8.1
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs at FreeBSD.org
COMMENT= Project management tool for Emacs
LICENSE= GPLv3
+USES= emacs python shebangfix
USE_GITHUB= yes
-USE_EMACS= yes
-USES= python
+
+NO_ARCH= yes
NO_BUILD= yes
-PLIST_FILES= %%EMACS_SITE_LISPDIR%%/cask.el \
- %%EMACS_SITE_LISPDIR%%/cask-bootstrap.el \
- %%EMACS_SITE_LISPDIR%%/cask-cli.el \
- %%EMACS_SITE_LISPDIR%%/package-legacy.el \
- %%EMACS_SITE_LISPDIR%%/templates/init.tpl \
- %%EMACS_SITE_LISPDIR%%/templates/init-dev.tpl \
+PLIST_FILES= ${EMACS_SITE_LISPDIR}/cask.el \
+ ${EMACS_SITE_LISPDIR}/cask-bootstrap.el \
+ ${EMACS_SITE_LISPDIR}/cask-cli.el \
+ ${EMACS_SITE_LISPDIR}/package-legacy.el \
+ ${EMACS_SITE_LISPDIR}/templates/init.tpl \
+ ${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
do-install:
- cd ${WRKSRC} && ${INSTALL_DATA} \
- ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} \
+ ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
- cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
- ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
+ (cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
+ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates)
${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \
${STAGEDIR}${PREFIX}/bin/cask
Modified: head/devel/cdash/Makefile
==============================================================================
--- head/devel/cdash/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/cdash/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,7 +3,7 @@
PORTNAME= cdash
PORTVERSION= 2.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.cdash.org/wp-content/uploads/2014/11/
DISTNAME= CDash-2-2-3
Modified: head/devel/clojure-cider/Makefile
==============================================================================
--- head/devel/clojure-cider/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/clojure-cider/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,23 +3,24 @@
PORTNAME= clojure-cider
PORTVERSION= 0.16.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= bofh at 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}
+USES= emacs
USE_GITHUB= yes
GH_ACCOUNT= clojure-emacs
GH_PROJECT= cider
-
-USE_EMACS= yes
NO_BUILD= yes
NO_ARCH= yes
Modified: head/devel/dash.el/Makefile
==============================================================================
--- head/devel/dash.el/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/dash.el/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,23 +2,26 @@
PORTNAME= dash.el
PORTVERSION= 2.13.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs at FreeBSD.org
COMMENT= Modern list library for Emacs
LICENSE= GPLv3
+USES= emacs
USE_GITHUB= yes
GH_ACCOUNT= magnars
-USE_EMACS= yes
+
+NO_ARCH= yes
NO_BUILD= yes
-PLIST_FILES= %%EMACS_SITE_LISPDIR%%/dash.el \
- %%EMACS_SITE_LISPDIR%%/dash-functional.el
+PLIST_FILES= ${EMACS_SITE_LISPDIR}/dash.el \
+ ${EMACS_SITE_LISPDIR}/dash-functional.el
do-install:
- cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
- ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
+ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
.include <bsd.port.mk>
Modified: head/devel/distel/Makefile
==============================================================================
--- head/devel/distel/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/distel/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,20 +2,23 @@
PORTNAME= distel
PORTVERSION= 4.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= olgeni at FreeBSD.org
COMMENT= Distel extends Emacs Lisp with Erlang-style message passing
+LICENSE= MIT
+
BUILD_DEPENDS+= erlc:lang/erlang
+USES= emacs
USE_GITHUB= yes
GH_ACCOUNT= massemanet
PLIST_SUB= VERSION="${PORTVERSION}"
-USE_EMACS= yes
NO_ARCH= yes
DISTEL_DOCS= AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
Modified: head/devel/epl.el/Makefile
==============================================================================
--- head/devel/epl.el/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/epl.el/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -2,23 +2,25 @@
PORTNAME= epl.el
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel elisp
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= hrs at FreeBSD.org
COMMENT= Emacs Package Library
LICENSE= GPLv3
+USES= emacs
USE_GITHUB= yes
GH_ACCOUNT= cask
GH_PROJECT= epl
-USE_EMACS= yes
+
NO_BUILD= yes
-PLIST_FILES= %%EMACS_SITE_LISPDIR%%/epl.el
+PLIST_FILES= ${EMACS_SITE_LISPDIR}/epl.el
do-install:
- cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
- ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${PLIST_FILES:M*.el:T} \
+ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
.include <bsd.port.mk>
Modified: head/devel/git-modes/Makefile
==============================================================================
--- head/devel/git-modes/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/git-modes/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,10 +3,10 @@
PORTNAME= git-modes
PORTVERSION= 1.2.6
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu at utahime.org
COMMENT= GNU Emacs modes for Git-related files
@@ -14,11 +14,10 @@ COMMENT= GNU Emacs modes for Git-related files
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= emacs gmake
USE_GITHUB= yes
GH_ACCOUNT= magit
-USES= gmake
-USE_EMACS= yes
PORTDOCS= README.md
NO_ARCH= yes
Modified: head/devel/magit/Makefile
==============================================================================
--- head/devel/magit/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/magit/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,8 +3,9 @@
PORTNAME= magit
PORTVERSION= 2.11.0
+PORTREVISION= 1
CATEGORIES= devel elisp
-PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= yasu at utahime.org
COMMENT= Interface to Git for Emacs
@@ -12,27 +13,18 @@ COMMENT= Interface to Git for Emacs
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${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+ with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
+RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
+ with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
-USES= gmake makeinfo
-USE_EMACS= yes
+USES= emacs gmake makeinfo
USE_GITHUB= yes
+
INFO= magit magit-popup
PORTDOCS= AUTHORS.md
NO_ARCH= yes
-OPTIONS_DEFINE= DOCS GIT_SUBVERSION
-GIT_SUBVERSION_DESC= Use devel/git-subversion as backend
-GIT_SUBVERSION_BUILD_DEPENDS= git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_BUILD_DEPENDS_OFF= git>0:devel/git
-GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:devel/git
-
-.include <bsd.port.pre.mk>
-
ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
MAKE_ENV+= INSTALL_INFO=install-info \
LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
@@ -42,4 +34,11 @@ MAKE_ENV+= INSTALL_INFO=install-info \
docdir=${DOCSDIR}
PLIST_SUB+= ELISPDIR=${ELISPDIR}
-.include <bsd.port.post.mk>
+OPTIONS_DEFINE= DOCS GIT_SUBVERSION
+GIT_SUBVERSION_DESC= Use devel/git-subversion as backend
+GIT_SUBVERSION_BUILD_DEPENDS= git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_BUILD_DEPENDS_OFF= git>0:devel/git
+GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:devel/git
+
+.include <bsd.port.mk>
Modified: head/devel/p5-Sepia/Makefile
==============================================================================
--- head/devel/p5-Sepia/Makefile Thu Feb 1 17:31:35 2018 (r460620)
+++ head/devel/p5-Sepia/Makefile Thu Feb 1 18:03:09 2018 (r460621)
@@ -3,10 +3,11 @@
PORTNAME= Sepia
PORTVERSION= 0.992
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
+PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list