Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jan 2000 17:37:38 +0100 (CET)
From:      Alexander Langer <alex@cichlids.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/16123: update mail/fetchmail to 5.2.3
Message-ID:  <200001141637.RAA56553@cichlids.cichlids.com>

next in thread | raw e-mail | index | archive | help

>Number:         16123
>Category:       ports
>Synopsis:       update mail/fetchmail to 5.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 14 08:40:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Langer
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
none
>Environment:

recent ports tree

>Description:

update to version 5.2.3
remove patch-ad
add patch-af

>How-To-Repeat:

n/a

>Fix:


diff -rNu fetchmail.old/Makefile fetchmail/Makefile
--- fetchmail.old/Makefile	Fri Jan 14 16:30:56 2000
+++ fetchmail/Makefile	Fri Jan 14 16:31:30 2000
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	fetchmail
-# Version required:     5.2.1
+# Version required:     5.2.3
 # Date created:		26 Oct 1996
 # Whom:			Ville Eerola <ve@sci.fi>
 #
@@ -11,7 +11,7 @@
 # does not need Python, so there is no RUN_DEPENDS for Python in
 # this Makefile.
 
-DISTNAME=       fetchmail-5.2.1
+DISTNAME=       fetchmail-5.2.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
diff -rNu fetchmail.old/files/md5 fetchmail/files/md5
--- fetchmail.old/files/md5	Fri Jan 14 16:30:56 2000
+++ fetchmail/files/md5	Fri Jan 14 16:36:30 2000
@@ -1 +1 @@
-MD5 (fetchmail-5.2.1.tar.gz) = 52b6e39871129a00f59caa929d539bcc
+MD5 (fetchmail-5.2.3.tar.gz) = ad21b1ac6a062bd8b8236c1e33299bf3
diff -rNu fetchmail.old/patches/patch-ab fetchmail/patches/patch-ab
--- fetchmail.old/patches/patch-ab	Fri Jan 14 16:30:56 2000
+++ fetchmail/patches/patch-ab	Fri Jan 14 17:11:57 2000
@@ -1,81 +1,39 @@
-*** Makefile.in.orig	Sat Sep 18 16:00:11 1999
---- Makefile.in	Sat Sep 18 16:02:04 1999
-***************
-*** 40,46 ****
-  
-  # If your system needs extra libraries loaded in, define them here.
-  # In particular, add -lresolv if you are running bind 4.9.5
-! LOADLIBS = @LIBS@ @LEXLIB@ @INTLLIBS@
-  # LOADLIBS = -lsocket3r -lunix3r	# QNX
-  
-  # Any extra object files your system needs.
---- 40,46 ----
-  
-  # If your system needs extra libraries loaded in, define them here.
-  # In particular, add -lresolv if you are running bind 4.9.5
-! LOADLIBS = @LIBS@ @LEXLIB@ @INTLLIBS@ -lmd
-  # LOADLIBS = -lsocket3r -lunix3r	# QNX
-  
-  # Any extra object files your system needs.
-***************
-*** 70,75 ****
---- 70,77 ----
-  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-  # Program to install the man page.
-  INSTALL_DATA = @INSTALL_DATA@
-+ # Program to install scripts
-+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
-  # Generic install program.
-  INSTALL = @INSTALL@
-  
-***************
-*** 84,90 ****
-  
-  protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
-         etrn.o fetchmail.o env.o options.o daemon.o driver.o sink.o \
-!        rfc822.o smtp.o xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o \
-         interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o \
-         smbdes.o smbencrypt.o smbmd4.o smbutil.o
-  
---- 86,92 ----
-  
-  protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
-         etrn.o fetchmail.o env.o options.o daemon.o driver.o sink.o \
-!        rfc822.o smtp.o xmalloc.o uid.o mxget.o md5ify.o rpa.o \
-         interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o \
-         smbdes.o smbencrypt.o smbmd4.o smbutil.o
-  
-***************
-*** 96,102 ****
-         $(srcdir)/options.c $(srcdir)/daemon.c $(srcdir)/driver.c	\
-         $(srcdir)/sink.c $(srcdir)/rfc822.c $(srcdir)/smtp.c		\
-         $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c 		\
-!        $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/rpa.c	  	\
-         $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c	\
-         $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c		\
-         $(srcdir)/checkalias.c $(srcdir)/smbdes.c $(srcdir)/smbencrypt.c \
---- 98,104 ----
-         $(srcdir)/options.c $(srcdir)/daemon.c $(srcdir)/driver.c	\
-         $(srcdir)/sink.c $(srcdir)/rfc822.c $(srcdir)/smtp.c		\
-         $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c 		\
-!        $(srcdir)/md5ify.c $(srcdir)/rpa.c	  	\
-         $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c	\
-         $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c		\
-         $(srcdir)/checkalias.c $(srcdir)/smbdes.c $(srcdir)/smbencrypt.c \
-***************
-*** 151,157 ****
-  	@echo "Installing fetchmail binary..."
-  	$(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
-  	@echo "Installing fetchmail configurator..."
-! 	$(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
-  	@echo "Installing manual page..."
-  	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
-  	rm -f $(mandir)/fetchmailconf.$(manext)
---- 153,159 ----
-  	@echo "Installing fetchmail binary..."
-  	$(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
-  	@echo "Installing fetchmail configurator..."
-! 	$(INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
-  	@echo "Installing manual page..."
-  	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
-  	rm -f $(mandir)/fetchmailconf.$(manext)
+--- Makefile.in.old	Fri Jan 14 16:58:35 2000
++++ Makefile.in	Fri Jan 14 17:01:18 2000
+@@ -40,7 +40,7 @@
+ 
+ # If your system needs extra libraries loaded in, define them here.
+ # In particular, add -lresolv if you are running bind 4.9.5
+-LOADLIBS = @LIBS@ @LEXLIB@ @INTLLIBS@
++LOADLIBS = @LIBS@ @LEXLIB@ @INTLLIBS@ -lmd
+ # LOADLIBS = -lsocket3r -lunix3r	# QNX
+ 
+ # Any extra object files your system needs.
+@@ -70,6 +70,8 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ # Program to install the man page.
+ INSTALL_DATA = @INSTALL_DATA@
++# Program to install scripts
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ # Generic install program.
+ INSTALL = @INSTALL@
+ 
+@@ -152,7 +154,7 @@
+ 	@echo "Installing fetchmail binary..."
+ 	$(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
+ 	@echo "Installing fetchmail configurator..."
+-	$(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
++	$(INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
+ 	@echo "Installing manual page..."
+ 	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
+ 	rm -f $(mandir)/fetchmailconf.$(manext)
+@@ -236,8 +238,7 @@
+ 	$(srcdir)/smbbyteorder.h $(srcdir)/smbdes.h $(srcdir)/smbencrypt.h \
+ 	$(srcdir)/smbmd4.h
+ extra = $(srcdir)/alloca.c $(srcdir)/getopt.[ch] $(srcdir)/getopt1.c \
+-	$(srcdir)/strcasecmp.c $(srcdir)/strstr.c $(srcdir)/memmove.c \
+-	$(srcdir)/md5c.c
++	$(srcdir)/strcasecmp.c $(srcdir)/strstr.c $(srcdir)/memmove.c
+ docs = $(srcdir)/COPYING $(srcdir)/FEATURES $(srcdir)/fetchmail-features.html \
+ 	$(srcdir)/design-notes.html $(srcdir)/NOTES \
+ 	$(srcdir)/INSTALL $(srcdir)/NEWS $(srcdir)/README \
diff -rNu fetchmail.old/patches/patch-ad fetchmail/patches/patch-ad
--- fetchmail.old/patches/patch-ad	Fri Jan 14 16:30:56 2000
+++ fetchmail/patches/patch-ad	Thu Jan  1 01:00:00 1970
@@ -1,47 +0,0 @@
---- configure.orig	Thu Sep 16 00:21:02 1999
-+++ configure	Fri Sep 24 13:13:25 1999
-@@ -4970,7 +4970,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lopie  $LIBS"
-+LIBS="-lopie -lmd $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 4976 "configure"
- #include "confdefs.h"
-@@ -5004,7 +5004,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lopie $LIBS"
-+  LIBS="-lopie -lmd $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -5368,7 +5368,7 @@
- then
-   echo "Configuring kerberosIV for `uname`"
-   CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV"
--  LIBS="$LIBS -lkrb -ldes"
-+  LIBS="$LIBS -lkrb -ldes -lcom_err"
- elif test -n "$with_kerberos" -a -n "$with_kerberos5"
- then
-     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
-@@ -5399,7 +5399,7 @@
- then
-     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
-     LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
--    LIBS="$LIBS -lkrb -ldes"
-+    LIBS="$LIBS -lkrb -ldes -lcom_err"
- else
-   if test "$with_kerberos" != "no"
-   then
-@@ -5409,7 +5409,7 @@
-       then
-         CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
-         LDEFLAGS="$LDEFLAGS -L$dir/lib"
--        LIBS="$LIBS -lkrb -ldes"
-+        LIBS="$LIBS -lkrb -ldes -lcom_err"
-         break
-       fi
-     done
diff -rNu fetchmail.old/patches/patch-af fetchmail/patches/patch-af
--- fetchmail.old/patches/patch-af	Thu Jan  1 01:00:00 1970
+++ fetchmail/patches/patch-af	Fri Jan 14 17:09:52 2000
@@ -0,0 +1,13 @@
+--- configure.old	Fri Jan 14 17:09:12 2000
++++ configure	Fri Jan 14 17:09:41 2000
+@@ -4005,10 +4005,6 @@
+ #define HAVE_MD5 1
+ EOF
+ 
+-else
+-  echo "$ac_t""no" 1>&6
+-EXTRASRC="$EXTRASRC \$(srcdir)/md5c.c"
+-               EXTRAOBJ="$EXTRAOBJ md5c.o"
+ fi
+ 
+ 

>Release-Note:
>Audit-Trail:
>Unformatted:


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?200001141637.RAA56553>