summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortv <tv>1998-07-31 15:00:41 +0000
committertv <tv>1998-07-31 15:00:41 +0000
commite991bc583a963b94081d3822e01864c6bd465eac (patch)
tree78b80ec3dd55095d5c02f0d0679cb1ba93553edf /x11
parentf206db9920a3519202d6485c6d32ddc04db8764c (diff)
downloadpkgsrc-e991bc583a963b94081d3822e01864c6bd465eac.tar.gz
Update to "0.4": new layout to coincide with USE_LOCALBASE_FOR_X11
changes.
Diffstat (limited to 'x11')
-rw-r--r--x11/xpkgwedge/Makefile19
1 files changed, 13 insertions, 6 deletions
diff --git a/x11/xpkgwedge/Makefile b/x11/xpkgwedge/Makefile
index cf2f0b4513a..123db3cbfea 100644
--- a/x11/xpkgwedge/Makefile
+++ b/x11/xpkgwedge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1998/07/14 10:56:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/07/31 15:00:41 tv Exp $
#
-DISTNAME= xpkgwedge-0.2
+DISTNAME= xpkgwedge-0.4
CATEGORIES= devel x11
DISTFILES= # none
@@ -13,11 +13,14 @@ NO_BUILD= yes
NO_WRKSUBDIR= yes
USE_IMAKE= yes
+# In order to force xpkgwedge to install into X11BASE, we forcibly set PREFIX
+# here. No other pkg should do this.
+PREFIX=${X11BASE}
+
pre-extract:
- @if [ x${LOCALBASE} = x${X11BASE} ]; then \
- ${ECHO} '$$LOCALBASE == $$X11BASE; this patch cannot be applied.'; \
- ${ECHO} 'During install, xpkgwedge requires $$X11BASE to point to the real X distribution.'; \
- ${ECHO} 'If you are setting this variable in mk.conf, remove the setting temporarily'; \
+ @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \
+ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \
+ ${ECHO} 'If you are setting this variable in mk.conf, fix or remove the setting'; \
${ECHO} 'and then install xpkgwedge.'; \
${FALSE}; \
fi
@@ -33,3 +36,7 @@ pre-clean:
@${RM} ${PKGDIR}/MESSAGE
.include "../../mk/bsd.pkg.mk"
+
+# Clear the build dependencies list so that xpkgwedge will not be recursively
+# dependent on itself.
+BUILD_DEPENDS=