diff options
Diffstat (limited to 'wm')
37 files changed, 83 insertions, 83 deletions
diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index 0a00fd9bf67..1e3eaebea68 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/12/12 13:59:15 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -41,5 +41,5 @@ pre-configure: .include "../../audio/rplay/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index 977cd253848..5af8aec49a8 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:12 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:01 joerg Exp $ DISTNAME= bbrun-1.3 PKGREVISION= 4 @@ -21,7 +21,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun -.include "../../graphics/xpm/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile index fef3ff499a0..b731f2c02cd 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:12 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:01 joerg Exp $ # DISTNAME= ctwm-3.7 @@ -37,6 +37,6 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLEDIR} .endfor -.include "../../graphics/xpm/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/cwm/Makefile b/wm/cwm/Makefile index 4f77fc9974d..c0acf0841d6 100644 --- a/wm/cwm/Makefile +++ b/wm/cwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/06/11 13:05:11 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ # DISTNAME= cwm-3 @@ -13,5 +13,5 @@ COMMENT= Window manager for X11 initially inspired by evilwm GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 082a0c12926..7dfd59a36f8 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/02 18:20:43 obache Exp $ +# $NetBSD: Makefile,v 1.37 2006/12/15 20:33:01 joerg Exp $ DISTNAME= e16-0.16.8.4 PKGNAME= ${DISTNAME:S/e16/enlightenment/} @@ -48,6 +48,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" -.include "../../x11/Xrandr/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fluxbox/options.mk b/wm/fluxbox/options.mk index 8cf0631a741..6bb2f47b702 100644 --- a/wm/fluxbox/options.mk +++ b/wm/fluxbox/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/10/24 17:23:33 tonio Exp $ +# $NetBSD: options.mk,v 1.4 2006/12/15 20:33:01 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fluxbox PKG_SUPPORTED_OPTIONS= gnome kde imlib2 xft xrender @@ -27,14 +27,14 @@ CONFIGURE_ARGS+= --disable-imlib2 .if !empty(PKG_OPTIONS:Mxft) CONFIGURE_ARGS+= --enable-xft -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-xft .endif .if !empty(PKG_OPTIONS:Mxrender) CONFIGURE_ARGS+= --enable-xrender -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-xrender .endif diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 839f53d2dc7..83202e590ad 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/12/12 07:05:01 martti Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:02 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -36,7 +36,7 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 25ae5f75e09..9113e84c110 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/12/12 06:57:59 martti Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -77,5 +77,5 @@ CONFIGURE_ARGS+= --without-gtk-prefix .endif .include "../../devel/readline/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 2301b0e1320..4577c0c3c5e 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:54 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= golem-0.0.5 @@ -47,5 +47,5 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${EGDIR}/golemrc.default -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index b99a917dff9..59da5ffe828 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/10/04 19:38:05 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:02 joerg Exp $ COMMENT= Small, fast and light-weight window manager @@ -9,6 +9,6 @@ CONFIGURE_ARGS+= --with-imlib=no CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.xpm} .include "Makefile.common" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 38312e04386..a4c3bc778ed 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.56 2006/11/28 15:26:18 rillig Exp $ +# $NetBSD: Makefile.common,v 1.57 2006/12/15 20:33:02 joerg Exp $ DISTNAME= icewm-1.2.27 CATEGORIES= x11 wm @@ -64,5 +64,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR} .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" -.include "../../x11/Xrandr/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index aa4bfff6021..6671df3d046 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/09/01 15:43:10 abs Exp $ +# $NetBSD: Makefile,v 1.4 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= jwm-1.8rc1 @@ -32,7 +32,7 @@ CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc .include "options.mk" -.include "../../fonts/Xft2/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile index e1fdb0881f4..1f41e884b2c 100644 --- a/wm/matchbox-wm/Makefile +++ b/wm/matchbox-wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/10/16 10:55:50 obache Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= matchbox-window-manager-1.1 @@ -25,6 +25,6 @@ post-install: ${PREFIX}/share/examples/matchbox/ .include "../../devel/libmatchbox/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 28d1f00a0b3..ee24fe6ef0e 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2006/11/24 18:00:07 drochner Exp $ +# $NetBSD: Makefile,v 1.64 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= metacity-2.16.3 @@ -36,8 +36,8 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7 .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../x11/xcursor/buildlink3.mk" -.include "../../x11/Xcomposite/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" +.include "../../x11/libXcursor/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile index a51f6ee54f9..5863d2a4be5 100644 --- a/wm/mlvwm/Makefile +++ b/wm/mlvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= mlvwm091 @@ -31,5 +31,5 @@ SUBST_FILES.xpm= sample_rc/Mlvwmrc SUBST_SED.xpm= -e "s,@PREFIX@,${PREFIX}," SUBST_MESSAGE.xpm= Fixing configuration file. -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile index cd80598d5b4..0faac0f97f9 100644 --- a/wm/novawm/Makefile +++ b/wm/novawm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/05/11 19:52:03 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= NovaWM-0.8_alpha @@ -15,5 +15,5 @@ GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_TOOLS+= gmake -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile index cf564774bbd..69ea69b61f9 100644 --- a/wm/olvwm/Makefile +++ b/wm/olvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:14 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= olvwm4.src4 @@ -16,6 +16,6 @@ DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients WRKSRC= ${WRKDIR} USE_IMAKE= yes -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xview-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 0df8d6660fe..01667b96cc9 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/09/10 10:23:25 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:02 joerg Exp $ DISTNAME= openbox-3.3.1 CATEGORIES= wm x11 @@ -30,8 +30,8 @@ CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" # disabled by default in 3.3 because "it doesn't seem to work well" #.include "../../x11/startup-notification/buildlink3.mk" diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk index 3035fd0e251..478fbd7f604 100644 --- a/wm/openbox/buildlink3.mk +++ b/wm/openbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/12/15 20:33:02 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+ @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile index eb623411e74..06e18372537 100644 --- a/wm/openbox2/Makefile +++ b/wm/openbox2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/05/11 19:43:02 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= openbox-2.2.3 @@ -18,6 +18,6 @@ GNU_CONFIGURE= YES CPPFLAGS+= -DHAVE_STRFTIME=1 -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile index cb7cbaf168f..a6a8d169d3d 100644 --- a/wm/oroborox/Makefile +++ b/wm/oroborox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:50 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= OroboROX-0.9.8 @@ -80,9 +80,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR:Q}/oroborox ${PREFIX:Q}/bin .include "../../devel/libgetopt/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile index f6be3a51362..d6b8fa21eec 100644 --- a/wm/oroborus/Makefile +++ b/wm/oroborus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= oroborus_2.0.12-1 @@ -14,5 +14,5 @@ COMMENT= Small and simple window manager for X WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index a18364bee87..6bce4c6553b 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/10/14 08:24:24 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= pekwm-0.1.5 @@ -33,9 +33,9 @@ CONF_FILES= CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile index 734828d882d..f3c932af369 100644 --- a/wm/piewm/Makefile +++ b/wm/piewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:02 joerg Exp $ DISTNAME= piewm-1.02 PKGREVISION= 2 @@ -11,6 +11,6 @@ COMMENT= Minimalist window manager based on tvtwm with pie menus USE_IMAKE= yes -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile index 39a82402a0b..b058e997057 100644 --- a/wm/qvwm/Makefile +++ b/wm/qvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/07/22 04:46:19 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= qvwm-1.1.12 @@ -22,5 +22,5 @@ post-install: .include "options.mk" .include "../../audio/esound/buildlink3.mk" .include "../../graphics/imlib/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile index 764c6797d88..0297460911e 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:50 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= skippy-0.5.0 @@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/examples/${PKGBASE} post-install: ${INSTALL_DATA} ${WRKSRC}/skippyrc-default ${EGDIR}/skippyrc -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile index 05342187574..197cb256b30 100644 --- a/wm/tvtwm/Makefile +++ b/wm/tvtwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $ DISTNAME= tvtwm.pl11 PKGNAME= tvtwm-11 @@ -12,5 +12,5 @@ COMMENT= Classic twm with virtual desktop support WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= YES -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/vtwm/Makefile b/wm/vtwm/Makefile index 873ee5e8ace..3a7fb220270 100644 --- a/wm/vtwm/Makefile +++ b/wm/vtwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:15 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= vtwm-5.4.7 @@ -12,7 +12,7 @@ COMMENT= TWM with virtual desktop, m4, sound and 3-D buttons USE_IMAKE= YES -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../audio/rplay/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile index 3b35c0160cd..7bd3f6b77d2 100644 --- a/wm/waimea/Makefile +++ b/wm/waimea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/10/04 22:02:29 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2006/12/15 20:33:02 joerg Exp $ # DISTNAME= waimea-0.4.0 @@ -35,7 +35,7 @@ REPLACE_PERL = \ data/scripts/procinfo.pl \ data/scripts/stylesdir.pl.in -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile index 9c9a692f644..4d2cb9e63f3 100644 --- a/wm/wampager/Makefile +++ b/wm/wampager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/10/14 08:24:25 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:03 joerg Exp $ # DISTNAME= wampager-0.9.1 @@ -23,5 +23,5 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wampager ${PREFIX}/bin -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile index 1b5906f9435..49647524596 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $ # DISTNAME= windowlab-1.33 @@ -24,5 +24,5 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR} -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index ad08b466971..175dbc212dd 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2006/10/04 17:46:01 reed Exp $ +# $NetBSD: Makefile,v 1.72 2006/12/15 20:33:03 joerg Exp $ DISTNAME= WindowMaker-0.92.0 PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} @@ -94,12 +94,12 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index f14f8107618..d7c24c774c3 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+ @@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb7 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .endif # WINDOWMAKER_BUILDLINK3_MK -.include "../../fonts/Xft2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile index 98c4098a26b..56dd39f08c1 100644 --- a/wm/wmi/Makefile +++ b/wm/wmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $ # DISTNAME= wmi-10 @@ -13,5 +13,5 @@ COMMENT= Minimalist, flexible and highly customizable window manager USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -.include "../../fonts/Xft2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index dfe21d8d3e6..e755b98e58a 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2006/12/15 20:33:03 joerg Exp $ DISTNAME= wmx-6 WMX_VERS= 6.0 @@ -30,4 +30,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile index 0488a199256..c1fe2fa206f 100644 --- a/wm/xfce4-wm/Makefile +++ b/wm/xfce4-wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:13 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/15 20:33:03 joerg Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -11,7 +11,7 @@ CATEGORIES= wm COMMENT= Xfce window manager .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk index c116f60a3fc..b8dd18bda65 100644 --- a/wm/xfce4-wm/buildlink3.mk +++ b/wm/xfce4-wm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:20 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:03 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+ @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm .endif # XFCE4_WM_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" |