Update to the snapshot on 2014/06/13.

Use USE_GITHUB.
Update WWW in pkg-descr.
Support staging.

4 files changed, 32 insertions, 32 deletions

diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index bc7007447d54..9d48d398d400 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -3,13 +3,8 @@
 
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES=	mail elisp
-MASTER_SITES=	http://www.jpl.org/ftp/pub/github-snapshots/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nobutaka
 PKGNAMESUFFIX=	-devel-${EMACS_PORT_NAME}
-DISTNAME=	wanderlust-${SNAPDATE}${SNAPTIME}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Yet another message interface on Emacsen
@@ -18,15 +13,23 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_EMACS=	yes
+USE_GITHUB=	yes
 
-SNAPDATE=	20120923
-SNAPTIME=	0900
+GH_ACCOUNT=	wanderlust
+GH_PROJECT=	wanderlust
+GH_TAGNAME=	c4cb06e2d4eda1070d3319ca1fa59e94844374aa
+GH_COMMIT=	c4cb06e
+
+SNAPDATE=	20140613
 
 CONFLICTS=	wanderlust-*-2.14.*
 NO_LATEST_LINK=	yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT=DOCS EXAMPLES
+
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 MIMEUI_PRODUCT=	semi
@@ -74,9 +77,10 @@ PLIST_SUB+=	DIRSECTION=${DIRSECTION} \
 
 PLIST=		${PKGDIR}/pkg-plist
 MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
-		LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
-		FLAGS="-batch -q -no-site-file" \
-		INFODIR=${INFODIR}
+		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
+		INFODIR=${STAGEDIR}${INFODIR} \
+		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR_WITH_VER}/etc/wl/icons \
+		FLAGS="-batch -q -no-site-file"
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
@@ -86,43 +90,42 @@ post-configure:
 
 post-install:
 .if !exists(${EMACS_W3M_LISP_FILE})
-	${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
+	${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MAKE} install-docs
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MAKE} install-examples
 .endif
 	@${MAKE} install-utils
-	@${CAT} ${PKGMESSAGE}
 
 # local targets
 install-docs:
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR_JA}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR_JA}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR_JA}
 .endfor
 
 install-examples:
 .for l in ${EXAMPLESLANG}
-	${MKDIR} ${EXAMPLESDIR}/$l
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$l
 	for i in ${EXAMPLES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${EXAMPLESDIR}/$l; \
+		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${STAGEDIR}${EXAMPLESDIR}/$l; \
 	done
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${EXAMPLESDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${EXAMPLESDIR}/ja
 
 install-utils:
-	@${MKDIR} ${PREFIX}/${UTILSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${UTILSDIR}
 .for i in ${UTILS}
-	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
+	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${STAGEDIR}${PREFIX}/${UTILSDIR}
 .endfor
 	@${MKDIR} ${PREFIX}/${STARTUPDIR}
-	@${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
+	@${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el ${STAGEDIR}${PREFIX}/${STARTUPDIR}
 
 .include <bsd.port.post.mk>
diff --git a/mail/wanderlust-devel/distinfo b/mail/wanderlust-devel/distinfo
index 6db0c8db422a..89aee9ba19db 100644
--- a/mail/wanderlust-devel/distinfo
+++ b/mail/wanderlust-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wanderlust-201209230900.tar.gz) = 203ed484b0c8ef621555eb5f6177e5329d78c723ec40a1d9202c205cdeb87967
-SIZE (wanderlust-201209230900.tar.gz) = 1148046
+SHA256 (wanderlust-2.15.9.b.20140613.tar.gz) = 504cf6f61fa0e20258d26b881c9adf003b906b216d1af21f51139328ff7d67b5
+SIZE (wanderlust-2.15.9.b.20140613.tar.gz) = 1172580
diff --git a/mail/wanderlust-devel/pkg-descr b/mail/wanderlust-devel/pkg-descr
index e147033d2354..25112051e34b 100644
--- a/mail/wanderlust-devel/pkg-descr
+++ b/mail/wanderlust-devel/pkg-descr
@@ -18,4 +18,4 @@ The features of Wanderlust are as follows:
  * Compression Folder.
  * Automatic expiration of old messages.
 
-WWW:	http://www.gohome.org/wl/
+WWW:	https://github.com/wanderlust/wanderlust/
diff --git a/mail/wanderlust-devel/pkg-plist b/mail/wanderlust-devel/pkg-plist
index be8e358281dd..f08bc11df9ad 100644
--- a/mail/wanderlust-devel/pkg-plist
+++ b/mail/wanderlust-devel/pkg-plist
@@ -7,7 +7,6 @@
 %%WL_LISPDIR%%/acap.el
 %%WL_LISPDIR%%/acap.elc
 %%WL_LISPDIR%%/bbdb-wl.el
-@unexec rm -f %D/%%WL_LISPDIR%%/bbdb-wl.elc
 %%WL_LISPDIR%%/elmo-access.el
 %%WL_LISPDIR%%/elmo-access.elc
 %%WL_LISPDIR%%/elmo-archive.el
@@ -81,7 +80,7 @@
 %%WL_LISPDIR%%/elsp-spamoracle.el
 %%WL_LISPDIR%%/elsp-spamoracle.elc
 %%WL_LISPDIR%%/im-wl.el
-@unexec rm -f %D/%%WL_LISPDIR%%/im-wl.elc
+%%WL_LISPDIR%%/im-wl.elc
 %%WL_LISPDIR%%/modb-entity.el
 %%WL_LISPDIR%%/modb-entity.elc
 %%WL_LISPDIR%%/modb-legacy.el
@@ -100,8 +99,6 @@
 %%WL_LISPDIR%%/slp.elc
 %%WL_LISPDIR%%/ssl.el
 %%WL_LISPDIR%%/ssl.elc
-%%WL_LISPDIR%%/utf7.el
-%%WL_LISPDIR%%/utf7.elc
 %%WL_LISPDIR%%/wl-acap.el
 %%WL_LISPDIR%%/wl-acap.elc
 %%WL_LISPDIR%%/wl-action.el