From owner-svn-ports-all@freebsd.org Fri Mar 23 16:38:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9A89F57D1E; Fri, 23 Mar 2018 16:38:23 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FE917D85C; Fri, 23 Mar 2018 16:38:23 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 677FD22628; Fri, 23 Mar 2018 16:38:23 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2NGcNnd002605; Fri, 23 Mar 2018 16:38:23 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NGcM8d002594; Fri, 23 Mar 2018 16:38:22 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201803231638.w2NGcM8d002594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Fri, 23 Mar 2018 16:38:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465367 - in head: . mail mail/wanderlust mail/wanderlust-devel mail/wanderlust/files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head: . mail mail/wanderlust mail/wanderlust-devel mail/wanderlust/files X-SVN-Commit-Revision: 465367 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 16:38:24 -0000 Author: nobutaka Date: Fri Mar 23 16:38:21 2018 New Revision: 465367 URL: https://svnweb.freebsd.org/changeset/ports/465367 Log: - Integrate mail/wanderlust-devel into mail/wanderlust. - Update to the snapshot on 2018/03/17. Added: head/mail/wanderlust/files/patch-WL-MK (contents, props changed) Deleted: head/mail/wanderlust-devel/ head/mail/wanderlust/files/_pkg.el head/mail/wanderlust/files/extra-patch-WL-MK head/mail/wanderlust/files/patch-utils_ptexinfmt.el head/mail/wanderlust/files/patch-wl_wl-draft.el Modified: head/MOVED head/mail/Makefile head/mail/wanderlust/Makefile head/mail/wanderlust/distinfo head/mail/wanderlust/files/patch-Makefile head/mail/wanderlust/files/patch-samples_en_dot.wl head/mail/wanderlust/files/patch-samples_ja_dot.wl head/mail/wanderlust/pkg-descr head/mail/wanderlust/pkg-message head/mail/wanderlust/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Mar 23 16:33:11 2018 (r465366) +++ head/MOVED Fri Mar 23 16:38:21 2018 (r465367) @@ -10234,3 +10234,4 @@ net-im/ktp-text-ui|net-im/ktp-text-ui-kde4|2018-03-23| net-im/kde-telepathy|net-im/telepathy-kde4|2018-03-23|Make room for KDE updates net-im/plasma-applet-ktp|net-im/plasma-applet-ktp-kde4|2018-03-23|Make room for KDE updates multimedia/gmencoder||2018-03-23|Abandonware, does not support modern codecs +mail/wanderlust-devel|mail/wanderlust|2018-03-23|Removed, use mail/wanderlust instead Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/Makefile Fri Mar 23 16:38:21 2018 (r465367) @@ -741,7 +741,6 @@ SUBDIR += vqadmin SUBDIR += vrfy SUBDIR += wanderlust - SUBDIR += wanderlust-devel SUBDIR += websieve SUBDIR += whoson SUBDIR += wmbiff Modified: head/mail/wanderlust/Makefile ============================================================================== --- head/mail/wanderlust/Makefile Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/Makefile Fri Mar 23 16:38:21 2018 (r465367) @@ -2,37 +2,35 @@ # $FreeBSD$ PORTNAME= wanderlust -PORTVERSION= 2.14.0 -PORTREVISION= 19 +PORTVERSION= 2.15.9.b.${SNAPDATE} CATEGORIES= mail elisp -MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \ - http://www.jpl.org/elips/wl/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} -DISTNAME= wl-${DISTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Mail and news system for Emacs -LICENSE= GPLv2+ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \ - emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} -RUN_DEPENDS= semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \ - emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} +BUILD_DEPENDS= emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \ + semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \ + x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR} +RUN_DEPENDS= emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \ + semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} USES= emacs EMACS_FLAVORS_EXCLUDE= devel_full devel_nox # www/emacs-w3m fails to configure +USE_GITHUB= yes +GH_TAGNAME= f0c8c4e NO_ARCH= yes -CONFLICTS= wanderlust-devel +SNAPDATE= 20180317 MAKE_ARGS+= EMACS=${EMACS_CMD} \ FLAGS="-batch -q -no-site-file" \ LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} \ INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \ PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons -ALL_TARGET= all info -INSTALL_TARGET= install install-info INFO= wl wl-ja PORTDATA= ja.Emacs Modified: head/mail/wanderlust/distinfo ============================================================================== --- head/mail/wanderlust/distinfo Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/distinfo Fri Mar 23 16:38:21 2018 (r465367) @@ -1,2 +1,3 @@ -SHA256 (wl-2.14.0.tar.gz) = 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f -SIZE (wl-2.14.0.tar.gz) = 1101505 +TIMESTAMP = 1521635995 +SHA256 (wanderlust-wanderlust-2.15.9.b.20180317-f0c8c4e_GH0.tar.gz) = 120b6a400d25d0f3b90ed6b10a32fbb2285c0fd80f4c06d8eee414c421dbfb78 +SIZE (wanderlust-wanderlust-2.15.9.b.20180317-f0c8c4e_GH0.tar.gz) = 1205062 Modified: head/mail/wanderlust/files/patch-Makefile ============================================================================== --- head/mail/wanderlust/files/patch-Makefile Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/files/patch-Makefile Fri Mar 23 16:38:21 2018 (r465367) @@ -1,4 +1,4 @@ ---- Makefile.orig 2005-01-23 10:10:44 UTC +--- Makefile.orig 2017-06-28 06:06:07 UTC +++ Makefile @@ -91,7 +91,7 @@ install-package: $(PACKAGEDIR) $(PIXMAPDIR) @@ -9,3 +9,15 @@ install-info: $(EMACS) $(FLAGS) -l WL-MK -f install-wl-info $(INFODIR) +@@ -109,9 +109,9 @@ mostlyclean-dvi: + clean-dvi: mostlyclean-dvi + rm -f doc/*.dvi + +-all: elc ++all: elc info + +-install: install-elc ++install: install-elc install-info + + uninstall: uninstall-elc + Added: head/mail/wanderlust/files/patch-WL-MK ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/wanderlust/files/patch-WL-MK Fri Mar 23 16:38:21 2018 (r465367) @@ -0,0 +1,20 @@ +--- WL-MK.orig 2017-06-28 06:06:07 UTC ++++ WL-MK +@@ -131,7 +131,7 @@ + (defvar PIXMAPDIR + (if (string= pixmap-dir "NONE") + (if packagedir +- (expand-file-name "etc/wl/" packagedir) ++ (expand-file-name "wl/icons/" packagedir) + (expand-file-name "wl/icons/" data-directory)) + pixmap-dir))) + (if PIXMAPDIR +@@ -148,7 +148,7 @@ + (princ (format "LISPDIR is %s\n" LISPDIR)) + (setq command-line-args-left (cdr command-line-args-left)) + ;; PIXMAPDIR check. +- (config-wl-pixmap-dir) ++ (config-wl-pixmap-dir "%%EMACS_LIBDIR_WITH_VER%%/etc") + (princ "\n")) + + (defun update-version () Modified: head/mail/wanderlust/files/patch-samples_en_dot.wl ============================================================================== --- head/mail/wanderlust/files/patch-samples_en_dot.wl Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/files/patch-samples_en_dot.wl Fri Mar 23 16:38:21 2018 (r465367) @@ -1,6 +1,6 @@ ---- samples/en/dot.wl.orig 2004-11-26 03:59:36 UTC +--- samples/en/dot.wl.orig 2017-06-28 06:06:07 UTC +++ samples/en/dot.wl -@@ -314,7 +314,7 @@ +@@ -327,7 +327,7 @@ ;; for Emacs21 ((and (not (featurep 'xemacs)) Modified: head/mail/wanderlust/files/patch-samples_ja_dot.wl ============================================================================== --- head/mail/wanderlust/files/patch-samples_ja_dot.wl Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/files/patch-samples_ja_dot.wl Fri Mar 23 16:38:21 2018 (r465367) @@ -1,6 +1,6 @@ ---- samples/ja/dot.wl.orig 2004-11-26 03:59:37 UTC +--- samples/ja/dot.wl.orig 2017-06-28 06:06:07 UTC +++ samples/ja/dot.wl -@@ -320,7 +320,7 @@ +@@ -332,7 +332,7 @@ ;; for Emacs21 ((and (not (featurep 'xemacs)) Modified: head/mail/wanderlust/pkg-descr ============================================================================== --- head/mail/wanderlust/pkg-descr Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/pkg-descr Fri Mar 23 16:38:21 2018 (r465367) @@ -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 Modified: head/mail/wanderlust/pkg-message ============================================================================== --- head/mail/wanderlust/pkg-message Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/pkg-message Fri Mar 23 16:38:21 2018 (r465367) @@ -1,9 +1,10 @@ ************************************************************ -* Before using Wanderlust, you must include the line below * -* in one of your Emacs initialization files. * +* Before using Wanderlust, you must set following elisp * +* to your own .emacs file. * * * * (require 'wanderlust-startup) * * * * Sample configuration files are installed into * -* ${PREFIX}/share/examples/wanderlust. * +* ${PREFIX}/share/examples/wanderlust. Please copy to * +* your home directory and edit them. * ************************************************************ Modified: head/mail/wanderlust/pkg-plist ============================================================================== --- head/mail/wanderlust/pkg-plist Fri Mar 23 16:33:11 2018 (r465366) +++ head/mail/wanderlust/pkg-plist Fri Mar 23 16:38:21 2018 (r465367) @@ -122,16 +122,20 @@ %%EMACS_SITE_LISPDIR%%/wl/elmo-multi.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-net.el %%EMACS_SITE_LISPDIR%%/wl/elmo-net.elc -%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.el -%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.el %%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-null.el %%EMACS_SITE_LISPDIR%%/wl/elmo-null.elc +%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.el %%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.el %%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.elc +%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.elc +%%EMACS_SITE_LISPDIR%%/wl/elmo-search.el +%%EMACS_SITE_LISPDIR%%/wl/elmo-search.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.el %%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.elc %%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.el @@ -178,8 +182,6 @@ %%EMACS_SITE_LISPDIR%%/wl/slp.elc %%EMACS_SITE_LISPDIR%%/wl/ssl.el %%EMACS_SITE_LISPDIR%%/wl/ssl.elc -%%EMACS_SITE_LISPDIR%%/wl/utf7.el -%%EMACS_SITE_LISPDIR%%/wl/utf7.elc %%EMACS_SITE_LISPDIR%%/wl/wl-acap.el %%EMACS_SITE_LISPDIR%%/wl/wl-acap.elc %%EMACS_SITE_LISPDIR%%/wl/wl-action.el @@ -215,6 +217,8 @@ %%EMACS_SITE_LISPDIR%%/wl/wl-mime.el %%EMACS_SITE_LISPDIR%%/wl/wl-mime.elc %%EMACS_SITE_LISPDIR%%/wl/wl-news.el +%%EMACS_SITE_LISPDIR%%/wl/wl-qs.el +%%EMACS_SITE_LISPDIR%%/wl/wl-qs.elc %%EMACS_SITE_LISPDIR%%/wl/wl-refile.el %%EMACS_SITE_LISPDIR%%/wl/wl-refile.elc %%EMACS_SITE_LISPDIR%%/wl/wl-score.el