Re: pkg/30102: patch for upgraging mutt-devel to 1.5.9i

To: jlam%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/30102: patch for upgraging mutt-devel to 1.5.9i
From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
Date: Tue, 7 Jun 2005 20:05:03 +0000 (UTC)
The following reply was made to PR pkg/30102; it has been noted by GNATS.

From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/30102: patch for upgraging mutt-devel to 1.5.9i
Date: Tue, 7 Jun 2005 22:00:37 +0200

 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 An updated patch, since the package was changed a little bit since then.
 
 regards, 
 antoine
 
 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="mutt-devel-1.5.9.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v
 retrieving revision 1.31
 diff -u -r1.31 Makefile
 --- Makefile   29 May 2005 05:09:55 -0000      1.31
 +++ Makefile   7 Jun 2005 20:01:25 -0000
 @@ -1,8 +1,7 @@
  # $NetBSD: Makefile,v 1.31 2005/05/29 05:09:55 minskim Exp $
  
 -DISTNAME=             mutt-1.5.6i
 +DISTNAME=             mutt-1.5.9i
  PKGNAME=              ${DISTNAME:C/i$//}
 -PKGREVISION=  1
  CATEGORIES=           mail
  MUTT_SITES=           ftp://ftp.mutt.org/mutt/ \
                        
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/mail/mutt-devel/distinfo,v
 retrieving revision 1.22
 diff -u -r1.22 distinfo
 --- distinfo   29 May 2005 05:09:55 -0000      1.22
 +++ distinfo   7 Jun 2005 20:01:26 -0000
 @@ -1,12 +1,11 @@
  $NetBSD: distinfo,v 1.22 2005/05/29 05:09:55 minskim Exp $
  
 -SHA1 (mutt-1.5.6i.tar.gz) = 5b3ea613abeff4007fadc38946806aee2f225f48
 -RMD160 (mutt-1.5.6i.tar.gz) = 9bcd0975d81ddedcfda41ae4875a16159fe9345e
 -Size (mutt-1.5.6i.tar.gz) = 2910730 bytes
 +SHA1 (mutt-1.5.9i.tar.gz) = a380747b86f11b2b3bf3c4407e70bfebe6d0af02
 +RMD160 (mutt-1.5.9i.tar.gz) = 888848046382b3c4e8b18eacd30af4291a7ed23d
 +Size (mutt-1.5.9i.tar.gz) = 3036003 bytes
  SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 -SHA1 (patch-ab) = c34c52fa0c49250d3acf7b402b56abf2531e6a68
 +SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
  SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 -SHA1 (patch-ag) = ebfeb5c03770501f7e7cc918ec2c56ddc2f1ed1d
 +SHA1 (patch-ag) = 77d62de934a9584c3d41cf7b7231af643618d826
  SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
  SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
 -SHA1 (patch-am) = 8fb3b3d4b387af9f7ada3c7752a9501a08b47319
 Index: patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/mail/mutt-devel/patches/patch-ab,v
 retrieving revision 1.6
 diff -u -r1.6 patch-ab
 --- patches/patch-ab   29 May 2005 05:09:55 -0000      1.6
 +++ patches/patch-ab   7 Jun 2005 20:01:26 -0000
 @@ -1,39 +1,25 @@
  $NetBSD: patch-ab,v 1.6 2005/05/29 05:09:55 minskim Exp $
  
 ---- Makefile.in.orig  2004-02-01 12:24:01.000000000 -0600
 -+++ Makefile.in
 -@@ -26,6 +26,7 @@ datadir = @datadir@
 - sysconfdir = @sysconfdir@
 - sharedstatedir = @sharedstatedir@
 +--- Makefile.in.orig  2005-06-07 21:44:00.000000000 +0200
 ++++ Makefile.in       2005-06-07 21:48:32.000000000 +0200
 +@@ -169,7 +169,7 @@
 + DBX = @DBX@
 + DEBUGGER = @DEBUGGER@
 + DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 +-     -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
 ++     -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
 +      -DHAVE_CONFIG_H=1
 + 
 + DEPDIR = @DEPDIR@
 +@@ -277,6 +277,7 @@
 + libdir = @libdir@
 + libexecdir = @libexecdir@
   localstatedir = @localstatedir@
  +localedir = $(prefix)/share/locale
 - libdir = @libdir@
 - infodir = @infodir@
   mandir = @mandir@
 -@@ -113,11 +114,11 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring ma
 - 
 - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
 - 
 --bin_SCRIPTS = muttbug flea
 -+bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 - 
 - BUILT_SOURCES = keymap_defs.h patchlist.c
 - 
 --bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 -+bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
 - mutt_SOURCES = $(BUILT_SOURCES)      addrbook.c alias.c attach.c base64.c 
browser.c buffy.c color.c         crypt.c cryptglue.c      commands.c 
complete.c compose.c copy.c curs_lib.c curs_main.c date.c    edit.c enter.c 
flags.c init.c filter.c from.c getdomain.c       handler.c hash.c hdrline.c 
headers.c help.c hook.c keymap.c     main.c mbox.c menu.c mh.c mx.c pager.c 
parse.c pattern.c        postpone.c query.c recvattach.c recvcmd.c       
rfc822.c rfc1524.c rfc2047.c rfc2231.c  score.c send.c sendlib.c signal.c 
sort.c        status.c system.c thread.c charset.c history.c lib.c    muttlib.c 
editmsg.c utf8.c mbyte.c wcwidth.c    url.c ascii.c mutt_idna.c
 - 
 - 
 -@@ -140,7 +141,7 @@ makedoc_DEPENDENCIES = 
 - 
 - CPP = @CPP@
 - 
 --DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\"         
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\"    
-DHAVE_CONFIG_H=1
 -+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\"         
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\"         
-DHAVE_CONFIG_H=1
 - 
 - 
 - INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 -@@ -874,7 +875,7 @@ install-exec-local:
 + mkdir_p = @mkdir_p@
 + oldincludedir = @oldincludedir@
 +@@ -999,7 +1000,7 @@
                ln -sf $(DESTDIR)$(bindir)/mutt_dotlock 
$(DESTDIR)$(bindir)/mutt.dotlock ; \
        fi
        if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != 
x ; then \
 Index: patches/patch-ag
 ===================================================================
 RCS file: /cvsroot/pkgsrc/mail/mutt-devel/patches/patch-ag,v
 retrieving revision 1.1
 diff -u -r1.1 patch-ag
 --- patches/patch-ag   21 Jul 2004 22:37:10 -0000      1.1
 +++ patches/patch-ag   7 Jun 2005 20:01:26 -0000
 @@ -1,13 +1,13 @@
  $NetBSD: patch-ag,v 1.1 2004/07/21 22:37:10 jlam Exp $
  
 ---- doc/Makefile.in.orig      Sat Dec  7 09:15:01 2002
 -+++ doc/Makefile.in
 -@@ -79,7 +79,7 @@ install: all instdoc
 +--- doc/Makefile.in.orig      2005-06-07 21:51:57.000000000 +0200
 ++++ doc/Makefile.in   2005-06-07 21:53:19.000000000 +0200
 +@@ -80,7 +80,7 @@
        ./instdoc $(srcdir)/dotlock.man \
                $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
        ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
  -     ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
  +     ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
 +      ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
        for f in $(srcdir_DOCFILES) ; do \
 -              $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 
 --HcAYCG3uE/tztfnV--
Prev by Date: Re: pkg/30457: borken globbing in tcsh
Next by Date: Re: pkg/24684
Previous by Thread: pkg/30102: patch for upgraging mutt-devel to 1.5.9i
Next by Thread: Re: pkg/30102
Indexes:
Home | Main Index | Thread Index | Old Index