From 32f2cf697180c3a176b605c0e2a99a5117d06542 Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sat, 2 Dec 2006 18:46:33 +0000
Subject: - Respect X11BASE   Previous change does not work. One need to set
 XROOT = $(X11BASE) - Use DOCSDIR - No need to use 'install' target for
 LIB_DEPENDS

PR:		ports/106217
Submitted by:	rafan
Approved by:	Jeremy Karlson <karlj000 at unbc.ca> (maintainer)
---
 x11/wmmenu/Makefile             |  2 +-
 x11/wmmenu/files/patch-Makefile | 22 ++++++++++++++++------
 x11/wmmenu/pkg-plist            |  8 ++++----
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'x11')

diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 1570dc44f12b..3bdd02519f4e 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 MAINTAINER=	karlj000@unbc.ca
 COMMENT=	A popup menu of icons that launch programs for the WindowMaker dock
 
-LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp:install
+LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
diff --git a/x11/wmmenu/files/patch-Makefile b/x11/wmmenu/files/patch-Makefile
index c4905185ae82..f73cdcbc762e 100644
--- a/x11/wmmenu/files/patch-Makefile
+++ b/x11/wmmenu/files/patch-Makefile
@@ -1,8 +1,18 @@
---- Makefile.orig	Mon Nov 27 22:50:17 2006
-+++ Makefile	Mon Nov 27 23:00:33 2006
-@@ -1,4 +1,4 @@
--prefix = /usr/local
-+prefix = $(PREFIX)
+--- Makefile.orig	Sat Dec  2 22:42:40 2006
++++ Makefile	Sat Dec  2 22:43:21 2006
+@@ -1,3 +1,4 @@
++PREFIX ?= /usr/local
+ prefix = $(PREFIX)
  BINDIR = $(prefix)/bin
  MANDIR = $(prefix)/man
- ETCDIR = $(prefix)/etc
+@@ -7,8 +8,8 @@
+ GDKPIXBUF = 1
+ #GDKPIXBUF2 = 1
+ 
+-XROOT = /usr/X11R6
+-DAROOT = /usr/local
++XROOT = $(X11BASE)
++DAROOT = $(LOCALBASE)
+ 
+ # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
+ ifdef GDKPIXBUF
diff --git a/x11/wmmenu/pkg-plist b/x11/wmmenu/pkg-plist
index 82cc55867e39..d9862995df78 100644
--- a/x11/wmmenu/pkg-plist
+++ b/x11/wmmenu/pkg-plist
@@ -1,5 +1,5 @@
 bin/wmmenu
-%%PORTDOCS%%share/doc/wmmenu/apps.sample
-%%PORTDOCS%%share/doc/wmmenu/defaults.sample
-%%PORTDOCS%%share/doc/wmmenu/README
-%%PORTDOCS%%@dirrm share/doc/wmmenu
+%%PORTDOCS%%%%DOCSDIR%%/apps.sample
+%%PORTDOCS%%%%DOCSDIR%%/defaults.sample
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3