[pkgsrc/trunk]: pkgsrc/mail/mush Honour PKGMANDIR. Use SUBST framework. Add D...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/mush Honour PKGMANDIR. Use SUBST framework. Add D...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:51:47 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/17112190a774
branches:  trunk
changeset: 505861:17112190a774
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 08 17:04:58 2006 +0000

description:
Honour PKGMANDIR. Use SUBST framework. Add DragonFly support. Fix errno.

diffstat:

 mail/mush/Makefile         |  20 +++++++++++++++++---
 mail/mush/distinfo         |  12 ++++++------
 mail/mush/patches/patch-ad |  20 +++++++++++++++-----
 mail/mush/patches/patch-ag |  10 +++++-----
 mail/mush/patches/patch-ah |   8 ++++----
 mail/mush/patches/patch-ak |  14 +-------------
 mail/mush/patches/patch-am |  10 +++++-----
 7 files changed, 53 insertions(+), 41 deletions(-)

diffs (215 lines):

diff -r 207863a31815 -r 17112190a774 mail/mush/Makefile
--- a/mail/mush/Makefile        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/Makefile        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/29 05:16:27 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/08 17:04:58 joerg Exp $
 
 DISTNAME=      mush-7.2.5
 PKGNAME=       mush-7.2.6.b4.pl1
@@ -27,8 +27,22 @@
 DIST_SUBDIR=   mush
 BUILD_TARGET=  mush
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "DragonFly"
+PLAT_MAKEFILE= makefile.netbsd
+.else
+PLAT_MAKEFILE= makefile.${LOWER_OPSYS}
+.endif
+
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     config.h-dist ${PLAT_MAKEFILE}
+SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+=      -e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g'
+SUBST_STAGE.paths=     post-patch
+
 pre-configure:
