[Midnightbsd-cvs] CVS Commit: x11-wm/windowmaker: The last approach did not work in

[laffer1 at midnightbsd.org]

Log Message:
-----------
The last approach did not work in CURRENT.  The GNUstep path ended up as /usr/local/GNUstep/Local/Local/Applications/WPrefs.app in CURRENT but /usr/local/GNUstep/Local/Applications/WPrefs.app in 0.1.  

This version uses @prefix which *may* work as expected in both CURRENT and 0.1.  Tested on 0.1 so far.

Modified Files:
--------------
    mports/x11-wm/windowmaker:
        Makefile (r1.6 -> r1.7)
    mports/x11-wm/windowmaker/files:
        patch-configure (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/windowmaker/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lx11-wm/windowmaker/Makefile -Lx11-wm/windowmaker/Makefile -u -r1.6 -r1.7
--- x11-wm/windowmaker/Makefile
+++ x11-wm/windowmaker/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.92.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://dougbarton.us/Downloads/
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/x11-wm/windowmaker/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-wm/windowmaker/files/patch-configure -Lx11-wm/windowmaker/files/patch-configure -u -r1.1 -r1.2
--- x11-wm/windowmaker/files/patch-configure
+++ x11-wm/windowmaker/files/patch-configure
@@ -5,7 +5,7 @@
      fi
  
 -    wprefs_base_dir=$gnustepdir/Applications
-+    wprefs_base_dir=$gnustepdir/Local/Applications
++    wprefs_base_dir=${prefix}/GNUstep/Local/Applications
      wprefs_datadir=$wprefs_base_dir/WPrefs.app
      wprefs_bindir=$wprefs_base_dir/WPrefs.app
  fi