summaryrefslogtreecommitdiff
path: root/x11/rxvt
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
committerjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
commit63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /x11/rxvt
parent70004632b203c88d357d29ec8f217d1caa85f9c7 (diff)
downloadpkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'x11/rxvt')
-rw-r--r--x11/rxvt/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 950cf2ddb3e..19bf333b946 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/08/06 06:09:55 martin Exp $
+# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:30 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
#
@@ -40,7 +40,8 @@ CONFIGURE_ARGS+= --enable-utmp \
# enabling it, please fix pkg/MESSAGE as well.
# --enable-greek
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/X11
+CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include/X11
+CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib
post-patch:
${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig
@@ -53,4 +54,5 @@ pre-install:
fi
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"