? fvwm1.diff
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm1/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	7 Dec 2005 15:07:23 -0000	1.5
+++ distinfo	28 Apr 2011 15:24:25 -0000
@@ -3,8 +3,10 @@ $NetBSD: distinfo,v 1.5 2005/12/07 15:07
 SHA1 (fvwm-1.24r.tar.gz) = 89de9d7f0d9f63e9adffec7ac1f8be89ecbac9f4
 RMD160 (fvwm-1.24r.tar.gz) = b38dc3440f44cc9368c087adda7c129815921b13
 Size (fvwm-1.24r.tar.gz) = 325480 bytes
-SHA1 (patch-aa) = 839762e930c6f97356daf842e30a51189e76dc0c
+SHA1 (patch-aa) = 4e9c376f50260223a6005bdd4051866ccb5b8632
 SHA1 (patch-ab) = 755326fa2b7f25bb3990dc96982f8a2bfbf78da3
 SHA1 (patch-ac) = dd88301ae8b7f8abd0bb0c3fcfa40e69b44218ea
 SHA1 (patch-ad) = 258b376854f994a79eea8f42f38dcf6968a4f5fc
 SHA1 (patch-ae) = 2f893b61343890b8d82bf874f3314b05ce1b7dcd
+SHA1 (patch-af) = a810111ed8ea29d5c06c58c80f266d0870565902
+SHA1 (patch-ag) = 846f0b445c1e36968b615012dd69077dccd6cbcb
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm1/patches/patch-aa,v
retrieving revision 1.2
diff -u -p -r1.2 patch-aa
--- patches/patch-aa	14 Oct 2001 13:47:18 -0000	1.2
+++ patches/patch-aa	28 Apr 2011 15:24:25 -0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2001/10/14 13:47:18 tron Exp $
+$NetBSD$
 
---- configure.h~	Mon Nov 28 13:08:47 1994
-+++ configure.h	Mon Mar 16 21:44:31 1998
+--- configure.h.orig	1994-11-28 21:08:47.000000000 +0000
++++ configure.h
 @@ -1,7 +1,7 @@
 -#define FVWMDIR     "/usr/lib/X11/fvwm"
-+#define FVWMDIR     "${PREFIX}/lib/X11/fvwm"
++#define FVWMDIR     "/usr/pkg/lib/X11/fvwm"
  /* #define FVWMDIR        "/local/homes/dsp/nation/modules"*/
 -#define FVWM_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
 -#define FVWMRC         "/usr/lib/X11/fvwm/system.fvwmrc"
-+#define FVWM_ICONDIR   "${PREFIX}/include/X11/bitmaps:${PREFIX}/include/X11/pixmaps"
-+#define FVWMRC         "${PREFIX}/lib/X11/fvwm/system.fvwmrc"
++#define FVWM_ICONDIR   "/usr/pkg/lib/X11/fvwm/bitmaps:/usr/pkg/lib/X11/fvwm/pixmaps"
++#define FVWMRC         "/usr/pkg/lib/X11/fvwm/system.fvwmrc"
  
  /* Imake command needed to put modules in desired target location */
  /* Use the second version if it causes grief */
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2001/10/14 13:47
  #define XPM                      
  /*  linker flags needed to locate and link in the Xpm library, if you use it */
 -#define XPMLIBRARY -L/usr/lib/X11 -lXpm
-+#define XPMLIBRARY -L${X11BASE}/lib -L${PREFIX}/lib -lXpm
++#define XPMLIBRARY -L/usr/X11R7/lib -L/usr/pkg/lib -lXpm
  
  /***************************************************************************
   *#define M4
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-af	28 Apr 2011 15:24:25 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 /usr/X11R7/include/pixmaps/fvwm.xpm &
+ 	Module	"I"	GoodStuff
+ 	Exec	"I"	exec xterm -geometry 80x64+0+0 &
+ 	Wait	"I"	xterm
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ag	28 Apr 2011 15:24:25 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 /usr/X11R7/include/pixmaps/fvwm.xpm &
+ 	Module	"I"	GoodStuff
+ 	Module	"I"	FvwmPager 0 3
+ 	Exec	"I"	exec xterm -geometry 80x64+0+0 &