Date: Sat, 2 Dec 2006 22:46:14 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: karlj000@unbc.ca Subject: ports/106217: [PATCH] x11/wmmenu: Respect X11BASE Message-ID: <200612021446.kB2EkETa062149@svm.csie.ntu.edu.tw> Resent-Message-ID: <200612021450.kB2EoIjr035751@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106217
>Category: ports
>Synopsis: [PATCH] x11/wmmenu: Respect X11BASE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 02 14:50:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Respect X11BASE
Previous change does not work. One need to set XROOT = $(X11BASE)
- Use DOCSDIR
- No need to use 'install' target for LIB_DEPENDS
Port maintainer (karlj000@unbc.ca) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- wmmenu-1.2_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/x11/wmmenu/Makefile,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile
--- Makefile 7 Mar 2006 08:27:52 -0000 1.15
+++ Makefile 2 Dec 2006 14:44:54 -0000
@@ -14,7 +14,7 @@
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
Index: pkg-plist
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/x11/wmmenu/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist 12 Nov 2002 14:13:46 -0000 1.3
+++ pkg-plist 2 Dec 2006 14:44:54 -0000
@@ -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%%
Index: files/patch-Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/x11/wmmenu/files/patch-Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 patch-Makefile
--- files/patch-Makefile 30 Nov 2006 10:25:15 -0000 1.1
+++ files/patch-Makefile 2 Dec 2006 14:44:54 -0000
@@ -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
--- wmmenu-1.2_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612021446.kB2EkETa062149>