-       ${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/config.h-dist > ${WRKSRC}/config.h
-       ${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/makefile.${LOWER_OPSYS} > ${WRKSRC}/Makefile
+       ${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
+       ${CP} ${WRKSRC}/${PLAT_MAKEFILE} ${WRKSRC}/Makefile
 
 .include "../../mk/bsd.pkg.mk"
diff -r 207863a31815 -r 17112190a774 mail/mush/distinfo
--- a/mail/mush/distinfo        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/distinfo        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/09/28 20:31:28 christos Exp $
+$NetBSD: distinfo,v 1.10 2006/01/08 17:04:58 joerg Exp $
 
 SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
 RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
@@ -27,15 +27,15 @@
 SHA1 (patch-aa) = dd38a31a1e048471013df7a167fdf5582445ce2b
 SHA1 (patch-ab) = e1482baca81fe09889f8316d96f9afb1a7a6bbb0
 SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b
-SHA1 (patch-ad) = 1316212cceb8184e9e1af4006bebd462e893cd94
+SHA1 (patch-ad) = 2bcbd8e6e052d1549d4eb5201ec10f5ff3fd3051
 SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6
 SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941
-SHA1 (patch-ag) = 29f4e9ca85bfbdaa53aa99ba077a4b657fea8c87
-SHA1 (patch-ah) = 8ba748a25f82f519af6ecf53d0ad623f5f2c753e
+SHA1 (patch-ag) = dce8cf449bca506d2d478a9b925aa4b80b34f6d6
+SHA1 (patch-ah) = ddd684d8de13fd2f338c506254229fa63cca9e94
 SHA1 (patch-ai) = 5659b2d975f86e856d1bf6efb8909bc08ec2acf4
 SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746
-SHA1 (patch-ak) = 47a3a7dc405a654db3a7d76f80d71af98e9501cb
+SHA1 (patch-ak) = fc25abdf0dfe16020a7ca5e4b284c40367f20f98
 SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762
-SHA1 (patch-am) = 2af4636ebd0168d06711abff5f05ffbf0e1868a8
+SHA1 (patch-am) = 6ce0fd015cb33ada51e086be1131ec0ad94f4169
 SHA1 (patch-an) = 9c7441265ac13e73a4143440b3a1706f81d9d00c
 SHA1 (patch-ao) = e5b28c4a761c1bc1bba195c5dc6ff332cad51f67
diff -r 207863a31815 -r 17112190a774 mail/mush/patches/patch-ad
--- a/mail/mush/patches/patch-ad        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/patches/patch-ad        Sun Jan 08 17:04:58 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2005/05/29 05:33:42 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2006/01/08 17:04:58 joerg Exp $
 
---- mush.h.orig        2005-05-29 00:29:17.730213120 -0500
+--- mush.h.orig        2006-01-08 16:53:34.000000000 +0000
 +++ mush.h
 @@ -4,89 +4,98 @@
  
@@ -644,7 +644,7 @@
  #endif
  
  #endif /* SUNTOOL */
-@@ -547,8 +566,13 @@ u_long   glob_flags;      /* global boolean f
+@@ -547,19 +566,34 @@ u_long   glob_flags;     /* global boolean f
  /* It is possible to reset MAX_PRIORITY to as high as 9 */
  #define MAX_PRIORITY  5
  
@@ -660,7 +660,11 @@
  struct msg {
      u_long m_flags;
      long   m_offset;  /* offset in tempfile of msg */
-@@ -559,7 +583,16 @@ struct msg {
+     long   m_size;    /* number of bytes in msg */
+     int    m_lines;   /* number of lines in msg */
++    int    m_headers; /* number of header lines in msg */
+     char   *m_date_recv;/* Date user received msg (see dates.c for fmt) */
+     char   *m_date_sent;/* Date author sent msg (see dates.c for fmt) */
      char   *m_to;     /* Cached To: field */
      char   *m_subject;        /* Cached Subject: field */
      char   *m_from;   /* Cached Reply-To: or From: field */
@@ -678,7 +682,13 @@
  
  struct options {
      char *option;
-@@ -603,7 +636,11 @@ jmp_buf jmpbuf;           /* longjmp to jmpbuf on
+@@ -597,13 +631,16 @@ extern char
+     **environ;                /* user's environment variables */
+ #endif
+ 
+-extern int errno;     /* global system error number */
+ jmp_buf jmpbuf;               /* longjmp to jmpbuf on sigs (not in tool) */
+ 
  char
      debug,            /* debug causes various print statements in code */
      tempfile[MAXPATHLEN],     /* path to filename of temporary file */
diff -r 207863a31815 -r 17112190a774 mail/mush/patches/patch-ag
--- a/mail/mush/patches/patch-ag        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/patches/patch-ag        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 1998/09/04 19:29:06 christos Exp $
+$NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $
 
 *** /dev/null  Fri Sep  4 13:38:54 1998
 --- makefile.netbsd    Fri Sep  4 13:36:36 1998
@@ -59,10 +59,10 @@
 + clean:
 +      rm -f *.o core mush
 + 
-+ BINDIR= __PREFIX/bin
-+ LIBDIR= __PREFIX/share/misc
-+ MRCDIR= __PREFIX/share/misc
-+ MANDIR= __PREFIX/man/man1
++ BINDIR= @PREFIX@/bin
++ LIBDIR= @PREFIX@/share/misc
++ MRCDIR= @PREFIX@/share/misc
++ MANDIR= @MANDIR@/man1
 + MANEXT= 1
 + 
 + install: mush
diff -r 207863a31815 -r 17112190a774 mail/mush/patches/patch-ah
--- a/mail/mush/patches/patch-ah        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/patches/patch-ah        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 1998/09/04 19:29:06 christos Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/08 17:04:58 joerg Exp $
 
 *** old/config.h-dist  Fri Sep  4 11:21:28 1998
 --- config.h-dist      Fri Sep  4 11:21:28 1998
@@ -21,13 +21,13 @@
   /* Default names and locations for files */
   #define MAILRC               ".mushrc"
   #define ALTERNATE_RC ".mailrc"
-! #define DEFAULT_RC   "__PREFIX/share/misc/Mushrc"
+! #define DEFAULT_RC   "@PREFIX@/share/misc/Mushrc"
 ! #define ALT_DEF_RC   "/etc/Mail.rc"
   #define SIGNATURE    ".signature"
   #define FORTUNE              "/usr/games/fortune"
-! #define COMMAND_HELP "__PREFIX/share/misc/cmd_help"
+! #define COMMAND_HELP "@PREFIX@/share/misc/cmd_help"
   #ifdef SUNTOOL
-! #    define TOOL_HELP        "__PREFIX/share/misc/tool_help"
+! #    define TOOL_HELP        "@PREFIX@/share/misc/tool_help"
   #endif /* SUNTOOL */
   #define ALTERNATE_HOME       "/tmp"       /* Path must be read/write to EVERYONE */
   #define EDFILE       ".edXXXXXX"  /* file/pathname added to user's "home" */
diff -r 207863a31815 -r 17112190a774 mail/mush/patches/patch-ak
--- a/mail/mush/patches/patch-ak        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/patches/patch-ak        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 1998/10/25 17:10:57 christos Exp $
+$NetBSD: patch-ak,v 1.2 2006/01/08 17:04:58 joerg Exp $
 *** old/folders.c      Sun Oct 25 11:59:14 1998
 --- folders.c  Sun Oct 25 11:58:30 1998
 ***************
@@ -123,18 +123,6 @@
   %i   the message-id (may not be present)
   %n   name of the author
   %s   subject of the message
-*** old/mush.h Sun Oct 25 11:59:14 1998
---- mush.h     Sun Oct 25 11:58:29 1998
-***************
-*** 578,583 ****
---- 578,584 ----
-      long   m_offset; /* offset in tempfile of msg */
-      long   m_size;   /* number of bytes in msg */
-      int    m_lines;  /* number of lines in msg */
-+     int    m_headers;        /* number of header lines in msg */
-      char   *m_date_recv;/* Date user received msg (see dates.c for fmt) */
-      char   *m_date_sent;/* Date author sent msg (see dates.c for fmt) */
-      char   *m_to;    /* Cached To: field */
 *** old/pick.c Sun Oct 25 11:59:14 1998
 --- pick.c     Sun Oct 25 11:58:28 1998
 ***************
diff -r 207863a31815 -r 17112190a774 mail/mush/patches/patch-am
--- a/mail/mush/patches/patch-am        Sun Jan 08 16:53:21 2006 +0000
+++ b/mail/mush/patches/patch-am        Sun Jan 08 17:04:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1 2000/01/03 21:25:45 kim Exp $
+$NetBSD: patch-am,v 1.2 2006/01/08 17:04:58 joerg Exp $
 
 --- makefile.solaris.orig      Mon Jan  3 16:19:32 2000
 +++ makefile.solaris   Mon Jan  3 16:20:50 2000
@@ -19,10 +19,10 @@
 -LIBDIR= /usr/local/lib
 -MRCDIR= /usr/local/lib
 -MANDIR= /usr/local/man/man1
-+BINDIR= __PREFIX/bin
-+LIBDIR= __PREFIX/share/misc
-+MRCDIR= __PREFIX/share/misc
-+MANDIR= __PREFIX/man/man1
++BINDIR= @PREFIX@/bin
++LIBDIR= @PREFIX@/share/misc
++MRCDIR= @PREFIX@/share/misc
++MANDIR= @MANDIR@/man1
  MANEXT= 1
  
  install: mush
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/poppassd Fix errno.
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/dk-milter Use the FreeBSD configuration for Drago...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/poppassd Fix errno.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/dk-milter Use the FreeBSD configuration for Drago...
Indexes:
Home | Main Index | Thread Index | Old Index