ports/124391: [MAINTAINER] mail/mew: update to 6.1
Hiroto Kagotani
hiroto.kagotani at gmail.com
Sun Jun 8 09:40:01 UTC 2008
>Number: 124391
>Category: ports
>Synopsis: [MAINTAINER] mail/mew: update to 6.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 08 09:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Hiroto Kagotani
>Release: 6.3-RELEASE-p1
>Organization:
Okayama Univ.
>Environment:
FreeBSD myhost.mydomain 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Wed Feb 20 10:53:26 JST 2008 root at myhost.mydomain:/usr/obj/usr/src/sys/SMP i386
>Description:
Update to 6.1, including:
- Remove XEmacs support
- Move pkg-message to files/pkg-message.in
- Add an option to depend on rubygem-sqlite3
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru ../mew5/Makefile ./Makefile
--- ../mew5/Makefile 2007-05-20 05:14:25.000000000 +0900
+++ ./Makefile 2008-06-07 21:35:05.000000000 +0900
@@ -7,8 +7,7 @@
#
PORTNAME= mew
-PORTVERSION= 5.2
-PORTREVISION= 1
+PORTVERSION= 6.1
CATEGORIES= mail elisp
MASTER_SITES= http://www.Mew.org/Release/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -16,13 +15,23 @@
MAINTAINER?= hiroto.kagotani at gmail.com
COMMENT?= Messaging in the Emacs World for emacs
+OPTIONS= DATABASE "Database feature support (with Ruby & Sqlite3)" on
+
# emacs port setup
USE_EMACS= yes
-EMACS_PORT_NAME?= emacs21
+EMACS_PORT_NAME?= emacs22
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_DATABASE)
+RUN_DEPENDS= rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+.endif
+
+SUB_FILES= pkg-message
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-elispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew \
- --with-etcdir=${LOCALBASE}/${EMACS_LIBDIR}/etc/mew
+ --with-etcdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/mew/etc
# target name for make build and install
ALL_TARGET= all info
@@ -39,11 +48,6 @@
INFO+= mew.jis
.endif
-pre-build:
- ${REINPLACE_CMD} -e \
- 's,%%MEWICONDIR%%,${LOCALBASE}/${EMACS_LIBDIR}/etc/mew,' \
- ${WRKSRC}/mew-key.el
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
@@ -56,4 +60,4 @@
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nru ../mew5/distinfo ./distinfo
--- ../mew5/distinfo 2007-01-17 00:02:43.000000000 +0900
+++ ./distinfo 2008-06-07 21:10:51.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (mew-5.2.tar.gz) = be0ac05179daed9b7c1329c9264d0f17
-SHA256 (mew-5.2.tar.gz) = fff0c3e67f38d779552c4caea6dfe53fbe074f5fc653fdc0fd51ee0b5ce1f8ed
-SIZE (mew-5.2.tar.gz) = 969584
+MD5 (mew-6.1.tar.gz) = 44c2f841de5503d3195547ec512f0ab5
+SHA256 (mew-6.1.tar.gz) = 8d74f57675ad2b06981380f212671b138ff5f1f65dffc3833ac59b800acdb8c3
+SIZE (mew-6.1.tar.gz) = 957623
diff -Nru ../mew5/files/patch-bin_Makefile.in ./files/patch-bin_Makefile.in
--- ../mew5/files/patch-bin_Makefile.in 2007-01-17 00:02:43.000000000 +0900
+++ ./files/patch-bin_Makefile.in 2008-05-28 15:38:13.000000000 +0900
@@ -1,5 +1,5 @@
---- bin/Makefile.in.orig Mon Oct 23 08:18:23 2006
-+++ bin/Makefile.in Sun Jan 14 19:30:35 2007
+--- bin/Makefile.in.orig 2008-02-18 19:24:27.000000000 +0900
++++ bin/Makefile.in 2008-05-28 15:37:21.000000000 +0900
@@ -25,7 +25,9 @@
COFLAG = -o $@
LIBS = @LIBS@
@@ -11,7 +11,7 @@
LN = ln
RM = rm -f
MKDIR = mkdir -p
-@@ -101,27 +103,27 @@
+@@ -105,31 +107,31 @@
- at if [ ! -d $(DESTDIR)$(bindir) ]; then \
$(MKDIR) $(DESTDIR)$(bindir); \
fi
@@ -25,10 +25,14 @@
- $(INSTALL) -m 555 $(PRG3) $(DESTDIR)$(bindir)
- $(INSTALL) -m 555 $(PRG4) $(DESTDIR)$(bindir)
- $(INSTALL) -m 555 $(PRG5) $(DESTDIR)$(bindir)
+- $(INSTALL) -m 555 $(PRG6) $(DESTDIR)$(bindir)
+- $(INSTALL) -m 555 $(PRG7) $(DESTDIR)$(bindir)
+ ${INSTALL_PROGRAM} $(PRG2) $(DESTDIR)$(bindir)
+ ${INSTALL_PROGRAM} $(PRG3) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} $(PRG4) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} $(PRG5) $(DESTDIR)$(bindir)
++ ${INSTALL_SCRIPT} $(PRG6) $(DESTDIR)$(bindir)
++ ${INSTALL_SCRIPT} $(PRG7) $(DESTDIR)$(bindir)
- at if [ ! -d $(DESTDIR)$(mandir) ]; then \
$(MKDIR) $(DESTDIR)$(mandir); \
fi
@@ -42,10 +46,14 @@
- $(INSTALL) -m 444 $(MAN3) $(DESTDIR)$(mandir)
- $(INSTALL) -m 444 $(MAN4) $(DESTDIR)$(mandir)
- $(INSTALL) -m 444 $(MAN5) $(DESTDIR)$(mandir)
+- $(INSTALL) -m 444 $(MAN6) $(DESTDIR)$(mandir)
+- $(INSTALL) -m 444 $(MAN7) $(DESTDIR)$(mandir)
+ ${INSTALL_DATA} $(MAN2) $(DESTDIR)$(mandir)
+ ${INSTALL_DATA} $(MAN3) $(DESTDIR)$(mandir)
+ ${INSTALL_DATA} $(MAN4) $(DESTDIR)$(mandir)
+ ${INSTALL_DATA} $(MAN5) $(DESTDIR)$(mandir)
++ ${INSTALL_DATA} $(MAN6) $(DESTDIR)$(mandir)
++ ${INSTALL_DATA} $(MAN7) $(DESTDIR)$(mandir)
##
## End of Makefile
diff -Nru ../mew5/files/patch-mew-key.el ./files/patch-mew-key.el
--- ../mew5/files/patch-mew-key.el 2007-01-17 00:02:43.000000000 +0900
+++ ./files/patch-mew-key.el 1970-01-01 09:00:00.000000000 +0900
@@ -1,23 +0,0 @@
---- mew-key.el.orig Thu Jan 4 15:49:11 2007
-+++ mew-key.el Sun Jan 14 19:19:22 2007
-@@ -610,13 +610,16 @@
- ;;;
-
- (defun mew-which-mew-etc ()
-- (let ((file "mew.el")
-- (path load-path))
-+ (let ((file1 "mew.el")
-+ (file2 "Mew.png")
-+ (path (list "%%MEWICONDIR%%" load-path)))
- (catch 'loop
- (while path
-- (if (file-exists-p (expand-file-name file (car path)))
-+ (if (file-exists-p (expand-file-name file1 (car path)))
- (throw 'loop (expand-file-name "etc" (car path)))
-- (setq path (cdr path)))))))
-+ (if (file-exists-p (expand-file-name file2 (car path)))
-+ (throw 'loop (expand-file-name (car path)))
-+ (setq path (cdr path))))))))
-
- (defvar mew-icon-directory (mew-which-mew-etc))
-
diff -Nru ../mew5/files/pkg-message.in ./files/pkg-message.in
--- ../mew5/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900
+++ ./files/pkg-message.in 2008-05-28 21:26:14.000000000 +0900
@@ -0,0 +1,15 @@
+*************************************************************************
+You may want to add following lines to your ~/.emacs and/or ~/.mew.el.
+
+ (autoload 'mew "mew" nil t)
+ (autoload 'mew-send "mew" nil t)
+ (setq mew-mail-domain "domain of e-mail address")
+ (setq mew-pop-server "your POP server") ;; if not localhost
+ (setq mew-smtp-server "your SMTP server") ;; if not localhost
+ ;; using fetch for PGP instead of wget
+ (setq mew-prog-pgpkey "fetch")
+ (setq mew-prog-pgpkey-arg '("-q" "-o" "-"))
+
+Please consult sample files %%DOCSDIR%%/mew.dot.{emacs,mew}.
+See also %%DOCSDIR%%/00diff for the changes from previous versions.
+*************************************************************************
diff -Nru ../mew5/pkg-message ./pkg-message
--- ../mew5/pkg-message 2006-07-20 04:23:42.000000000 +0900
+++ ./pkg-message 1970-01-01 09:00:00.000000000 +0900
@@ -1,17 +0,0 @@
-*************************************************************************
-* You may want to add following lines to your .emacs and/or .mew.el. *
-* Please consult DOCSDIR/mew.dot.{emacs,mew} sample files. *
-* Also see DOCSDIR/00diff for the changes from 4.2. *
-* *
-* (autoload 'mew "mew" nil t) *
-* (autoload 'mew-send "mew" nil t) *
-* (setq mew-mail-domain "domain of e-mail address") *
-* (setq mew-pop-server "your POP server") ;; if not localhost *
-* (setq mew-smtp-server "your SMTP server") ;; if not localhost *
-* ;; for XEmacs *
-* (setq mew-icon-directory "icon directory") *
-* ;; using fetch for PGP instead of wget *
-* (setq mew-prog-pgpkey "fetch") *
-* (setq mew-prog-pgpkey-arg '("-q" "-o" "-")) *
-* *
-*************************************************************************
diff -Nru ../mew5/pkg-plist ./pkg-plist
--- ../mew5/pkg-plist 2007-01-17 00:02:43.000000000 +0900
+++ ./pkg-plist 2008-05-28 21:11:01.000000000 +0900
@@ -1,4 +1,5 @@
@comment $FreeBSD: ports/mail/mew/pkg-plist,v 1.9 2007/01/16 15:02:43 anray Exp $
+bin/cmew
bin/incm
bin/mew-pinentry
bin/mewcat
@@ -6,6 +7,7 @@
bin/mewencode
bin/mewest
bin/mewl
+bin/smew
%%PORTDOCS%%%%DOCSDIR%%/00api
%%PORTDOCS%%%%DOCSDIR%%/00changes
%%PORTDOCS%%%%DOCSDIR%%/00changes.0
@@ -15,11 +17,11 @@
%%PORTDOCS%%%%DOCSDIR%%/00changes.4.1
%%PORTDOCS%%%%DOCSDIR%%/00changes.4.2
%%PORTDOCS%%%%DOCSDIR%%/00changes.5.1
+%%PORTDOCS%%%%DOCSDIR%%/00changes.5.2
%%PORTDOCS%%%%DOCSDIR%%/00copyright
%%PORTDOCS%%%%DOCSDIR%%/00copyright.jis
%%PORTDOCS%%%%DOCSDIR%%/00diff
%%PORTDOCS%%%%DOCSDIR%%/00readme
-%%PORTDOCS%%%%DOCSDIR%%/00roadmap
%%PORTDOCS%%%%DOCSDIR%%/mew.dot.emacs
%%PORTDOCS%%%%DOCSDIR%%/mew.dot.mew
%%PORTDOCS%%%%DOCSDIR%%/mew.dot.theme
@@ -31,45 +33,45 @@
%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-nmz-fixer.el
%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-refile-view.el
%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-toolbar-frame.el
-%%EMACS_LIBDIR%%/etc/mew/Mew.img
-%%EMACS_LIBDIR%%/etc/mew/Mew.png
-%%EMACS_LIBDIR%%/etc/mew/Mew.xbm
-%%EMACS_LIBDIR%%/etc/mew/Mew.xpm
-%%EMACS_LIBDIR%%/etc/mew/etc/COLOR
-%%EMACS_LIBDIR%%/etc/mew/etc/mew-Plain.xpm
-%%EMACS_LIBDIR%%/etc/mew/etc/mew-curr.xpm
-%%EMACS_LIBDIR%%/etc/mew/etc/mew-folder.xpm
-%%EMACS_LIBDIR%%/etc/mew/etc/mew-inc2.xpm
-%%EMACS_LIBDIR%%/etc/mew/etc/mew-kill.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Audio.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Blank.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-External.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Folder.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Image.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Octet-Stream.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Postscript.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Rfc822.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Text.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Unknown.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-Video.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-attach.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-cite.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-forward.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-inc.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-lock.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-next.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-pgp-enc.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sigenc.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sign.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-prev.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-queue.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-refile.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-reply.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-send.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-sep.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-show.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-write.xpm
-%%EMACS_LIBDIR%%/etc/mew/mew-yank.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img
+%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png
+%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm
+%%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/COLOR
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-Plain.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-curr.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-folder.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-inc2.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-kill.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-External.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Folder.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Image.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Octet-Stream.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Postscript.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Rfc822.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Text.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Unknown.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-Video.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-attach.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-cite.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-forward.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-inc.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-lock.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-next.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-enc.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sigenc.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-pgp-sign.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-prev.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-queue.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-refile.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-reply.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-send.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-sep.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-show.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-write.xpm
+%%EMACS_SITE_LISPDIR%%/mew/etc/mew-yank.xpm
%%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.el
%%EMACS_SITE_LISPDIR%%/mew/mew-addrbook.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-attach.el
@@ -132,8 +134,6 @@
%%EMACS_SITE_LISPDIR%%/mew/mew-local.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-mark.el
%%EMACS_SITE_LISPDIR%%/mew/mew-mark.elc
-%%EMACS_SITE_LISPDIR%%/mew/mew-md5.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-md5.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-message.el
%%EMACS_SITE_LISPDIR%%/mew/mew-message.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-mime.el
@@ -142,14 +142,10 @@
%%EMACS_SITE_LISPDIR%%/mew/mew-minibuf.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-mule.el
%%EMACS_SITE_LISPDIR%%/mew/mew-mule.elc
-%%EMACS_SITE_LISPDIR%%/mew/mew-mule0.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-mule0.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-mule3.el
%%EMACS_SITE_LISPDIR%%/mew/mew-mule3.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-net.el
%%EMACS_SITE_LISPDIR%%/mew/mew-net.elc
-%%EMACS_SITE_LISPDIR%%/mew/mew-nmz.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-nmz.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-nntp.el
%%EMACS_SITE_LISPDIR%%/mew/mew-nntp.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-nntp2.el
@@ -188,8 +184,6 @@
%%EMACS_SITE_LISPDIR%%/mew/mew-summary4.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-syntax.el
%%EMACS_SITE_LISPDIR%%/mew/mew-syntax.elc
-%%EMACS_SITE_LISPDIR%%/mew/mew-temacs.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-temacs.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-thread.el
%%EMACS_SITE_LISPDIR%%/mew/mew-thread.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-unix.el
@@ -206,13 +200,10 @@
%%EMACS_SITE_LISPDIR%%/mew/mew-virtual.elc
%%EMACS_SITE_LISPDIR%%/mew/mew-win32.el
%%EMACS_SITE_LISPDIR%%/mew/mew-win32.elc
-%%EMACS_SITE_LISPDIR%%/mew/mew-xemacs.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-xemacs.elc
%%EMACS_SITE_LISPDIR%%/mew/mew.el
%%EMACS_SITE_LISPDIR%%/mew/mew.elc
- at dirrm %%EMACS_LIBDIR%%/etc/mew/etc
- at dirrm %%EMACS_LIBDIR%%/etc/mew
- at dirrmtry %%EMACS_LIBDIR%%/etc
+ at dirrm %%EMACS_SITE_LISPDIR%%/mew/etc/etc
+ at dirrm %%EMACS_SITE_LISPDIR%%/mew/etc
@dirrm %%EMACS_SITE_LISPDIR%%/mew
@dirrmtry %%EMACS_SITE_LISPDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list