[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

UPDATE: fetchmail-6.3.2



Hi!

Attached is an update to fetchmail-6.3.2. Please test. (esp. on 
non-i386)

Comments, oks?

Bernd
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/fetchmail/Makefile,v
retrieving revision 1.104
diff -u -u -r1.104 Makefile
--- Makefile	27 Oct 2005 21:58:51 -0000	1.104
+++ Makefile	26 Jan 2006 12:46:27 -0000
@@ -2,47 +2,45 @@
 
 COMMENT=	"mail retrieval utility for POP2, POP3, KPOP, IMAP and more"
 
-DISTNAME=	fetchmail-6.2.5.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	fetchmail-6.3.2
 CATEGORIES=	mail
 MASTER_SITES=	http://download.berlios.de/fetchmail/
 
 HOMEPAGE=	http://fetchmail.berlios.de/
 
-MAINTAINER=	Federico Schwindt <fgsch_(_at_)_openbsd_(_dot_)_org>
+MAINTAINER=	Bernd Ahlers <bernd_(_at_)_openbsd_(_dot_)_org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto krb5 ssl
 
-MODULES=	devel/gettext
+MODULES=		devel/gettext
 
-SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--disable-nls --enable-inet6 --with-ssl \
-		--with-kerberos5 --enable-NTLM
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+SEPARATE_BUILD=		concurrent
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--enable-inet6 --with-ssl \
+			--with-kerberos5 --enable-NTLM
 
-NO_REGRESS=	Yes
+EXTRACT_SUFX=		.tar.bz2
 
-DOCS=	FAQ NOTES FEATURES README COPYING fetchmail-FAQ.html \
-	fetchmail-features.html design-notes.html todo.html
+DOCS=			FAQ NOTES FEATURES README COPYING fetchmail-FAQ.html \
+			fetchmail-features.html design-notes.html todo.html
 
 pre-patch:
 	@sed -e "s|@PREFIX@|${LOCALBASE}|" \
-	  ${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
+		${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
 	@tbl ${WRKSRC}/fetchmail.man > ${WRKSRC}/fetchmail.tbl && \
-	  cp -f ${WRKSRC}/fetchmail.tbl ${WRKSRC}/fetchmail.man
+		cp -f ${WRKSRC}/fetchmail.tbl ${WRKSRC}/fetchmail.man
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fetchmail
 	@cd ${PREFIX}/man/man1 && ln -sf fetchmail.1 fetchmailconf.1
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/fetchmail
-	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf \
-	  ${PREFIX}/libexec/fetchmailconf.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py \
+		${PREFIX}/libexec/fetchmailconf.bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/fetchmail/distinfo,v
retrieving revision 1.17
diff -u -u -r1.17 distinfo
--- distinfo	25 Jul 2005 17:41:51 -0000	1.17
+++ distinfo	26 Jan 2006 12:46:27 -0000
@@ -1,4 +1,4 @@
-MD5 (fetchmail-6.2.5.2.tar.gz) = 6eefef076bf3517a870f27a6133ff8c4
-RMD160 (fetchmail-6.2.5.2.tar.gz) = eeda8897a63e4634abe6b301638ca9ede2674afe
-SHA1 (fetchmail-6.2.5.2.tar.gz) = 8341296bae50bf49dce8e146cbb685622c5421b9
-SIZE (fetchmail-6.2.5.2.tar.gz) = 1277649
+MD5 (fetchmail-6.3.2.tar.bz2) = a532134a5e3b35b4f8b78a8184439837
+RMD160 (fetchmail-6.3.2.tar.bz2) = 463c77dced9e0d3fe4f4cd951d3c7f7b35d6fe48
+SHA1 (fetchmail-6.3.2.tar.bz2) = 95bdc22bde0033ccd3c4441353b0bef0e11987eb
+SIZE (fetchmail-6.3.2.tar.bz2) = 1190838
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/fetchmail/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -u -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in	19 Feb 2005 21:27:35 -0000	1.5
+++ patches/patch-Makefile_in	26 Jan 2006 12:46:27 -0000
@@ -1,27 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2005/02/19 21:27:35 alek Exp $
---- Makefile.in.orig	Thu Oct 16 00:38:18 2003
-+++ Makefile.in	Sat Feb 19 22:10:08 2005
-@@ -133,19 +133,19 @@ dummy:
+$OpenBSD$
+--- Makefile.in.orig	Sun Jan 22 12:49:46 2006
++++ Makefile.in	Thu Jan 26 13:41:37 2006
+@@ -1357,7 +1357,7 @@ info: info-recursive
  
- # Tester for address parsing
- rfc822: rfc822.c
--	gcc -DMAIN -g rfc822.c -o rfc822
-+	$(CC) -DMAIN -g -o $@ $?
+ info-am:
  
- # Stand-alone MIME decoder
- unmime: unmime.c base64.c rfc822.c xmalloc.c report.c
--	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $^
-+	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $?
+-install-data-am: install-man install-pythonPYTHON
++install-data-am: install-man
  
+ install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
  
- # Stand-alone netrc tester
- netrc: netrc.c xmalloc.o report.o
--	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $^
-+	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $?
- 
- .c.o:
--	$(CC) $(defines) -c $(CPFLAGS) -I. -I$(srcdir) -I$(top_builddir)/intl -I$(top_srcdir)/intl $(CEFLAGS) $(CFLAGS) $<
-+	$(CC) $(defines) -c $(CPFLAGS) -I. -I$(srcdir) $(CEFLAGS) $(CFLAGS) $<
- 
- # For some losing Unix makes.
- SHELL = /bin/sh
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/fetchmail/patches/patch-configure,v
retrieving revision 1.7
diff -u -u -r1.7 patch-configure
--- patches/patch-configure	19 Feb 2005 21:27:35 -0000	1.7
+++ patches/patch-configure	26 Jan 2006 12:46:27 -0000
@@ -1,30 +1,36 @@
-$OpenBSD: patch-configure,v 1.7 2005/02/19 21:27:35 alek Exp $
---- configure.orig	Fri Oct 10 10:39:54 2003
-+++ configure	Sat Feb 19 14:04:10 2005
-@@ -8735,7 +8735,7 @@ if test "${ac_cv_lib_intl_gettext+set}" 
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl  $LIBS"
-+LIBS="-lintl -liconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -8784,7 +8784,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
- echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
- if test $ac_cv_lib_intl_gettext = yes; then
--  LIBS="$LIBS -lintl"
-+  LIBS="$LIBS -lintl -liconv"
- fi
- 
- 
-@@ -12795,7 +12795,7 @@ _ACEOF
+$OpenBSD$
+--- configure.orig	Mon Dec 19 11:42:24 2005
++++ configure	Tue Dec 20 12:50:48 2005
+@@ -11436,7 +11436,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
    CEFLAGS="$CEFLAGS -I/usr/include/kerberosV"
 -  LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
 +  LIBS="$LIBS -lkrb5"
- else
-   if test "$with_kerberos5" != "yes"
-   then
+ elif krb5-config 2> /dev/null >/dev/null ; then
+   krb5_prefix=`krb5-config --prefix krb5`
+   echo "$as_me:$LINENO: result: krb5-config points to kerberosV under $krb5_prefix" >&5
+@@ -14843,8 +14843,8 @@ s,@pythondir@,$pythondir,;t t
+ s,@pkgpythondir@,$pkgpythondir,;t t
+ s,@pyexecdir@,$pyexecdir,;t t
+ s,@pkgpyexecdir@,$pkgpyexecdir,;t t
+-s,@HAVE_PYTHON_TRUE@,$HAVE_PYTHON_TRUE,;t t
+-s,@HAVE_PYTHON_FALSE@,$HAVE_PYTHON_FALSE,;t t
++s,@HAVE_PYTHON_TRUE@,#,;t t
++s,@HAVE_PYTHON_FALSE@,#,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+@@ -14876,10 +14876,10 @@ s,@GMSGFMT@,$GMSGFMT,;t t
+ s,@XGETTEXT@,$XGETTEXT,;t t
+ s,@MSGMERGE@,$MSGMERGE,;t t
+ s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
++s,@LIBICONV@,$LTLIBICONV,;t t
+ s,@LTLIBICONV@,$LTLIBICONV,;t t
+ s,@INTLLIBS@,$INTLLIBS,;t t
+-s,@LIBINTL@,$LIBINTL,;t t
++s,@LIBINTL@,$LTLIBINTL,;t t
+ s,@LTLIBINTL@,$LTLIBINTL,;t t
+ s,@POSUB@,$POSUB,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
Index: patches/patch-fetchmailconf
===================================================================
RCS file: patches/patch-fetchmailconf
diff -N patches/patch-fetchmailconf
--- patches/patch-fetchmailconf	27 Oct 2005 21:58:51 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-fetchmailconf,v 1.1 2005/10/27 21:58:51 bernd Exp $
---- fetchmailconf.orig	Thu Oct 27 14:42:59 2005
-+++ fetchmailconf	Thu Oct 27 14:57:33 2005
-@@ -858,14 +858,13 @@ class ConfigurationEdit(Frame, MyWidget)
- 	    # Pre-1.5.2 compatibility...
- 	    except os.error:
- 		pass
--	    fm = open(self.outfile, 'w')
-+	    fd = os.open(self.outfile, os.O_CREAT|os.O_WRONLY, 0600)
-+	    fm = os.fdopen(fd, 'w')
- 	if fm:
- 	    fm.write("# Configuration created %s by fetchmailconf\n" % time.ctime(time.time()))
- 	    fm.write(`self.configuration`)
- 	    if self.outfile:
- 		fm.close()
--	    if fm != sys.stdout:
--		os.chmod(self.outfile, 0600)
- 	    self.destruct()
- 
- #
Index: patches/patch-intl_Makefile_in
===================================================================
RCS file: patches/patch-intl_Makefile_in
diff -N patches/patch-intl_Makefile_in
--- patches/patch-intl_Makefile_in	1 May 2002 22:19:37 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-intl_Makefile_in,v 1.1 2002/05/01 22:19:37 fgsch Exp $
---- intl/Makefile.in.orig	Wed May  1 14:14:59 2002
-+++ intl/Makefile.in	Wed May  1 14:15:31 2002
-@@ -204,12 +204,10 @@ Makefile: Makefile.in ../config.status
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
--_(_at_)_GT_YES@intlh.inst: intlh.inst.in ../config.status
--_(_at_)_GT_YES@	cd .. \
--_(_at_)_GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--_(_at_)_GT_YES@	  $(SHELL) ./config.status
--_(_at_)_GT_NO@.PHONY: intlh.inst
--_(_at_)_GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/fetchmail/pkg/PLIST,v
retrieving revision 1.13
diff -u -u -r1.13 PLIST
--- pkg/PLIST	15 Sep 2004 09:09:42 -0000	1.13
+++ pkg/PLIST	26 Jan 2006 12:46:27 -0000
@@ -14,3 +14,14 @@
 share/doc/fetchmail/fetchmail-FAQ.html
 share/doc/fetchmail/fetchmail-features.html
 share/doc/fetchmail/todo.html
+share/locale/ca/LC_MESSAGES/fetchmail.mo
+share/locale/cs/LC_MESSAGES/fetchmail.mo
+share/locale/de/LC_MESSAGES/fetchmail.mo
+share/locale/es/LC_MESSAGES/fetchmail.mo
+share/locale/fr/LC_MESSAGES/fetchmail.mo
+share/locale/ja/LC_MESSAGES/fetchmail.mo
+share/locale/pl/LC_MESSAGES/fetchmail.mo
+share/locale/ru/LC_MESSAGES/fetchmail.mo
+share/locale/sq/
+share/locale/sq/LC_MESSAGES/
+share/locale/sq/LC_MESSAGES/fetchmail.mo

Visit your host, monkey.org