- Add an smime option (enables by default). When disabled, it removes the perl

  dependancy (may be good for small systems)
- Make pkglint happy
- Fix a mistake in patch-ab

5 files changed, 41 insertions, 34 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e0b663225b3..52b358ae5fe 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2007/03/04 13:43:44 tonio Exp $
+# $NetBSD: Makefile,v 1.57 2007/03/04 17:22:45 tonio Exp $
 
 DISTNAME=		mutt-1.5.14
+PKGREVISION=		1
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -18,8 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt perl:run
-REPLACE_PERL=		*.pl */*.pl
+USE_TOOLS+=		msgfmt
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}		\
@@ -64,18 +64,10 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 # Fix some absolute paths in installed files.
-post-build:
-	for file in ${WRKSRC}/contrib/gpg.rc; do			\
-		${MV} -f $$file $$file.save;				\
-		${SED}	-e "s,/usr/bin/gpg,gpg,g"			\
-			$$file.save > $$file;				\
-	done
-	for file in ${WRKSRC}/doc/mutt.man; do				\
-		${MV} -f $$file $$file.save;				\
-		${SED}	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"		\
-			-e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"	\
-			-e "s,/usr/local/,${PREFIX}/,g"			\
-			$$file.save > $$file;				\
-	done
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fix absolute path
+SUBST_STAGE.paths=	post-build
+SUBST_FILES.paths=	contrib/gpg.rc
+SUBST_SED.paths=	-e 's,/usr/bin/gpg,gpg,g'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 5635aca8269..1730029be63 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2006/08/16 10:42:05 tonio Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/03/04 17:22:45 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
 ${MUTT_DOTLOCK}bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
-bin/smime_keys
+${WITHSMIME}bin/smime_keys
 man/man1/flea.1
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
@@ -38,6 +38,7 @@ share/doc/mutt/miscellany.html
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/reference.html
 share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
 share/examples/mutt/Mush.rc
 share/examples/mutt/Muttrc
 share/examples/mutt/Muttrc.dist
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index c1650e1e409..eee07c4ee0f 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2007/03/04 13:43:44 tonio Exp $
+$NetBSD: distinfo,v 1.38 2007/03/04 17:22:45 tonio Exp $
 
 SHA1 (mutt-1.5.14.tar.gz) = 7be098c13302fab8a954095d17a9a64e1e1519c1
 RMD160 (mutt-1.5.14.tar.gz) = ed4eeaf75d37757ed5b370e9763b6f8524df5ca7
@@ -7,7 +7,7 @@ SHA1 (patch-1.5.14.rr.compressed.1.gz) = c0a74886515fed94826b1d5f8d2a7c42a9ea6f2
 RMD160 (patch-1.5.14.rr.compressed.1.gz) = 0756a878cc309636df164cfe21507e8554142c4f
 Size (patch-1.5.14.rr.compressed.1.gz) = 10558 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = a9538c692e0d3d0a6d341e3dc003304e3f85a122
+SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index a001a43c1cc..f143b3b2298 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.22 2007/03/04 13:43:44 tonio Exp $
+# $NetBSD: options.mk,v 1.23 2007/03/04 17:22:45 tonio Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS=	ssl sasl mutt-hcache idn mutt-compressed-mbox debug
-PKG_SUGGESTED_OPTIONS=	ssl curses
+PKG_SUPPORTED_OPTIONS=	ssl smime sasl mutt-hcache idn mutt-compressed-mbox debug
+PKG_SUGGESTED_OPTIONS=	ssl smime curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -47,11 +47,11 @@ CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 .if !empty(PKG_OPTIONS:Mncursesw)
 .  include "../../devel/ncursesw/buildlink3.mk"
 .else
-SUBST_CLASSES+=                curse
-SUBST_MESSAGE.curse=   Fixing mutt to avoid ncursesw
-SUBST_STAGE.curse=     post-patch
-SUBST_FILES.curse=     configure.in configure
-SUBST_SED.curse=       -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
+SUBST_CLASSES+=		curse
+SUBST_MESSAGE.curse=	Fixing mutt to avoid ncursesw
+SUBST_STAGE.curse=	post-patch
+SUBST_FILES.curse=	configure.in configure
+SUBST_SED.curse=	-e 's,for lib in ncurses ncursesw,for lib in ncurses,'
 .endif
 
 ###
@@ -65,6 +65,20 @@ CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 ###
+### S/MIME
+###
+.if !empty(PKG_OPTIONS:Msmime)
+USE_TOOLS+=		perl:run
+REPLACE_PERL+=		*.pl */*.pl
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-smime
+PLIST_SUBST+=		WITHSMIME=''
+.else
+CONFIGURE_ARGS+=	--disable-smime
+PLIST_SUBST+=		WITHSMIME='@comment '
+.endif
+
+###
 ### Header cache
 ###
 .if !empty(PKG_OPTIONS:Mmutt-hcache)
@@ -77,7 +91,7 @@ CONFIGURE_ARGS+=	--without-gdbm
 #
 CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include
 CONFIGURE_ENV+=		BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib
-CONFIGURE_ENV+=		BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//}
+CONFIGURE_ENV+=		BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q}
 .else
 CONFIGURE_ARGS+=	--disable-hcache
 .endif
@@ -86,7 +100,7 @@ CONFIGURE_ARGS+=	--disable-hcache
 ### Compressed mail boxes
 ###
 .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
-PATCH_SITES+=		http://www.spinnaker.de/mutt/compressed/
+PATCH_SITES=		http://www.spinnaker.de/mutt/compressed/
 PATCHFILES+=		patch-1.5.14.rr.compressed.1.gz
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--enable-compressed
@@ -97,9 +111,9 @@ CONFIGURE_ARGS+=	--enable-compressed
 ###
 .if !empty(PKG_OPTIONS:Midn)
 .  include "../../devel/libidn/buildlink3.mk"
-CONFIGURE_ARGS+=  --with-idn=${BUILDLINK_PREFIX.libidn}
+CONFIGURE_ARGS+=	--with-idn=${BUILDLINK_PREFIX.libidn}
 .else
-CONFIGURE_ARGS+=  --disable-idn
+CONFIGURE_ARGS+=	--disable-idn
 .endif
 
 ###
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index 2755fad6c45..1f95a8635bb 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2007/03/04 13:43:44 tonio Exp $
+$NetBSD: patch-ab,v 1.10 2007/03/04 17:22:46 tonio Exp $
 
 --- Makefile.in.orig	2007-03-04 13:33:38.000000000 +0100
 +++ Makefile.in
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.9 2007/03/04 13:43:44 tonio Exp $
  libdir = @libdir@
  libexecdir = @libexecdir@
 -localedir = @localedir@
-+localedir = /usr/pkg/share/locale
++localedir = $(prefix)/share/locale
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@