From 0892e6382003c7d2343cf8d2ecbe8f28665fcff8 Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Wed, 24 Feb 2010 12:37:04 +0000
Subject: Use the MAINTAINER from the Makefile as the source address for bug
 reports. Requested by Joerg Sonnenberger in a private mail.

---
 wm/fvwm-devel/Makefile         |  8 +++++++-
 wm/fvwm-devel/distinfo         |  3 ++-
 wm/fvwm-devel/patches/patch-ac | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 wm/fvwm-devel/patches/patch-ac

(limited to 'wm')

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 01a91252389..501c6bfe3ca 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2009/09/22 07:53:28 martti Exp $
+# $NetBSD: Makefile,v 1.32 2010/02/24 12:37:04 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -51,6 +51,12 @@ SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-ComExample
 SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-Setup95
 SUBST_SED.perl=		-e "s|${TOOLS_CMD.perl}|${PERL5}|"
 
+SUBST_CLASSES+=		mail
+SUBST_STAGE.mail=	post-patch
+SUBST_MESSAGE.mail=	Fixing mail address
+SUBST_FILES.mail+=	bin/fvwm-bug.in
+SUBST_SED.mail=		-e "s|@MAINTAINER@|${MAINTAINER}|"
+
 post-install:
 	cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \
 		`ls | grep -v Makefile` ${DESTDIR}${PREFIX}/share/examples/fvwm
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 92bbee28eac..53bd90784f5 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2009/09/22 07:53:28 martti Exp $
+$NetBSD: distinfo,v 1.19 2010/02/24 12:37:04 martti Exp $
 
 SHA1 (fvwm-2.5.28.tar.bz2) = 26b83b88656faa3d21ab55544269954e534abe08
 RMD160 (fvwm-2.5.28.tar.bz2) = 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1
 Size (fvwm-2.5.28.tar.bz2) = 2521994 bytes
 SHA1 (patch-aa) = ff40724d0a9ee6b3032ac9329cabf4cdf7d470a0
 SHA1 (patch-ab) = ebc58a6c58e6c09ce0c270c0a1d8d861f2dcdab1
+SHA1 (patch-ac) = 9741995ea491250406683c4b25d91c39ec3d9d58
diff --git a/wm/fvwm-devel/patches/patch-ac b/wm/fvwm-devel/patches/patch-ac
new file mode 100644
index 00000000000..3e667135108
--- /dev/null
+++ b/wm/fvwm-devel/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2010/02/24 12:37:04 martti Exp $
+
+Use the package maintainer as the source of this problem.
+
+--- bin/fvwm-bug.in.orig	2010-02-24 08:37:14.000000000 +0200
++++ bin/fvwm-bug.in	2010-02-24 08:38:08.000000000 +0200
+@@ -130,7 +130,7 @@
+ 
+ 
+ cat > $TEMP <<EOF
+-From: ${USER}
++From: @MAINTAINER@
+ To: ${BUGADDR}
+ Subject: [50 character or so descriptive subject here (for reference)]
+ 
-- 
cgit v1.2.3