diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /www | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-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 'www')
| -rw-r--r-- | www/Mosaic/Makefile | 4 | ||||
| -rw-r--r-- | www/ns-remote/Makefile | 4 | ||||
| -rw-r--r-- | www/ns-remote/files/Makefile | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 46efe472805..d8bd2d4f702 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/06/30 21:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2001/08/29 22:41:26 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_DIR} -CPPFLAGS+= -I${X11BASE}/include CPPFLAGS+= -Dunix post-configure: @@ -43,4 +42,5 @@ do-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../x11/lesstif12/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index d6a779e202c..a4990d73ffe 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/07/27 14:26:19 abs Exp $ +# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:27 jlam Exp $ DISTNAME= ns-remote PKGNAME= ns-remote-1.4 @@ -11,7 +11,6 @@ HOMEPAGE= http://home.netscape.com/newsref/std/x-remote.html COMMENT= remote-control Netscape Navigator and Communicator DIST_SUBDIR= netscape -USE_X11= yes USE_BUILDLINK_ONLY= yes @@ -32,4 +31,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ns-remote/files/Makefile b/www/ns-remote/files/Makefile index e985a1efdc7..a0ae7711872 100644 --- a/www/ns-remote/files/Makefile +++ b/www/ns-remote/files/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2000/01/13 05:12:16 simonb Exp $ +# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:27 jlam Exp $ # # Very simple Makefile used to compile Netscape's ns-remote program # PROG = ns-remote -X11BASE?= /usr/X11R6 all: ${PROG} ${PROG}: remote.c - ${CC} ${CFLAGS} -o ${PROG} remote.c -DSTANDALONE -I${X11BASE}/include \ + ${CC} ${CFLAGS} -o ${PROG} remote.c -DSTANDALONE \ ${LDFLAGS} -lXmu -lXt -lSM -lICE -lXext -lX11 clean: |