Make this package build and install under IRIX:

- define SYSV to make it compile properly
- use BSD_INSTALL_* to install scripts and binaries with the proper
  permissions etc.

This should close PR pkg/25801.

3 files changed, 73 insertions, 21 deletions

diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
index 646a54bd22b..2da9d7e90dd 100644
--- a/mail/metamail/distinfo
+++ b/mail/metamail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2004/03/29 02:17:24 snj Exp $
+$NetBSD: distinfo,v 1.10 2004/06/06 19:33:11 jschauma Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 5b03f920e11554af5f776ff352c85c06e2f8f8de
-SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
+SHA1 (patch-aa) = 9b3f6a9378d8c1a2a2542a2163dfb96d61df6ce3
+SHA1 (patch-ab) = 30b6f86d1fc5fca179922734260b8034cb440d2f
 SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
 SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94
 SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8
diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa
index a9e7426e036..d0e8e9c3f55 100644
--- a/mail/metamail/patches/patch-aa
+++ b/mail/metamail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
 
 --- Makefile.orig	1994-01-26 12:32:33.000000000 -0500
-+++ Makefile
-@@ -20,13 +20,13 @@ RM = rm
++++ Makefile	2004-06-06 15:13:31.000000000 -0400
+@@ -20,13 +20,13 @@
  # RM = rm -f
  
  # How to run Make 
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  
  # You may also want to change the CFLAGS variable, which will be passed on 
  # to all subdirectories.    If you do that, the changes will only work right if you
-@@ -38,7 +38,7 @@ FOOBAR-sun4=-Bstatic
+@@ -38,7 +38,7 @@
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  # The following is better if you want to make sure you run with SYSV defined
  # CFLAGS = -g -I.  ${$(STATICFLAG)}  -DSYSV
  # Also, for SGI Irix, compile in K&R mode
-@@ -49,9 +49,12 @@ CFLAGS = -g -I.  ${$(STATICFLAG)} 
+@@ -49,9 +49,12 @@
  # LDLIBS variable.
  #
  # For Sun and BSD systems, the following should work...
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
  # LDLIBS = -lsun -lc_s
  # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
-@@ -72,10 +75,10 @@ CONFIGDIR = .
+@@ -72,10 +75,10 @@
  #	install -s -c $(LOCALBINDIR) $$file
  #
  #INSTALL = cp
@@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
-@@ -91,14 +94,14 @@ MAN4EXT = 4
+@@ -91,14 +94,22 @@
  FONTSUFFIX=pcf
  
  # This is where the mailcap file should be put
@@ -66,14 +66,22 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  SHELL=/bin/sh
  
 -install: basics
-+install: install-all
++BINARIES=	mailto metamail mimencode mmencode richtext richtoatk	\
++		splitmail
++SCRIPTS=	audiocompose audiosend extcompose getfilename mailserver \
++		mailto-hebrew metasend patch-metamail rcvAppleSingle 	\
++		showaudio showexternal shownonascii showpartial 	\
++		showpicture sndAppleSingle sun-audio-file sun-message.csh \
++		sun-to-mime sun2mime
  
 -basics::
++install: install-all
++
 +all basics::
  	(cd metamail ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"  LDLIBS="${LDLIBS}")
  	-${RM} bin/metamail
  	(cd bin; ${LN} ../metamail/metamail metamail)
-@@ -117,7 +120,7 @@ basics::
+@@ -117,7 +128,7 @@
  	(cd bin; ${LN} ../richmail/richtext richtext)
  	-${RM} bin/richtoatk
  	(cd bin; ${LN} ../richmail/richtoatk richtoatk)
@@ -82,10 +90,45 @@ $NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
  	-${RM} bin/shownonascii
  	(cd bin; ${LN} ../fonts/shownonascii shownonascii)
  	-${RM} bin/mailto-hebrew
-@@ -149,6 +152,7 @@ install-all: basics 
+@@ -125,30 +136,37 @@
+ 
+ install-all: basics 
+ 	@(cd bin; 				\
+-	for file in *; 				\
++	for file in $(BINARIES); 		\
++	do 					\
++	    target=$(LOCALBINDIR)/$$file; 	\
++	    echo "installing binary $$target";	\
++	    ${BSD_INSTALL_PROGRAM} $$file $$target; 	\
++	done;					\
++	for file in $(SCRIPTS); 		\
+ 	do 					\
+ 	    target=$(LOCALBINDIR)/$$file; 	\
+ 	    echo "installing binary $$target";	\
+-	    ${INSTALL} $$file $$target; 	\
++	    ${BSD_INSTALL_SCRIPT} $$file $$target; 	\
+ 	done)
+ 	@(cd man;				\
+ 	for file in *.1;			\
+ 	do 					\
+ 	    target=$(MAN1DIR)/`basename $$file .1`.$(MAN1EXT); \
+ 	    echo "installing man page $$target";\
+-	    ${CP} $$file $$target; 		\
++	    ${BSD_INSTALL_MAN} $$file $$target; 		\
+ 	done)
+ 	@(cd man;				\
+ 	for file in *.4;			\
+ 	do 					\
+ 	    target=$(MAN4DIR)/`basename $$file .4`.$(MAN4EXT); \
+ 	    echo "installing man page $$target";\
+-	    ${CP} $$file $$target; 		\
++	    ${BSD_INSTALL_MAN} $$file $$target; 		\
+ 	done)
+ 	@echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old
  	-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
  	@echo "installing file $(MAILCAPDIR)/mailcap"
- 	${CP} mailcap $(MAILCAPDIR)
+-	${CP} mailcap $(MAILCAPDIR)
++	${BSD_INSTALL_DATA} mailcap $(MAILCAPDIR)
 +	(cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install)
  
  uninstall-all:
diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab
index 9f2aef1fcdc..bdcae5d1f95 100644
--- a/mail/metamail/patches/patch-ab
+++ b/mail/metamail/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2004/06/06 19:33:11 jschauma Exp $
 
---- config.h.orig	1993-11-24 16:36:07.000000000 +0100
-+++ config.h
-@@ -65,6 +65,12 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+--- config.h.orig	1993-11-24 10:36:07.000000000 -0500
++++ config.h	2004-06-06 13:08:50.000000000 -0400
+@@ -40,7 +40,7 @@
+ #define SYSV /* Linux is SysV */
+ #endif
+ 
+-#ifdef SVR3
++#if defined(SVR3) || defined(__sgi)
+ #ifndef SYSV
+ /* Stupid SGI machines define SVR3 but not SYSV */
+ #define SYSV
+@@ -65,6 +65,12 @@
  #endif
  #endif
  
@@ -15,7 +24,7 @@ $NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
  /* NOTE:  The RESET_PROGRAM resets the terminal to a "normal" state 
     If you comment out the definition, all will be well except that metamail's
     -R switch won't work, and metamail-called programs might be more likely
-@@ -100,7 +106,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+@@ -100,7 +106,9 @@
  #endif
  
  #ifdef SYSV
@@ -25,7 +34,7 @@ $NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
  #define bcopy(a, b, c) memcpy(b, a, c)
  #define bzero(a, b) memset(a, 0, b)
  #define bcmp memcmp
-@@ -155,9 +163,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+@@ -155,9 +163,13 @@
  #ifdef NeXT
  #define sigtype void
  #else
@@ -39,7 +48,7 @@ $NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
  
  #ifdef MSDOS
  #define PATH_SEPARATOR ';'
-@@ -173,7 +185,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+@@ -173,7 +185,7 @@
  #else
  #define PATH_SEPARATOR ':'
  #ifndef STDPATH