Subject: don't use xpkgwedge when X11BASE is LOCALBASE
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 10/04/2006 12:26:26
pkgtools/xpkgwedge has:
.if ${LOCALBASE} == ${X11BASE}
PKG_SKIP_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE"
.endif
Sometime between March and April I did:
diff -u -r1.36 bsd.pkg.use.mk
--- mk/bsd.pkg.use.mk 7 Jul 2006 14:29:41 -0000 1.36
+++ mk/bsd.pkg.use.mk 4 Oct 2006 17:15:45 -0000
@@ -102,6 +102,7 @@
!empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \
empty(USE_TOOLS:Mitools) && \
empty(PKGPATH:Mpkgtools/xpkgwedge) && \
- !empty(USE_XPKGWEDGE:M[yY][eE][sS])
+ !empty(USE_XPKGWEDGE:M[yY][eE][sS]) && \
+ ${LOCALBASE} != ${X11BASE}
BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD:U1.15}:../../pkgtools/xpkgwedge
.endif
May I commit this?