aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorjrm <jrm@FreeBSD.org>2018-02-02 02:03:09 +0800
committerjrm <jrm@FreeBSD.org>2018-02-02 02:03:09 +0800
commit8e8d43ac5d573ba0718403b8beae8b36fa9baf37 (patch)
tree4a6b8513515fb032f2183d945863a1d39dbcd0c1 /audio
parent48204ec74d19374b66c2d2475473f797a292c193 (diff)
downloadfreebsd-ports-gnome-8e8d43ac5d573ba0718403b8beae8b36fa9baf37.tar.gz
freebsd-ports-gnome-8e8d43ac5d573ba0718403b8beae8b36fa9baf37.tar.zst
freebsd-ports-gnome-8e8d43ac5d573ba0718403b8beae8b36fa9baf37.zip
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
Diffstat (limited to 'audio')
-rw-r--r--audio/emms/Makefile35
-rw-r--r--audio/emms/distinfo6
-rw-r--r--audio/emms/files/patch-Makefile18
-rw-r--r--audio/emms/files/patch-doc_Makefile12
4 files changed, 42 insertions, 29 deletions
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 1711cb408a26..b3ed9ae77167 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -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@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
-INFO= emms
-
-.include <bsd.port.pre.mk>
+USES= emacs gmake
-.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
+INFO= emms
+NO_ARCH= yes
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/emms/distinfo b/audio/emms/distinfo
index f6e8a0f3df66..0aca9f3aacf4 100644
--- a/audio/emms/distinfo
+++ b/audio/emms/distinfo
@@ -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
diff --git a/audio/emms/files/patch-Makefile b/audio/emms/files/patch-Makefile
new file mode 100644
index 000000000000..d1988b0ac182
--- /dev/null
+++ b/audio/emms/files/patch-Makefile
@@ -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
diff --git a/audio/emms/files/patch-doc_Makefile b/audio/emms/files/patch-doc_Makefile
new file mode 100644
index 000000000000..3c8e6b3b4176
--- /dev/null
+++ b/audio/emms/files/patch-doc_Makefile
@@ -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 $<