- update to 3.0

- the licence was changed to GPLv3
- use Emacs 22 by default
- update my mail address

3 files changed, 28 insertions, 9 deletions

diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 9f4a30f3133f..475cb936a098 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	emms
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	3.0
 CATEGORIES=	audio elisp
-MASTER_SITES=	http://www.gnu.org/software/emms/releases/ \
+MASTER_SITES=	http://www.gnu.org/software/emms/download/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	EMMS is the Emacs Multi-Media System
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
+EMACS_PORT_NAME?=	emacs22
 
-.if ${EMACS_PORT_NAME} != "emacs21"
+.if ${EMACS_PORT_NAME} != "emacs22"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
 .endif
 
diff --git a/audio/emms/distinfo b/audio/emms/distinfo
index a9f1d27080de..ffe1ef11178e 100644
--- a/audio/emms/distinfo
+++ b/audio/emms/distinfo
@@ -1,3 +1,3 @@
-MD5 (emms-2.1.tar.gz) = 4ecb3383b5983df381be6f1d0fb2cb1a
-SHA256 (emms-2.1.tar.gz) = 17028f50ac36038191e41fda1ff2e739343ac3e50c560c395790046a2bdd6437
-SIZE (emms-2.1.tar.gz) = 147749
+MD5 (emms-3.0.tar.gz) = 0ffb070394db0a8ca9152c66c72809c0
+SHA256 (emms-3.0.tar.gz) = 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594
+SIZE (emms-3.0.tar.gz) = 200838
diff --git a/audio/emms/pkg-plist b/audio/emms/pkg-plist
index be050265bd4c..0a53bcc09d7b 100644
--- a/audio/emms/pkg-plist
+++ b/audio/emms/pkg-plist
@@ -1,8 +1,16 @@
 %%EMACS_SITE_LISPDIR%%/emms/emms-auto.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-bookmarks.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-bookmarks.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-browser.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-browser.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-cache.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-cache.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-compat.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-compat.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-history.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-history.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-i18n.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-i18n.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-mp3info.el
@@ -15,9 +23,13 @@
 %%EMACS_SITE_LISPDIR%%/emms/emms-info.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-last-played.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-last-played.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-lastfm.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-lastfm.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-maint.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-mark.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-mark.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-metaplaylist-mode.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-metaplaylist-mode.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-mode-line-icon.el
@@ -32,6 +44,8 @@
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-mplayer.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-mode.el
@@ -50,12 +64,18 @@
 %%EMACS_SITE_LISPDIR%%/emms/emms-stream-info.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-streams.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-streams.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-tag-editor.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-tag-editor.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-url.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-url.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-volume-amixer.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-volume-amixer.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-volume.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-volume.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms.el
 %%EMACS_SITE_LISPDIR%%/emms/emms.elc
+%%EMACS_SITE_LISPDIR%%/emms/jack.el
+%%EMACS_SITE_LISPDIR%%/emms/jack.elc
 %%EMACS_SITE_LISPDIR%%/emms/later-do.el
 %%EMACS_SITE_LISPDIR%%/emms/later-do.elc
 %%EMACS_SITE_LISPDIR%%/emms/ogg-comment.el