path: root/wm/wmctrl
diff options
authorjlam <jlam>2005-06-01 18:02:37 +0000
committerjlam <jlam>2005-06-01 18:02:37 +0000
commit29fa0e2cab49a44bdb3db5659f5ea1160658b71b (patch)
tree614ebca62dbe176d9c75cab1cfeef7c554a336c9 /wm/wmctrl
parent62a33c4243eead32430f7a6f4f87aef15625326f (diff)
Massive cleanup of and files in pkgsrc.
Several changes are involved since they are all interrelated. These changes affect about 1000 files. The first major change is rewriting as well as all of the files to follow the new example in The loop to include all of the files needed by the package is moved from and into is now included by each of the individual files and provides some common logic for all of the files. Currently, this includes the computation for whether the native or pkgsrc version of the package is preferred. This causes USE_BUILTIN.* to be correctly set when one file includes another. The second major change is teach the files to consider files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most of the files test for the presence of built-in software by checking for the existence of certain files, e.g. <pthread.h>, and we now assume that if that file is under ${LOCALBASE}, then it must be from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The exceptions to this new check are the X11 distribution packages, which are handled specially as noted below. The third major change is providing and files for each of the X11 distribution packages in pkgsrc. The file can detect whether the native X11 distribution is the same as the one provided by pkgsrc, and the file computes the version of the X11 distribution package, whether it's built-in or not. The fourth major change is that the files for X11 packages that install parts which are part of X11 distribution packages, e.g. Xpm, Xcursor, etc., now use imake to query the X11 distribution for whether the software is already provided by the X11 distribution. This is more accurate than grepping for a symbol name in the imake config files. Using imake required sprinkling various helper files into pkgsrc directories. These files are used as input to imake since imake can't use stdin for that purpose. The fifth major change is in how packages note that they use X11. Instead of setting USE_X11, package Makefiles should now include instead. This causes the X11 package buildlink3 and builtin logic to be executed at the correct place for and files that previously set USE_X11, and fixes packages that relied on files to implicitly note that X11 is needed. Package should also include when linking against the package libraries requires also linking against the X11 libraries. Where it was obvious, redundant inclusions of have been removed.
Diffstat (limited to 'wm/wmctrl')
1 files changed, 2 insertions, 2 deletions
diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile
index 5c4e32f0160..0bcc9c40742 100644
--- a/wm/wmctrl/Makefile
+++ b/wm/wmctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:26 jlam Exp $
DISTNAME= wmctrl-1.05
@@ -11,9 +11,9 @@ COMMENT= Command line interface to an EWMH-compliant WM
.include "../../devel/glib2/"
.include "../../devel/pkgconfig/"
+.include "../../mk/"
.include "../../mk/"