5 files changed, 40 insertions, 39 deletions
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index bc7d18a29d5..8a835fd04b1 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/07/21 03:02:55 reed Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.funet.fi/pub/unix/mail/metamail/	\
 		ftp://ftp.research.telcordia.com/pub/nsb/
@@ -25,11 +25,7 @@ EGDIR=		${PREFIX}/share/examples/metamail
 CONF_FILES=	${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
 USE_TOOLS+=	bdftopcf
 
-FONTS_DIRS.x11+=	lib/metamail/fonts
-REQD_DIRS+=		lib/metamail
-REQD_DIRS+=		lib/metamail/fonts
-
-INSTALLATION_DIRS=	bin man/man1 man/man4
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4
 
 SUBST_CLASSES+=		awk sys
 SUBST_STAGE.awk=	post-patch
diff --git a/mail/metamail/PLIST b/mail/metamail/PLIST
index 799125c1557..723b6c39ff8 100644
--- a/mail/metamail/PLIST
+++ b/mail/metamail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/19 00:45:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/21 03:02:55 reed Exp $
 bin/audiocompose
 bin/audiosend
 bin/extcompose
@@ -25,9 +25,6 @@ bin/sun-audio-file
 bin/sun-message.csh
 bin/sun-to-mime
 bin/sun2mime
-lib/metamail/fonts/heb6x13.pcf
-lib/metamail/fonts/heb8x13.pcf
-lib/metamail/fonts/heb8x13B.pcf
 man/man1/audiocompose.1.gz
 man/man1/audiosend.1.gz
 man/man1/extcompose.1.gz
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
index 2d40e891a63..18df7b6dbbb 100644
--- a/mail/metamail/distinfo
+++ b/mail/metamail/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.18 2006/01/22 01:57:44 joerg Exp $
+$NetBSD: distinfo,v 1.19 2006/07/21 03:02:55 reed Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 RMD160 (mm2.7.tar.Z) = ae322cad0653140cbe7f0148ce48757df98c26b0
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = b07171e44d23c90e9c6a49ef71ac1f551665c2bc
+SHA1 (patch-aa) = 36383821d9fad0f088a8972cd108a8c107cba5b8
 SHA1 (patch-ab) = 15dd81405551f4d7d3c0e59cf49038857603a9eb
 SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
-SHA1 (patch-ad) = 1626e771d9432be087cd9b2ed87671c6ad96129b
+SHA1 (patch-ad) = f338190379a2efce559ed10cef017ad9bd114741
 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 719247ecf87..99a6a5a8554 100644
--- a/mail/metamail/patches/patch-aa
+++ b/mail/metamail/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
-
 --- Makefile.orig	1994-01-26 11:32:33.000000000 -0600
-+++ Makefile
-@@ -20,13 +20,13 @@ RM = rm
++++ Makefile	2006-07-20 21:48:56.000000000 -0500
+@@ -20,13 +20,13 @@
  # RM = rm -f
  
  # How to run Make 
@@ -18,7 +16,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed 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 +25,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed 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 +40,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed 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,18 +75,18 @@
  #	install -s -c $(LOCALBINDIR) $$file
  #
  #INSTALL = cp
@@ -55,7 +53,17 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
-@@ -91,23 +94,27 @@ MAN4EXT = 4
+ 
+ # This is where man pages should be copied, and their extensions
+-MAN1DIR = ${INSTROOT}/man/man1
++MAN1DIR = ${INSTROOT}/${PKGMANDIR}/man1
+ MAN1EXT = 1
+-MAN4DIR = ${INSTROOT}/man/man4
++MAN4DIR = ${INSTROOT}/${PKGMANDIR}/man4
+ MAN4EXT = 4
+ 
+ # Sets the font suffix your version of X uses - snf for X11R4, pcf for X11R5
+@@ -91,23 +94,27 @@
  FONTSUFFIX=pcf
  
  # This is where the mailcap file should be put
@@ -90,7 +98,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
  	-${RM} bin/mailto
  	(cd bin; ${LN} ../metamail/mailto mailto)
  	-${RM} bin/splitmail
-@@ -117,7 +124,7 @@ basics::
+@@ -117,7 +124,7 @@
  	(cd bin; ${LN} ../richmail/richtext richtext)
  	-${RM} bin/richtoatk
  	(cd bin; ${LN} ../richmail/richtoatk richtoatk)
@@ -99,7 +107,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
  	-${RM} bin/shownonascii
  	(cd bin; ${LN} ../fonts/shownonascii shownonascii)
  	-${RM} bin/mailto-hebrew
-@@ -125,30 +132,39 @@ basics::
+@@ -125,30 +132,38 @@
  
  install-all: basics 
  	@(cd bin; 				\
@@ -117,7 +125,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
 -	    ${INSTALL} $$file $$target; 	\
 +	    ${BSD_INSTALL_SCRIPT} $$file $$target; 	\
  	done)
-+	${LN} -s mmencode ${LOCALBINDIR}/mimencode
++	${RM} -f ${LOCALBINDIR}/mimencode ; ${LN} -s mmencode ${LOCALBINDIR}/mimencode
  	@(cd man;				\
  	for file in *.1;			\
  	do 					\
@@ -126,7 +134,7 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
 -	    ${CP} $$file $$target; 		\
 +	    ${BSD_INSTALL_MAN} $$file $$target; 		\
  	done)
-+	${LN} -s mmencode.1 ${MAN1DIR}/mimencode.1
++	${RM} -f ${MAN1DIR}/mimencode.1 ; ${LN} -s mmencode.1 ${MAN1DIR}/mimencode.1
  	@(cd man;				\
  	for file in *.4;			\
  	do 					\
@@ -140,7 +148,6 @@ $NetBSD: patch-aa,v 1.10 2005/09/02 19:29:56 reed Exp $
  	@echo "installing file $(MAILCAPDIR)/mailcap"
 -	${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:
  	@(cd bin; 				\
diff --git a/mail/metamail/patches/patch-ad b/mail/metamail/patches/patch-ad
index ce805d95696..11f74437ed1 100644
--- a/mail/metamail/patches/patch-ad
+++ b/mail/metamail/patches/patch-ad
@@ -1,27 +1,28 @@
-$NetBSD: patch-ad,v 1.5 2004/06/17 20:56:56 minskim Exp $
-
 --- fonts/Makefile.orig	1993-05-31 15:49:27.000000000 -0500
-+++ fonts/Makefile
-@@ -28,12 +28,18 @@ heb8x13B.${FONTSUFFIX}: heb8x13B.bdf
++++ fonts/Makefile	2006-07-20 21:39:41.000000000 -0500
+@@ -10,7 +10,7 @@
+ #FONTSUFFIX=fb
+ #DIRBUILDER=bldfamily
+ 
+-all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
++all: shownonascii mailto-hebrew
+ 
+ heb6x13.${FONTSUFFIX}: heb6x13.bdf
+ #	convertfont -o heb6x13 heb6x13.bdf
+@@ -28,12 +28,12 @@
  	-${DIRBUILDER}
  
  shownonascii: Xshownonascii
 -	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
 -	chmod +x shownonascii
-+	${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xshownonascii > shownonascii
++	${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/share/fonts@ < Xshownonascii > shownonascii
 +	${CHMOD} +x shownonascii
  
  mailto-hebrew: Xmailto-hebrew
 -	sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
 -	chmod +x mailto-hebrew
-+	${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xmailto-hebrew > mailto-hebrew
++	${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/share/fonts@ < Xmailto-hebrew > mailto-hebrew
 +	${CHMOD} +x mailto-hebrew
-+
-+install:
-+	${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
  
  clean:
  	rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir