Attachment 130393 Details for Bug 174312 – file.diff

[patch] file.diff

file.diff (text/plain), 5.68 KB, created by Cy Schubert on 2012-12-10 02:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2012-12-10 02:20:00 UTC

Size: 5.68 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 308573)
>+++ Makefile	(working copy)
>@@ -52,7 +52,7 @@
> #
> 
> PORTNAME=	nmh
>-PORTVERSION=	1.3
>+PORTVERSION=	1.5
> CATEGORIES=	mail
> MASTER_SITES=	${MASTER_SITE_SAVANNAH}
> MASTER_SITE_SUBDIR=	nmh
>@@ -62,7 +62,6 @@
> 
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>-USE_AUTOTOOLS=	autoconf
> CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
> 		--sysconfdir=${PREFIX}/etc/nmh
> .ifdef NMH_EDITOR
>@@ -99,23 +98,21 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 900007
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx
>-.endif
>+CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
> 
> .if defined(WITH_SASL2)
> LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
> CONFIGURE_ARGS+=	--with-cyrus-sasl=${PREFIX}
> .endif
> 
>-MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 \
>-	folder.1 folders.1 forw.1 inc.1 install-mh.1 mark.1 \
>+MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 fnext.1 \
>+	folder.1 folders.1 forw.1 fprev.1 inc.1 install-mh.1 mark.1 \
> 	mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 mhn.1 \
> 	mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \
>-	next.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \
>+	next.1 new.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \
> 	rcvpack.1 rcvstore.1 rcvtty.1 refile.1 repl.1 rmf.1 rmm.1 \
> 	scan.1 send.1 sendfiles.1 show.1 slocal.1 \
>-	sortm.1 whatnow.1 whom.1
>+	sortm.1 unseen.1 whatnow.1 whom.1
> 
> MAN5=	mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \
> 	mh-sequence.5 mh-tailor.5 mts.conf.5
>Index: distinfo
>===================================================================
>--- distinfo	(revision 308573)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (nmh-1.3.tar.gz) = 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
>-SIZE (nmh-1.3.tar.gz) = 847614
>+SHA256 (nmh-1.5.tar.gz) = af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39
>+SIZE (nmh-1.5.tar.gz) = 935919
>Index: files/extra-patch-utmpx
>===================================================================
>--- files/extra-patch-utmpx	(revision 308573)
>+++ files/extra-patch-utmpx	(working copy)
>@@ -1,62 +0,0 @@
>---- uip/rcvtty.c.orig	2011-06-01 20:53:01.000000000 -0400
>-+++ uip/rcvtty.c	2011-06-01 20:54:30.000000000 -0400
>-@@ -23,7 +23,7 @@
>- #include <signal.h>
>- #include <fcntl.h>
>- 
>--#include <utmp.h>
>-+#include <utmpx.h>
>- 
>- #ifndef HAVE_GETUTENT
>- # ifndef UTMP_FILE
>-@@ -95,7 +95,7 @@
>- #ifdef HAVE_GETUTENT
>-     struct utmp * utp;
>- #else
>--    struct utmp ut;
>-+    struct utmpx ut;
>-     register FILE *uf;
>- #endif
>- 
>-@@ -193,8 +193,8 @@
>-     if ((uf = fopen (UTMP_FILE, "r")) == NULL)
>- 	exit (RCV_MBX);
>-     while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1)
>--	if (ut.ut_name[0] != 0
>--		&& strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
>-+	if (ut.ut_user[0] != 0
>-+		&& strncmp (user, ut.ut_user, sizeof(ut.ut_user)) == 0) {
>- 	    strncpy (tty, ut.ut_line, sizeof(ut.ut_line));
>- 	    alert (tty, md);
>- 	}
>---- uip/slocal.c.orig	2011-06-01 20:54:37.000000000 -0400
>-+++ uip/slocal.c	2011-06-01 20:55:56.000000000 -0400
>-@@ -56,7 +56,7 @@
>- #include NDBM_HEADER
>- #endif
>- 
>--#include <utmp.h>
>-+#include <utmpx.h>
>- 
>- #ifndef HAVE_GETUTENT
>- # ifndef UTMP_FILE
>-@@ -979,7 +979,7 @@
>- static int
>- logged_in (void)
>- {
>--    struct utmp ut;
>-+    struct utmpx ut;
>-     FILE *uf;
>- 
>-     if (utmped)
>-@@ -989,8 +989,8 @@
>- 	return NOTOK;
>- 
>-     while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1) {
>--	if (ut.ut_name[0] != 0
>--	    && strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
>-+	if (ut.ut_user[0] != 0
>-+	    && strncmp (user, ut.ut_user, sizeof(ut.ut_user)) == 0) {
>- 	    if (debug)
>- 		continue;
>- 	    fclose (uf);
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 0)
>+++ files/patch-Makefile.in	(working copy)
>@@ -0,0 +1,44 @@
>+--- Makefile.in.orig	2012-12-09 14:41:01.479883313 -0800
>++++ Makefile.in	2012-12-09 14:48:13.430726025 -0800
>+@@ -3573,16 +3573,16 @@
>+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
>+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+ 	  f=$(am__strip_dir) \
>+-	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
>+-	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
>++	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
>++	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
>+ 	done
>+ 
>+ uninstall-dist_sysconfDATA:
>+ 	@$(NORMAL_UNINSTALL)
>+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
>+ 	  f=$(am__strip_dir) \
>+-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
>+-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
>++	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
>++	  rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
>+ 	done
>+ install-sysconfDATA: $(sysconf_DATA)
>+ 	@$(NORMAL_INSTALL)
>+@@ -3590,16 +3590,16 @@
>+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
>+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+ 	  f=$(am__strip_dir) \
>+-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
>+-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
>++	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
>++	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
>+ 	done
>+ 
>+ uninstall-sysconfDATA:
>+ 	@$(NORMAL_UNINSTALL)
>+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
>+ 	  f=$(am__strip_dir) \
>+-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
>+-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
>++	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
>++	  rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
>+ 	done
>+ 
>+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

Actions: View | Diff

Attachments on bug 174312: 130393 | 130394