Fix PR pkg/25779.

  - Correct permission of font files by using BSD_INSTALL_*.
  - Use symlinks instead of copying the same file with different names.

Bump PKGREVISION.

4 files changed, 31 insertions, 20 deletions

diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 140786856d0..3f00c702f22 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/06/10 15:31:47 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/06/17 20:56:56 minskim Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
index 49cff8bf1c7..6a3099c583c 100644
--- a/mail/metamail/distinfo
+++ b/mail/metamail/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2004/06/10 15:31:47 minskim Exp $
+$NetBSD: distinfo,v 1.12 2004/06/17 20:56:56 minskim Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 9b3f6a9378d8c1a2a2542a2163dfb96d61df6ce3
+SHA1 (patch-aa) = 59c59d9b00766d2825c29f7c91ba84a12648975e
 SHA1 (patch-ab) = d94e83bdd0c9a101f6a09c6ef4e5f8df7c74411d
 SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
-SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94
+SHA1 (patch-ad) = 1626e771d9432be087cd9b2ed87671c6ad96129b
 SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8
 SHA1 (patch-af) = 9ba42f1eef27d452debb9c1e0abc800f19deccac
 SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa
index d0e8e9c3f55..7df7792f319 100644
--- a/mail/metamail/patches/patch-aa
+++ b/mail/metamail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
+$NetBSD: patch-aa,v 1.8 2004/06/17 20:56:56 minskim Exp $
 
---- Makefile.orig	1994-01-26 12:32:33.000000000 -0500
-+++ Makefile	2004-06-06 15:13:31.000000000 -0400
-@@ -20,13 +20,13 @@
+--- Makefile.orig	1994-01-26 11:32:33.000000000 -0600
++++ Makefile
+@@ -20,13 +20,13 @@ RM = rm
  # RM = rm -f
  
  # How to run Make 
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma 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 @@
+@@ -38,7 +38,7 @@ FOOBAR-sun4=-Bstatic
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma 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 @@
+@@ -49,9 +49,12 @@ CFLAGS = -g -I.  ${$(STATICFLAG)} 
  # LDLIBS variable.
  #
  # For Sun and BSD systems, the following should work...
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma 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 @@
+@@ -72,10 +75,10 @@ CONFIGDIR = .
  #	install -s -c $(LOCALBINDIR) $$file
  #
  #INSTALL = cp
@@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
-@@ -91,14 +94,22 @@
+@@ -91,23 +94,27 @@ MAN4EXT = 4
  FONTSUFFIX=pcf
  
  # This is where the mailcap file should be put
@@ -81,7 +81,16 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
  	(cd metamail ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"  LDLIBS="${LDLIBS}")
  	-${RM} bin/metamail
  	(cd bin; ${LN} ../metamail/metamail metamail)
-@@ -117,7 +128,7 @@
+ 	-${RM} bin/mmencode
+ 	(cd bin; ${LN} ../metamail/mmencode mmencode)
+-	-${RM} bin/mimencode
+-	(cd bin; ${LN} ../metamail/mmencode mimencode)
+-	-${RM} man/mimencode.1
+-	(cd man; ${LN} ../man/mmencode.1 mimencode.1)
+ 	-${RM} bin/mailto
+ 	(cd bin; ${LN} ../metamail/mailto mailto)
+ 	-${RM} bin/splitmail
+@@ -117,7 +124,7 @@ basics::
  	(cd bin; ${LN} ../richmail/richtext richtext)
  	-${RM} bin/richtoatk
  	(cd bin; ${LN} ../richmail/richtoatk richtoatk)
@@ -90,7 +99,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
  	-${RM} bin/shownonascii
  	(cd bin; ${LN} ../fonts/shownonascii shownonascii)
  	-${RM} bin/mailto-hebrew
-@@ -125,30 +136,37 @@
+@@ -125,30 +132,39 @@ basics::
  
  install-all: basics 
  	@(cd bin; 				\
@@ -108,6 +117,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
 -	    ${INSTALL} $$file $$target; 	\
 +	    ${BSD_INSTALL_SCRIPT} $$file $$target; 	\
  	done)
++	${LN} -s mmencode ${LOCALBINDIR}/mimencode
  	@(cd man;				\
  	for file in *.1;			\
  	do 					\
@@ -116,6 +126,7 @@ $NetBSD: patch-aa,v 1.7 2004/06/06 19:33:11 jschauma Exp $
 -	    ${CP} $$file $$target; 		\
 +	    ${BSD_INSTALL_MAN} $$file $$target; 		\
  	done)
++	${LN} -s mmencode.1 ${MAN1DIR}/mimencode.1
  	@(cd man;				\
  	for file in *.4;			\
  	do 					\
diff --git a/mail/metamail/patches/patch-ad b/mail/metamail/patches/patch-ad
index e15473caacf..ce805d95696 100644
--- a/mail/metamail/patches/patch-ad
+++ b/mail/metamail/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2004/02/25 03:58:42 snj Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/17 20:56:56 minskim Exp $
 
---- fonts/Makefile.orig	1993-05-31 13:49:27.000000000 -0700
-+++ fonts/Makefile	2004-02-24 19:19:01.000000000 -0800
+--- fonts/Makefile.orig	1993-05-31 15:49:27.000000000 -0500
++++ fonts/Makefile
 @@ -28,12 +28,18 @@ heb8x13B.${FONTSUFFIX}: heb8x13B.bdf
  	-${DIRBUILDER}
  
@@ -18,8 +18,8 @@ $NetBSD: patch-ad,v 1.4 2004/02/25 03:58:42 snj Exp $
 +	${CHMOD} +x mailto-hebrew
 +
 +install:
-+	mkdir -p ${PREFIX}/lib/metamail/fonts
-+	${INSTALL} -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
++	${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/metamail/fonts
++	${BSD_INSTALL_DATA} heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
 +		heb8x13B.${FONTSUFFIX} fonts.alias ${PREFIX}/lib/metamail/fonts
 +	mkfontdir ${PREFIX}/lib/metamail/fonts