diff options
| author | zi <zi@FreeBSD.org> | 2014-03-17 22:48:52 +0800 |
|---|---|---|
| committer | zi <zi@FreeBSD.org> | 2014-03-17 22:48:52 +0800 |
| commit | bf0363d11f8ec05a9f7a3b03fb2699adfa42ef44 (patch) | |
| tree | 69c4df7b9dfb6768c0cd7a7599a30cdd796e19c6 /mail/mutt | |
| parent | b6e9981f99eb4e1eddf1112682d037f37bd3957e (diff) | |
| download | freebsd-ports-gnome-bf0363d11f8ec05a9f7a3b03fb2699adfa42ef44.tar.gz freebsd-ports-gnome-bf0363d11f8ec05a9f7a3b03fb2699adfa42ef44.tar.zst freebsd-ports-gnome-bf0363d11f8ec05a9f7a3b03fb2699adfa42ef44.zip | |
- Fix build with clang
PR: ports/187418
Submitted by: "Schweigert, Udo" <Udo.Schweigert@siemens.com> (maintainer)
Diffstat (limited to 'mail/mutt')
| -rw-r--r-- | mail/mutt/Makefile | 9 | ||||
| -rw-r--r-- | mail/mutt/files/patch-Makefile.am | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index ca9688a7e280..d75f2a9af1bf 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif USE_AUTOTOOLS= automake autoconf -AUTOMAKE_ARGS= --add-missing +AUTOMAKE_ARGS= --add-missing --foreign USE_OPENSSL= yes .if defined (MUTT_LITE) @@ -267,18 +267,18 @@ CONFIGURE_ARGS+= --with-gss=${LOCALBASE} .elif exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${KRB5_HOME} -LDFLAGS+= -L${KRB5_HOME}/lib -rpath=${KRB5_HOME}/lib -ltinfow +LDFLAGS+= -L${KRB5_HOME}/lib -Wl,-rpath=${KRB5_HOME}/lib -ltinfow .elif exists(${HEIMDAL_HOME}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${HEIMDAL_HOME} -LDFLAGS+= -L${HEIMDAL_HOME}/lib -rpath=${HEIMDAL_HOME}/lib -ltinfow +LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+= --with-gss WITH_KRB5_SYS=YES .endif .endif -LDFLAGS+= -L${LOCALBASE}/lib -rpath=${LOCALBASE}/lib:/usr/lib -ltinfow +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow CFLAGS+= ${CFLAGS_ADD} LDFLAGS+= ${LDFLAGS_ADD} @@ -371,6 +371,7 @@ post-patch:: pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) + @${RM} -f ${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>|' \ diff --git a/mail/mutt/files/patch-Makefile.am b/mail/mutt/files/patch-Makefile.am index ac0403811365..6eda940b2f61 100644 --- a/mail/mutt/files/patch-Makefile.am +++ b/mail/mutt/files/patch-Makefile.am @@ -1,6 +1,15 @@ ---- Makefile.am.orig 2008-05-19 19:00:44.000000000 +0200 -+++ Makefile.am 2008-05-19 19:03:20.000000000 +0200 -@@ -136,10 +136,6 @@ +--- Makefile.am.orig 2014-03-12 17:03:44.000000000 +0100 ++++ Makefile.am 2014-03-16 17:22:07.000000000 +0100 +@@ -97,7 +97,7 @@ + + # If this fails, we will fall back to the implementation in txt2c.sh + txt2c: txt2c.c +- -$${NATIVECC-$(CC)} -o $@ $< ++ -$(CC) -o $@ $< + + conststrings.c: txt2c config.status + ( \ +@@ -162,10 +162,6 @@ install-data-local: $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) |