Attachment 186767 Details for Bug 222648 – modernize port

modernize port

patch.txt (text/plain), 12.00 KB, created by Alex Kozlov on 2017-09-27 16:58:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2017-09-27 16:58:14 UTC

Size: 12.00 KB

patch

obsolete

>- Remove autotools usage
>- Build sidebar by default, it's small and don't have side effects if not enabled
>- Cleanup WITHOUT=XML handling
>Index: Makefile
>===================================================================
>--- Makefile	(revision 450764)
>+++ Makefile	(working copy)
>@@ -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_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 @@
> CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
> .endif
> 
>-USES+=		autoreconf
> GNU_CONFIGURE=	yes
>-AUTOMAKE_ARGS=	--add-missing --foreign
> 
> OPTIONS_SUB=	yes
> 
>@@ -57,7 +55,7 @@
> 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 @@
> 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_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,14 @@
> 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 +246,13 @@
> WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
> 
> pre-configure::
>+	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
>+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>+.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
> 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
> 		${WRKSRC}/contrib/gpg.rc
> 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
>@@ -270,19 +265,11 @@
> 		${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 +277,8 @@
> 		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
> 
>Index: files/patch-Makefile.am
>===================================================================
>--- files/patch-Makefile.am	(revision 450764)
>+++ files/patch-Makefile.am	(nonexistent)
>@@ -1,30 +0,0 @@
>---- 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
>- 
>--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:
>- 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
>- 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
>- 	fi
>--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
>--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
>--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
>--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
>--	fi
>- 
>- install-data-local:
>- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
>--	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
>--	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
>--		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
>--	fi
>- 
>- uninstall-local:
>- 	for i in mime.types ; do \
>
>Property changes on: files/patch-Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 450764)
>+++ files/patch-Makefile.in	(working copy)
>@@ -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@DOC_SUBDIR = doc
>+ @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
>+ @BUILD_IMAP_TRUE@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@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
>Index: files/patch-contrib_Makefile.am
>===================================================================
>--- files/patch-contrib_Makefile.am	(revision 450764)
>+++ files/patch-contrib_Makefile.am	(nonexistent)
>@@ -1,11 +0,0 @@
>---- contrib/Makefile.am.orig	2017-04-12 23:01:05 UTC
>-+++ contrib/Makefile.am
>-@@ -2,7 +2,7 @@
>- 
>- 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 \
>- 	sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \
>- 	ca-bundle.crt smime_keys_test.pl mutt_xtitle
>
>Property changes on: files/patch-contrib_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-contrib_Makefile.in
>===================================================================
>--- files/patch-contrib_Makefile.in	(revision 450764)
>+++ files/patch-contrib_Makefile.in	(working copy)
>@@ -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 \
>Index: files/patch-doc_Makefile.am
>===================================================================
>--- files/patch-doc_Makefile.am	(revision 450764)
>+++ files/patch-doc_Makefile.am	(nonexistent)
>@@ -1,29 +0,0 @@
>---- doc/Makefile.am.orig	2016-10-08 19:30:21 UTC
>-+++ doc/Makefile.am
>-@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc
>- 	-for f in $(HTML_DOCFILES) ; do \
>- 		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
>- 	done
>--	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
>--	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
>--		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
>--	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
>--	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
>--	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
>--		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
>--	fi
>-+	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
>- 
>- 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:
>- 
>- check:
>- manual.txt: manual.html
>--	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
>--	LC_ALL=C w3m -dump manual.html > $@ || \
>--	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
>-+	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
>- 
>- Muttrc: stamp-doc-rc
>- 
>
>Property changes on: files/patch-doc_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-doc_Makefile.in
>===================================================================
>--- files/patch-doc_Makefile.in	(revision 450764)
>+++ files/patch-doc_Makefile.in	(working copy)
>@@ -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
>Index: files/patch-m4_gssapi.m4
>===================================================================
>--- files/patch-m4_gssapi.m4	(revision 450764)
>+++ files/patch-m4_gssapi.m4	(nonexistent)
>@@ -1,10 +0,0 @@
>---- m4/gssapi.m4.orig	2016-10-08 19:30:21 UTC
>-+++ m4/gssapi.m4
>-@@ -27,6 +27,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
>-     GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`"
>-     case "`$KRB5CFGPATH --version`" in
>-       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
>-+      "FreeBSD heimdal"*)		GSSAPI_IMPL="Heimdal";;
>-       ?eimdal*)		GSSAPI_IMPL="Heimdal";;
>-       *)		GSSAPI_IMPL="Unknown";;
>-    esac
>
>Property changes on: files/patch-m4_gssapi.m4
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 222648: 186767