ports/188604: [MAINTAINER] mail/mew: fix compatibility with stunnel-5.0.0
Hiroto Kagotani
hiroto.kagotani at gmail.com
Mon Apr 14 11:30:00 UTC 2014
>Number: 188604
>Category: ports
>Synopsis: [MAINTAINER] mail/mew: fix compatibility with stunnel-5.0.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 14 11:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Hiroto Kagotani
>Release: FreeBSD 10.0-RELEASE-p1 amd64
>Organization:
>Environment:
FreeBSD myhost.mydomain 10.0-RELEASE-p1 FreeBSD 10.0-RELEASE-p1 #0: Tue Apr 8 06:
45:06 UTC
>Description:
Fix compatibility with stunnel-5.0.0.
Add option for stunnel dependency (default).
Support staging.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Using mew instead of mew-emacs24 as the port's directory name
===> Generating patch
===> Viewing diff with more
diff -ruN ../mew.orig/Makefile ./Makefile
--- ../mew.orig/Makefile 2013-09-21 04:59:12.000000000 +0900
+++ ./Makefile 2014-04-14 20:23:21.000000000 +0900
@@ -3,7 +3,7 @@
PORTNAME= mew
PORTVERSION= 6.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail elisp
MASTER_SITES= http://www.mew.org/Release/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -11,26 +11,23 @@
MAINTAINER= hiroto.kagotani at gmail.com
COMMENT= Messaging in the Emacs World for emacs
-OPTIONS_DEFINE= DATABASE DOCS
-DATABASE_DESC= Database feature support (with Ruby & Sqlite3)
+OPTIONS_DEFINE= DATABASE DOCS STUNNEL
+OPTIONS_DEFAULT=STUNNEL
+DATABASE_DESC= Support database feature (with Ruby & Sqlite3)
+STUNNEL_DESC= Support SSL feature using stunnel
+
+DATABASE_RUN_DEPENDS= rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+STUNNEL_RUN_DEPENDS= stunnel>=0:${PORTSDIR}/security/stunnel
# emacs port setup
USE_EMACS= yes
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDATABASE}
-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_SITE_LISPDIR}/mew/etc
+.include <bsd.port.options.mk>
+
# target name for make build and install
ALL_TARGET= all info
INSTALL_TARGET= install
@@ -40,19 +37,20 @@
.endif
# manuals
-MAN1= cmew.1 mew-pinentry.1 mewcat.1 mewdecode.1 mewencode.1 mewest.1 mewl.1 smew.1 incm.1
+#MAN1= cmew.1 mew-pinentry.1 mewcat.1 mewdecode.1 mewencode.1 mewest.1 mewl.1 smew.1 incm.1
INFO= mew
.if ${PORT_OPTIONS:MDOCS}
INFO+= mew.ja
.endif
post-install:
+ @${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} ; \
- ${INSTALL_DATA} 00* dot.* ${DOCSDIR}/ ; \
+ ${INSTALL_DATA} 00* dot.* ${STAGEDIR}${DOCSDIR}/ ; \
)
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
diff -ruN ../mew.orig/files/patch-Makefile.in ./files/patch-Makefile.in
--- ../mew.orig/files/patch-Makefile.in 2014-01-23 02:40:44.000000000 +0900
+++ ./files/patch-Makefile.in 2014-04-14 20:04:22.000000000 +0900
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig 2009-02-02 15:39:04.000000000 +0900
-+++ ./Makefile.in 2010-01-04 12:06:16.000000000 +0900
-@@ -40,8 +40,8 @@
+--- ./Makefile.in.orig 2012-04-16 12:18:13.000000000 +0900
++++ ./Makefile.in 2014-04-14 20:03:59.000000000 +0900
+@@ -35,8 +35,8 @@
## A directory where mew*.el[c] will be installed.
##
@@ -11,7 +11,7 @@
#elispdir = $(prefix)/lib/xemacs/site-lisp
#elispdir = $(prefix)/lib/emacs
-@@ -49,8 +49,8 @@
+@@ -44,8 +44,8 @@
## A directory where etc file will be installed.
##
diff -ruN ../mew.orig/files/patch-mew-ssl.el ./files/patch-mew-ssl.el
--- ../mew.orig/files/patch-mew-ssl.el 1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-mew-ssl.el 2014-04-14 20:04:22.000000000 +0900
@@ -0,0 +1,54 @@
+--- ./mew-ssl.el.orig 2012-04-16 12:18:13.000000000 +0900
++++ ./mew-ssl.el 2014-04-14 20:03:59.000000000 +0900
+@@ -25,7 +25,11 @@
+ 3 - verify server's certificate which locally installed (not one from
+ the server).")
+
+-(defvar mew-prog-ssl-arg nil) ;; xxx what about v4?
++(defvar mew-prog-ssl-arg nil
++ "For stunnel v3, a list of command-line arguments, each one a string.
++For stunnel v4, a string of extra text to place in the configuration file,
++which should end with a newline (example: \"fips=no\\n\"); or nil to insert
++no extra text.")
+
+ (defvar mew-ssl-ver nil)
+ (defvar mew-ssl-minor-ver nil)
+@@ -104,11 +108,13 @@
+ (insert (format "verify=%d\n" (mew-ssl-verify-level case)))
+ (insert "foreground=yes\n")
+ (insert "debug=debug\n")
+- (if (and mew-ssl-libwrap (>= mew-ssl-minor-ver 45))
++ (if (and mew-ssl-libwrap (or (>= mew-ssl-ver 5) (>= mew-ssl-minor-ver 45)))
+ (insert "libwrap=no\n"))
+- (if (>= mew-ssl-minor-ver 22)
++ (if (or (>= mew-ssl-ver 5) (>= mew-ssl-minor-ver 22))
+ (insert "syslog=no\n"))
+ (insert "CApath=" (expand-file-name (mew-ssl-cert-directory case)) "\n")
++ (if mew-prog-ssl-arg
++ (insert mew-prog-ssl-arg))
+ (insert (format "[%d]\n" localport))
+ (insert (format "accept=%s:%d\n" mew-ssl-localhost localport))
+ (insert (format "connect=%s:%d\n" server remoteport))
+@@ -167,7 +173,7 @@
+ (setq pnm (process-name pro))
+ (mew-info-clean-up pnm)
+ (mew-ssl-set-try pnm 0)
+- (if (= mew-ssl-ver 4) (mew-ssl-set-file pnm (car opts)))
++ (if (>= mew-ssl-ver 4) (mew-ssl-set-file pnm (car opts)))
+ (mew-set-process-cs pro mew-cs-text-for-read mew-cs-text-for-write)
+ (set-process-filter pro 'mew-ssl-filter1)
+ (set-process-sentinel pro 'mew-ssl-sentinel)
+@@ -264,10 +270,10 @@
+ (call-process mew-prog-ssl nil t nil "-version")
+ (goto-char (point-min))
+ (re-search-forward "^stunnel " nil t 1)
+- (if (looking-at "4\\.\\([0-9]+\\)")
++ (if (looking-at "\\([45]\\)\\.\\([0-9]+\\)")
+ (progn
+- (setq mew-ssl-ver 4)
+- (setq mew-ssl-minor-ver (string-to-number (mew-match-string 1))))
++ (setq mew-ssl-ver (string-to-number (mew-match-string 1)))
++ (setq mew-ssl-minor-ver (string-to-number (mew-match-string 2))))
+ (setq mew-ssl-ver 3))
+ (when (re-search-forward "LIBWRAP" nil t)
+ (setq mew-ssl-libwrap t)))))
diff -ruN ../mew.orig/pkg-plist ./pkg-plist
--- ../mew.orig/pkg-plist 2014-01-23 00:16:56.000000000 +0900
+++ ./pkg-plist 2014-04-14 19:09:18.000000000 +0900
@@ -7,6 +7,15 @@
bin/mewest
bin/mewl
bin/smew
+man/man1/cmew.1.gz
+man/man1/incm.1.gz
+man/man1/mew-pinentry.1.gz
+man/man1/mewcat.1.gz
+man/man1/mewdecode.1.gz
+man/man1/mewencode.1.gz
+man/man1/mewest.1.gz
+man/man1/mewl.1.gz
+man/man1/smew.1.gz
%%PORTDOCS%%%%DOCSDIR%%/00api
%%PORTDOCS%%%%DOCSDIR%%/00changes
%%PORTDOCS%%%%DOCSDIR%%/00changes.0
====> Cleaning up
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list