[pkgsrc/trunk]: pkgsrc/wm/fvwm1 Do not hardcode pathes. Use ${X11BASE} instead.

[cegger <cegger%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e33b0451bfb7
branches:  trunk
changeset: 610553:e33b0451bfb7
user:      cegger <cegger%pkgsrc.org@localhost>
date:      Mon Oct 29 09:46:46 2012 +0000

description:
Do not hardcode pathes. Use ${X11BASE} instead.

diffstat:

 wm/fvwm1/Makefile         |  12 +++++++++---
 wm/fvwm1/distinfo         |   4 +++-
 wm/fvwm1/patches/patch-af |  13 +++++++++++++
 wm/fvwm1/patches/patch-ag |  13 +++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r 700dbf624cdd -r e33b0451bfb7 wm/fvwm1/Makefile
--- a/wm/fvwm1/Makefile Mon Oct 29 09:11:22 2012 +0000
+++ b/wm/fvwm1/Makefile Mon Oct 29 09:46:46 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/29 09:46:46 cegger Exp $
 
 DISTNAME=      fvwm-1.24r
 PKGNAME=       ${DISTNAME:S/fvwm/fvwm1/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 wm
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -35,7 +35,13 @@
        cd ${WRKSRC}; \
        ${MV} configure.h configure.h.old; \
        ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
-         -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h
+         -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h; \
+       ${MV} sample.fvwmrc/system.fvwmrc sample.fvwmrc/system.fvwmrc.old; \
+       ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
+         -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/system.fvwmrc.old >sample.fvwmrc/system.fvwmrc; \
+       ${MV} sample.fvwmrc/mwm.fvwmrc sample.fvwmrc/mwm.fvwmrc.old; \
+       ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
+         -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/mwm.fvwmrc.old >sample.fvwmrc/mvm.fvwmrc
 
 INSTALLATION_DIRS=     lib/X11/fvwm/pixmaps lib/X11/fvwm/bitmaps
 
diff -r 700dbf624cdd -r e33b0451bfb7 wm/fvwm1/distinfo
--- a/wm/fvwm1/distinfo Mon Oct 29 09:11:22 2012 +0000
+++ b/wm/fvwm1/distinfo Mon Oct 29 09:46:46 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/12/07 15:07:23 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/10/29 09:46:46 cegger Exp $
 
 SHA1 (fvwm-1.24r.tar.gz) = 89de9d7f0d9f63e9adffec7ac1f8be89ecbac9f4
 RMD160 (fvwm-1.24r.tar.gz) = b38dc3440f44cc9368c087adda7c129815921b13
@@ -8,3 +8,5 @@
 SHA1 (patch-ac) = dd88301ae8b7f8abd0bb0c3fcfa40e69b44218ea
 SHA1 (patch-ad) = 258b376854f994a79eea8f42f38dcf6968a4f5fc
 SHA1 (patch-ae) = 2f893b61343890b8d82bf874f3314b05ce1b7dcd
+SHA1 (patch-af) = 2ab46492368e715c8dd29fd0c525511a7e495b25
+SHA1 (patch-ag) = eeff553b4c57706ba74327aa26711bc955a0b479
diff -r 700dbf624cdd -r e33b0451bfb7 wm/fvwm1/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fvwm1/patches/patch-af Mon Oct 29 09:46:46 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2012/10/29 09:46:46 cegger Exp $
+
+--- sample.fvwmrc/system.fvwmrc.orig   1994-12-02 19:19:12.000000000 +0000
++++ sample.fvwmrc/system.fvwmrc
+@@ -227,7 +227,7 @@ ButtonStyle : 4 4 50x65@1 35x35@1 65x35@
+ 
+ Function "InitFunction"
+       Module  "I"     FvwmBanner
+-      Exec    "I"     xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
++      Exec    "I"     xpmroot ${X11BASE}/include/pixmaps/fvwm.xpm &
+       Module  "I"     GoodStuff
+       Exec    "I"     exec xterm -geometry 80x64+0+0 &
+       Wait    "I"     xterm
diff -r 700dbf624cdd -r e33b0451bfb7 wm/fvwm1/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fvwm1/patches/patch-ag Mon Oct 29 09:46:46 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2012/10/29 09:46:46 cegger Exp $
+
+--- sample.fvwmrc/mwm.fvwmrc.orig      1994-12-05 13:58:13.000000000 +0000
++++ sample.fvwmrc/mwm.fvwmrc
+@@ -161,7 +161,7 @@ Style "GoodStuff"  Icon toolbox.xpm
+ 
+ Function "InitFunction"
+       Module  "I"     FvwmBanner
+-      Exec    "I"     xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
++      Exec    "I"     xpmroot ${X11BASE}/include/pixmaps/fvwm.xpm &
+       Module  "I"     GoodStuff
+       Module  "I"     FvwmPager 0 3
+       Exec    "I"     exec xterm -geometry 80x64+0+0 &