Date: Fri, 23 Mar 2001 13:19:17 +0200 From: Peter Pentchev <roam@orbitel.bg> To: Ville Eerola <ve@sci.fi> Cc: Doug Barton <DougB@DougBarton.net>, sobomax@FreeBSD.ORG, ports@FreeBSD.ORG Subject: Re: fetchmail port broken on releng_3 Message-ID: <20010323131917.B17216@ringworld.oblivion.bg> In-Reply-To: <3ABAFEC8.62BC5188@DougBarton.net>; from DougB@DougBarton.net on Thu, Mar 22, 2001 at 11:44:08PM -0800 References: <3ABA701A.726DFA85@yahoo-inc.com> <3ABAFEC8.62BC5188@DougBarton.net>
next in thread | previous in thread | raw e-mail | index | archive | help
How about the following patch instead? It incorporates your fix (sorry about that, when I submitted patches adding Kerberos and SSL support, I had already upgraded to 4.x; never had a chance to test anything on RELENG_3), and adds the correct fix to the NLS build - I've already submitted the aclocal.m4 fix to the fetchmail-friends list. It seems that aclocal.m4 was NOT generated from the latest version of configure.in and friends :( The patch-aclocal.m4 resulted directly from an aclocal invocation :( I could commit this ASAP, pending maintainer approval. G'luck, Peter -- I am the thought you are now thinking. Index: ports/mail/fetchmail/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/fetchmail/Makefile,v retrieving revision 1.120 diff -u -r1.120 Makefile --- ports/mail/fetchmail/Makefile 2001/03/20 11:04:35 1.120 +++ ports/mail/fetchmail/Makefile 2001/03/23 11:13:02 @@ -10,7 +10,7 @@ # want fetchmailconf to work, define WITH_X11 PORTNAME= fetchmail -PORTVERSION= 5.7.4 +PORTVERSION= 5.7.6 CATEGORIES= mail ipv6 MASTER_SITES= http://www.tuxedo.org/~esr/fetchmail/ \ ftp://ftp.ccil.org/pub/esr/fetchmail/ @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-POP2 --enable-SDPS \ --enable-nls --with-hesiod=no CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ + LDFLAGS="-L${LOCALBASE}/lib" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" MAKE_ENV+= ${CONFIGURE_ENV} MAN1= fetchmail.1 @@ -37,9 +37,10 @@ .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+=--enable-inet6 +.endif + .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a) CONFIGURE_ARGS+=--with-ssl=/usr -.endif .elif exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a) CONFIGURE_ARGS+=-with-includes=${LOCALBASE}/include/openssl --with-ssl=${LOCALBASE} .endif Index: ports/mail/fetchmail/distinfo =================================================================== RCS file: /home/ncvs/ports/mail/fetchmail/distinfo,v retrieving revision 1.99 diff -u -r1.99 distinfo --- ports/mail/fetchmail/distinfo 2001/03/17 12:08:09 1.99 +++ ports/mail/fetchmail/distinfo 2001/03/23 11:13:02 @@ -1 +1 @@ -MD5 (fetchmail-5.7.4.tar.gz) = 9aeb8702da10b8309cfc07d7e22283aa +MD5 (fetchmail-5.7.6.tar.gz) = b2103e7729b933c0eff4c16d531eb072 Index: ports/mail/fetchmail/files/patch-aclocal.m4 =================================================================== RCS file: ports/mail/fetchmail/files/patch-aclocal.m4 diff -N patch-aclocal.m4 --- ports/mail/fetchmail/files/patch-aclocal.m4 Fri Mar 23 03:10:23 2001 +++ ports/mail/fetchmail/files/patch-aclocal.m4 Fri Mar 23 03:13:03 2001 @@ -0,0 +1,12 @@ +--- aclocal.m4 2001/03/20 09:46:26 1.3 ++++ aclocal.m4 2001/03/23 11:09:05 +@@ -177,6 +177,9 @@ + INSTOBJEXT=.mo + fi + fi ++ if test "$gt_cv_func_gettext_libintl" = "yes"; then ++ INTLLIBS='-lintl' ++ fi + ]) + + if test "$CATOBJEXT" = "NONE"; then Index: ports/mail/fetchmail/files/patch-configure =================================================================== RCS file: patch-configure diff -N patch-configure --- ports/mail/fetchmail/files/patch-configure Fri Mar 23 03:13:03 2001 +++ ports/mail/fetchmail/files/patch-configure Fri Mar 23 03:10:23 2001 @@ -1,20 +0,0 @@ - -$FreeBSD: ports/mail/fetchmail/files/patch-configure,v 1.1 2001/03/20 11:04:36 sobomax Exp $ - ---- configure 2001/03/20 10:48:56 1.1 -+++ configure 2001/03/20 10:50:20 -@@ -6714,10 +6714,10 @@ - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g --s%@ACLOCAL@%$ACLOCAL%g --s%@AUTOCONF@%$AUTOCONF%g --s%@AUTOMAKE@%$AUTOMAKE%g --s%@AUTOHEADER@%$AUTOHEADER%g -+s%@ACLOCAL@%/usr/bin/true%g -+s%@AUTOCONF@%/usr/bin/true%g -+s%@AUTOMAKE@%/usr/bin/true%g -+s%@AUTOHEADER@%/usr/bin/true%g - s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g - s%@host@%$host%g To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010323131917.B17216>