Honor PKG_SYSCONFDIR. Bump PKGREVISION to 1.

5 files changed, 52 insertions, 23 deletions

diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 61ab1b3b0b3..c759ea0c833 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2002/09/23 21:01:43 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/23 13:39:25 jmmv Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
@@ -13,8 +14,15 @@ CONFLICTS+=	elm>=2.5.5 mm-2.7
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11=		YES
 
+CFLAGS+=	-DPKG_SYSCONFDIR='\\\"${PKG_SYSCONFDIR}\\\"'
+MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
+EGDIR=		${PREFIX}/share/examples/metamail
+CONF_FILES=	${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -24,4 +32,7 @@ CFLAGS=		-DSYSV
 post-patch:
 	${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
 
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/PLIST b/mail/metamail/PLIST
index 7cd08703ef8..42a334e01a7 100644
--- a/mail/metamail/PLIST
+++ b/mail/metamail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/23 13:39:26 jmmv Exp $
 bin/audiocompose
 bin/audiosend
 bin/extcompose
@@ -30,7 +30,6 @@ lib/metamail/fonts/heb8x13.pcf
 lib/metamail/fonts/heb8x13B.pcf
 lib/metamail/fonts/fonts.dir
 lib/metamail/fonts/fonts.alias
-etc/mailcap
 man/man1/audiocompose.1.gz
 man/man1/audiosend.1.gz
 man/man1/extcompose.1.gz
@@ -51,5 +50,7 @@ man/man1/showpartial.1.gz
 man/man1/showpicture.1.gz
 man/man1/splitmail.1.gz
 man/man4/mailcap.4.gz
+share/examples/metamail/mailcap
+@dirrm share/examples/metamail
 @dirrm lib/metamail/fonts
 @dirrm lib/metamail
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
index c3b959118c3..9306d3db808 100644
--- a/mail/metamail/distinfo
+++ b/mail/metamail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:09:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/03/23 13:39:26 jmmv Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 5820b01de913423b18ba0f69bc6e98cabc56b38f
-SHA1 (patch-ab) = 5179864d908c326c364e8c728821b0d3a9fda84a
+SHA1 (patch-aa) = a2854927d2bfde0b71fc4de6b19b54819c5bd6b6
+SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
 SHA1 (patch-ac) = c2e0c044df30c3cc33c7f3ff2c620cd29816e1d6
 SHA1 (patch-ad) = f722790d8e72f58a0b351715aec9407506b0443f
 SHA1 (patch-ae) = 1b8f88c25eb3b8e4a89e0c94b49f35ba0d809aa8
diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa
index 0606c7d7b92..acf5eabc900 100644
--- a/mail/metamail/patches/patch-aa
+++ b/mail/metamail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc Exp $
+$NetBSD: patch-aa,v 1.4 2003/03/23 13:39:26 jmmv Exp $
 
---- Makefile.orig	Wed Jan 26 17:32:33 1994
-+++ Makefile	Fri Sep  3 09:14:34 1999
-@@ -26,7 +26,7 @@
+--- Makefile.orig	1994-01-26 18:32:33.000000000 +0100
++++ Makefile
+@@ -26,7 +26,7 @@ MAKE = make
  CP = cp
  
  # How to compile C programs
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc 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}
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc 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...
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc 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
@@ -48,7 +48,13 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc Exp $
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
-@@ -96,9 +99,9 @@
+@@ -91,14 +94,14 @@ MAN4EXT = 4
+ FONTSUFFIX=pcf
+ 
+ # This is where the mailcap file should be put
+-MAILCAPDIR = ${INSTROOT}/etc
++MAILCAPDIR = ${INSTROOT}/share/examples/metamail
+ 
  # This helps with the "for" constructs below on some platforms:
  SHELL=/bin/sh
  
@@ -60,7 +66,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc Exp $
  	(cd metamail ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"  LDLIBS="${LDLIBS}")
  	-${RM} bin/metamail
  	(cd bin; ${LN} ../metamail/metamail metamail)
-@@ -117,7 +120,7 @@
+@@ -117,7 +120,7 @@ basics::
  	(cd bin; ${LN} ../richmail/richtext richtext)
  	-${RM} bin/richtoatk
  	(cd bin; ${LN} ../richmail/richtoatk richtoatk)
@@ -69,7 +75,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/03 08:19:14 agc Exp $
  	-${RM} bin/shownonascii
  	(cd bin; ${LN} ../fonts/shownonascii shownonascii)
  	-${RM} bin/mailto-hebrew
-@@ -149,6 +152,7 @@
+@@ -149,6 +152,7 @@ install-all: basics 
  	-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
  	@echo "installing file $(MAILCAPDIR)/mailcap"
  	${CP} mailcap $(MAILCAPDIR)
diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab
index f5e63200eb1..9f2aef1fcdc 100644
--- a/mail/metamail/patches/patch-ab
+++ b/mail/metamail/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1999/09/03 08:19:15 agc Exp $
+$NetBSD: patch-ab,v 1.5 2003/03/23 13:39:26 jmmv Exp $
 
---- config.h.orig	Wed Nov 24 15:36:07 1993
-+++ config.h	Fri Sep  3 09:07:12 1999
-@@ -65,6 +65,12 @@
+--- config.h.orig	1993-11-24 16:36:07.000000000 +0100
++++ config.h
+@@ -65,6 +65,12 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
  #endif
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.4 1999/09/03 08:19:15 agc 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 @@
+@@ -100,7 +106,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
  #endif
  
  #ifdef SYSV
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.4 1999/09/03 08:19:15 agc Exp $
  #define bcopy(a, b, c) memcpy(b, a, c)
  #define bzero(a, b) memset(a, 0, b)
  #define bcmp memcmp
-@@ -155,7 +163,11 @@
+@@ -155,9 +163,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
  #ifdef NeXT
  #define sigtype void
  #else
@@ -33,7 +33,18 @@ $NetBSD: patch-ab,v 1.4 1999/09/03 08:19:15 agc Exp $
 +#define sigtype void
 +#else
  #define sigtype int
-+#endif
  #endif
  #endif
++#endif
  
+ #ifdef MSDOS
+ #define PATH_SEPARATOR ';'
+@@ -173,7 +185,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+ #else
+ #define PATH_SEPARATOR ':'
+ #ifndef STDPATH
+-#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
++#define STDPATH "/.mailcap:" PKG_SYSCONFDIR "/mailcap"
+ #endif
+ #endif
+ #endif