svn commit: r489947 - in head/mail/fetchmail: . files
Matthias Andree
mandree at FreeBSD.org
Fri Jan 11 06:36:30 UTC 2019
Author: mandree
Date: Fri Jan 11 06:36:28 2019
New Revision: 489947
URL: https://svnweb.freebsd.org/changeset/ports/489947
Log:
Fix GSSAPI-based, and NLS-less, builds.
This was also tested on a live 12.0 amd64 machine,
11.2-arm64 and 11.2-i386 poudriere boxes with base GSSAPI.
PR: 234740
Reported by: Peter Putzer (Bugzilla), Alex V. Petrov (e-mail)
Approved by: Corey Halpin (maintainer)
Added:
head/mail/fetchmail/files/patch-configure.ac (contents, props changed)
Deleted:
head/mail/fetchmail/files/patch-configure
Modified:
head/mail/fetchmail/Makefile
Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile Fri Jan 11 06:15:32 2019 (r489946)
+++ head/mail/fetchmail/Makefile Fri Jan 11 06:36:28 2019 (r489947)
@@ -3,15 +3,13 @@
PORTNAME= fetchmail
PORTVERSION= 6.3.26
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail ipv6
MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \
http://mandree.home.pages.de/${PORTNAME}/
-PATCH_SITES= https://gitlab.com/fetchmail/fetchmail/commit/:gitlab
-PATCH_SITES+= https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
-PATCHFILES= 9b8b634.patch:-p1:gitlab # SNI fix
-PATCHFILES+= fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
+PATCH_SITES= https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
+PATCHFILES= fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
MAINTAINER= chalpin at cs.wisc.edu
@@ -25,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:
USERS= ${PORTNAME}
GROUPS= ${USERS}
-USES= cpe gmake python shebangfix tar:xz ssl
+USES= autoreconf:build cpe gmake python shebangfix tar:xz ssl
SHEBANG_FILES= fetchmailconf.py
USE_RC_SUBR= fetchmail
@@ -79,6 +77,22 @@ post-patch:
.if !exists(/usr/lib/libcom_err.so)
@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
.endif
+
+# This is a workaround for a ports framework bug:
+# As of r489889 on 2019-01-10,
+# USES=autoreconf does not seem to get along with disabling the NLS option,
+# because this would not install gettext-tools, omitting autopoint,
+# however the configure.ac requests GETTEXT, so autoreconf will barf.
+# Pulling in gettext-tools unconditionally (even with NLS off) would
+# be excess and confuse users, so is not an option.
+# Thus we set USES=autoreconf:build and run autoreconf by ourselves,
+# overriding AUTOPOINT=true.
+#
+pre-configure-NLS-on:
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
+#
+pre-configure-NLS-off:
+ (cd ${WRKSRC} && ${SETENV} AUTOPOINT=${TRUE} ${LOCALBASE}/bin/autoreconf -f -i)
post-build:
@${MAKE_CMD} -C ${WRKSRC} check
Added: head/mail/fetchmail/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/fetchmail/files/patch-configure.ac Fri Jan 11 06:36:28 2019 (r489947)
@@ -0,0 +1,24 @@
+--- configure.ac.orig 2013-04-23 20:51:10 UTC
++++ configure.ac
+@@ -19,7 +19,7 @@ AC_CANONICAL_HOST
+ dnl automake options are in Makefile.am
+ AC_PREREQ(2.60)
+ dnl 2.60 required for AC_USE_SYSTEM_EXTENSIONS
+-AM_INIT_AUTOMAKE([silent-rules -Wall])
++AM_INIT_AUTOMAKE([silent-rules subdir-objects serial-tests])
+ AM_SILENT_RULES
+
+ dnl python is optional
+@@ -601,10 +601,10 @@ else
+ AC_MSG_RESULT([found])
+ ac_krblibs="-lcom_err"
+ AC_CHECK_LIB(crypto,
+- krb5_des_string_to_key,
++ krb5int_des_string_to_key,
+ libk5crypto=-lcrypto,
+ AC_CHECK_LIB(k5crypto,
+- krb5_des_string_to_key,
++ krb5int_des_string_to_key,
+ libk5crypto=-lk5crypto,
+ AC_MSG_ERROR([Kerberos 5 DES libraries not found]),
+ ${LDFLAGS} ${ac_krblibs}),
More information about the svn-ports-all
mailing list