diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
| commit | 58c314423618d9e74407834dd613376be4ef0878 (patch) | |
| tree | 18da47edbf63f3b1426c1e8f88063303e6b0ef19 /www | |
| parent | 1a74f87f421f832d8d7f18cd95ae4c1f6a8b931f (diff) | |
| download | pkgsrc-58c314423618d9e74407834dd613376be4ef0878.tar.gz | |
Mechanically replace all includes of buildlink3.mk of the following
packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.
graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/Makefile.common | 4 | ||||
| -rw-r--r-- | www/htmldoc-x11/Makefile | 4 | ||||
| -rw-r--r-- | www/seamonkey/Makefile.common | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 2a2f0dc790d..e649b2318ba 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2006/11/03 07:53:05 joerg Exp $ +# $NetBSD: Makefile.common,v 1.12 2006/12/15 20:33:03 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -182,7 +182,7 @@ CONFIGURE_ARGS+= --with-pthreads .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h) CONFIGURE_ARGS+= --enable-xft # pkgconfig defaults to a "build" dependency, which is what we want. -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .endif # Fix for firefox* packages. diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index 77b5e1ddf09..85de9630557 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/17 14:52:12 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:03 joerg Exp $ # .include "../../www/htmldoc/Makefile.common" @@ -12,6 +12,6 @@ CONFLICTS= htmldoc-[0-9]* CONFIGURE_ARGS+= --with-gui --with-x .include "../../x11/fltk/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index 97b6c8be2bb..5841ac379d5 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2006/10/14 08:24:59 wiz Exp $ +# $NetBSD: Makefile.common,v 1.16 2006/12/15 20:33:03 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= seamonkey-${MOZ_DIST_VER}.source @@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk .endif @@ -190,7 +190,7 @@ CONFIGURE_ARGS+= --with-pthreads .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h) CONFIGURE_ARGS+= --enable-xft # pkgconfig defaults to a "build" dependency, which is what we want. -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .endif # Fix for firefox* packages. |