svn commit: r450793 - in head/mail/mutt: . files
Alex Kozlov
ak at FreeBSD.org
Wed Sep 27 22:11:31 UTC 2017
Author: ak
Date: Wed Sep 27 22:11:30 2017
New Revision: 450793
URL: https://svnweb.freebsd.org/changeset/ports/450793
Log:
- Remove autotools dependency
- Build sidebar by default, it's small and don't have side-effects when not enabled
- Cleanup WITHOUT=XML handling
Added:
head/mail/mutt/files/patch-Makefile.in
- copied, changed from r450792, head/mail/mutt/files/patch-Makefile.am
head/mail/mutt/files/patch-contrib_Makefile.in
- copied, changed from r450792, head/mail/mutt/files/patch-contrib_Makefile.am
head/mail/mutt/files/patch-doc_Makefile.in
- copied, changed from r450792, head/mail/mutt/files/patch-doc_Makefile.am
Deleted:
head/mail/mutt/files/patch-Makefile.am
head/mail/mutt/files/patch-contrib_Makefile.am
head/mail/mutt/files/patch-doc_Makefile.am
head/mail/mutt/files/patch-m4_gssapi.m4
Modified:
head/mail/mutt/Makefile
Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile Wed Sep 27 21:27:15 2017 (r450792)
+++ head/mail/mutt/Makefile Wed Sep 27 22:11:30 2017 (r450793)
@@ -3,7 +3,7 @@
PORTNAME= mutt
PORTVERSION= 1.9.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -36,7 +36,7 @@ CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
--enable-external-dotlock --enable-pop --enable-imap \
- --enable-compressed
+ --enable-compressed --enable-sidebar
USES+= cpe ncurses shebangfix ssl
SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
@@ -45,9 +45,7 @@ SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/s
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-USES+= autoreconf
GNU_CONFIGURE= yes
-AUTOMAKE_ARGS= --add-missing --foreign
OPTIONS_SUB= yes
@@ -57,7 +55,7 @@ OPTIONS_EXCLUDE= NLS DOCS EXAMPLES
OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \
FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
- NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR SMART_DATE \
+ NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
@@ -83,7 +81,6 @@ NCURSES_DESC= Ncurses support
NLS_DESC= Native language support (implies ICONV)
QUOTE_PATCH_DESC= Extended quoting
REVERSE_REPLY_PATCH_DESC= Reverse_reply
-SIDEBAR_DESC= Sidebar support
SLANG_DESC= SLANG support
SMART_DATE_DESC= Dynamic date formatting with "%@"
SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility
@@ -202,8 +199,6 @@ NNTP_CONFIGURE_ON= --enable-nntp
NNTP_VARS= XML_NEEDED=yes
NNTP_CATEGORIES= news
-SIDEBAR_CONFIGURE_ENABLE= sidebar
-
DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
.include <bsd.port.options.mk>
@@ -219,21 +214,12 @@ VVV_PATCH_VERSION= ${PORTVERSION}
GREETING_PATCH_VERSION= ${PORTVERSION}
.endif
-# XXX
-# this should be done automagically by aclocal but ....
-# for now, this will have to do
-pre-build::
- @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
- -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
- -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
- -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
- ${BUILD_WRKSRC}/Makefile
-
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
-CFLAGS+= ${CFLAGS_ADD}
-LDFLAGS+= ${LDFLAGS_ADD}
post-patch-NNTP-on:
+# Restore timestamps for autotools sources
+ @${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
+ @${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.endif
@@ -258,6 +244,8 @@ post-install-NNTP-on:
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
pre-configure::
+ @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
${WRKSRC}/contrib/gpg.rc
@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
@@ -270,19 +258,11 @@ pre-configure::
${WRKSRC}/INSTALL \
${WRKSRC}/init.h
@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
- ${WRKSRC}/contrib/Makefile.am
+ ${WRKSRC}/contrib/Makefile.in
-pre-configure::
- @${RM} ${WRKSRC}/missing
-.if defined(WITH_KRB5_SYS)
- @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
- @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
- ${WRKSRC}/imap/auth_gss.c
-.endif
-
pre-configure-HCACHE_BDB-on:
@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
BUILD_DEPENDS+= xsltproc:textproc/libxslt \
@@ -290,7 +270,8 @@ BUILD_DEPENDS+= xsltproc:textproc/libxslt \
lynx:www/lynx
.else
pre-build::
- @${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
+ @${REINPLACE_CMD} \
+ -e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \
${WRKSRC}/doc/Makefile
.endif
Copied and modified: head/mail/mutt/files/patch-Makefile.in (from r450792, head/mail/mutt/files/patch-Makefile.am)
==============================================================================
--- head/mail/mutt/files/patch-Makefile.am Wed Sep 27 21:27:15 2017 (r450792, copy source)
+++ head/mail/mutt/files/patch-Makefile.in Wed Sep 27 22:11:30 2017 (r450793)
@@ -1,15 +1,14 @@
---- Makefile.am.orig 2017-02-27 01:12:49 UTC
-+++ Makefile.am
-@@ -14,7 +14,7 @@ IMAP_SUBDIR = imap
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
-
+Index: Makefile.in
+@@ -471,7 +471,7 @@
+ @BUILD_DOC_TRUE at DOC_SUBDIR = doc
+ @BUILD_IMAP_TRUE at IMAP_SUBDIR = imap
+ @BUILD_IMAP_TRUE at IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
-
bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
-
-@@ -161,18 +161,9 @@ install-exec-hook:
+ @BUILD_HCACHE_TRUE at HCVERSION = hcversion.h
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
+@@ -1359,18 +1359,9 @@
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
fi
Copied and modified: head/mail/mutt/files/patch-contrib_Makefile.in (from r450792, head/mail/mutt/files/patch-contrib_Makefile.am)
==============================================================================
--- head/mail/mutt/files/patch-contrib_Makefile.am Wed Sep 27 21:27:15 2017 (r450792, copy source)
+++ head/mail/mutt/files/patch-contrib_Makefile.in Wed Sep 27 22:11:30 2017 (r450793)
@@ -1,9 +1,8 @@
---- contrib/Makefile.am.orig 2017-04-12 23:01:05 UTC
-+++ contrib/Makefile.am
-@@ -2,7 +2,7 @@
-
+Index: contrib/Makefile.in
+@@ -270,7 +270,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
subdir = contrib
-
-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
Copied and modified: head/mail/mutt/files/patch-doc_Makefile.in (from r450792, head/mail/mutt/files/patch-doc_Makefile.am)
==============================================================================
--- head/mail/mutt/files/patch-doc_Makefile.am Wed Sep 27 21:27:15 2017 (r450792, copy source)
+++ head/mail/mutt/files/patch-doc_Makefile.in Wed Sep 27 22:11:30 2017 (r450793)
@@ -1,6 +1,5 @@
---- doc/Makefile.am.orig 2016-10-08 19:30:21 UTC
-+++ doc/Makefile.am
-@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc
+Index: doc/Makefile.in
+@@ -667,14 +667,7 @@
-for f in $(HTML_DOCFILES) ; do \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
done
@@ -16,7 +15,7 @@
uninstall-local:
for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-@@ -109,9 +102,7 @@ uninstall-local:
+@@ -697,9 +690,7 @@
check:
manual.txt: manual.html
More information about the svn-ports-all
mailing list