diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /wm | |
parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/9wm/Makefile | 5 | ||||
-rw-r--r-- | wm/afterstep1/Makefile | 6 | ||||
-rw-r--r-- | wm/ctwm/Makefile | 5 | ||||
-rw-r--r-- | wm/cwm/Makefile | 5 | ||||
-rw-r--r-- | wm/enlightenment/Makefile | 9 | ||||
-rw-r--r-- | wm/fvwm-devel/Makefile | 9 | ||||
-rw-r--r-- | wm/fvwm/Makefile | 8 | ||||
-rw-r--r-- | wm/fvwm1/Makefile | 8 | ||||
-rw-r--r-- | wm/golem/Makefile | 8 | ||||
-rw-r--r-- | wm/icewm/Makefile | 10 | ||||
-rw-r--r-- | wm/larswm/Makefile | 5 | ||||
-rw-r--r-- | wm/lwm/Makefile | 5 | ||||
-rw-r--r-- | wm/mlvwm/Makefile | 4 | ||||
-rw-r--r-- | wm/openbox/Makefile | 7 | ||||
-rw-r--r-- | wm/oroborus/Makefile | 9 | ||||
-rw-r--r-- | wm/piewm/Makefile | 7 | ||||
-rw-r--r-- | wm/skippy/Makefile | 4 | ||||
-rw-r--r-- | wm/tvtwm/Makefile | 7 | ||||
-rw-r--r-- | wm/uwm/Makefile | 4 | ||||
-rw-r--r-- | wm/w9wm/Makefile | 4 | ||||
-rw-r--r-- | wm/windowlab/Makefile | 4 | ||||
-rw-r--r-- | wm/wmi/Makefile | 7 | ||||
-rw-r--r-- | wm/wmx/Makefile.common | 7 | ||||
-rw-r--r-- | wm/wmx/distinfo | 3 | ||||
-rw-r--r-- | wm/wmx/patches/patch-ag | 16 |
25 files changed, 141 insertions, 25 deletions
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile index a4e2e0cc1d6..2eaa56336ad 100644 --- a/wm/9wm/Makefile +++ b/wm/9wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:40 joerg Exp $ DISTNAME= 9wm-1.1 PKGREVISION= 2 @@ -13,4 +13,7 @@ COMMENT= 8 1/2-like Window Manager for X WRKSRC= ${WRKDIR} USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index 1e3eaebea68..acf510a1790 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:40 joerg Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -41,5 +41,9 @@ pre-configure: .include "../../audio/rplay/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile index b731f2c02cd..583699c930f 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:40 joerg Exp $ # DISTNAME= ctwm-3.7 @@ -38,5 +38,8 @@ pre-install: .endfor .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/cwm/Makefile b/wm/cwm/Makefile index c0acf0841d6..ea26dd6ac29 100644 --- a/wm/cwm/Makefile +++ b/wm/cwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= cwm-3 @@ -13,5 +13,8 @@ COMMENT= Window manager for X11 initially inspired by evilwm GNU_CONFIGURE= yes USE_TOOLS+= pkg-config +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 7dfd59a36f8..608bc24ba6f 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:41 joerg Exp $ DISTNAME= e16-0.16.8.4 PKGNAME= ${DISTNAME:S/e16/enlightenment/} @@ -48,6 +48,13 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 83202e590ad..4bd90b55bad 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -34,9 +34,16 @@ post-install: `${LS} | ${GREP} -v Makefile` \ ${PREFIX}/share/examples/fvwm +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 9113e84c110..5714edac8f6 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -76,6 +76,12 @@ CONFIGURE_ARGS+= --without-gtk-prefix .include "../../audio/rplay/buildlink3.mk" .endif +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/readline/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile index 254d30d62dc..70816a246b9 100644 --- a/wm/fvwm1/Makefile +++ b/wm/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-1.24r PKGNAME= ${DISTNAME:S/fvwm/fvwm1/} @@ -45,4 +45,10 @@ post-install: ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ ${PREFIX}/lib/X11/fvwm/bitmaps +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 4577c0c3c5e..fe96ba1350c 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= golem-0.0.5 @@ -47,5 +47,11 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${EGDIR}/golemrc.default +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 59da5ffe828..9b1eefb43d9 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:41 joerg Exp $ COMMENT= Small, fast and light-weight window manager @@ -6,9 +6,15 @@ CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* CONFIGURE_ARGS+= --with-gnome-menus=no CONFIGURE_ARGS+= --with-imlib=no -CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.xpm} +CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} .include "Makefile.common" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" + +BUILDLINK_DEPMETHOD.libXt?= build +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile index 8fdb4da10ab..fcc94e89bfa 100644 --- a/wm/larswm/Makefile +++ b/wm/larswm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= larswm-7.5.3 @@ -37,4 +37,7 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/sample.* ${EGDIR} +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/lwm/Makefile b/wm/lwm/Makefile index c8f46f2e5b7..6095dd6dcfc 100644 --- a/wm/lwm/Makefile +++ b/wm/lwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:14 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:41 joerg Exp $ DISTNAME= lwm-1.2.1 PKGREVISION= 1 @@ -11,4 +11,7 @@ COMMENT= Lightweight Window Manager USE_IMAKE= YES +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile index 5863d2a4be5..e906bde1920 100644 --- a/wm/mlvwm/Makefile +++ b/wm/mlvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= mlvwm091 @@ -31,5 +31,7 @@ SUBST_FILES.xpm= sample_rc/Mlvwmrc SUBST_SED.xpm= -e "s,@PREFIX@,${PREFIX}," SUBST_MESSAGE.xpm= Fixing configuration file. +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 01667b96cc9..6ce59c9a553 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/12/27 13:37:41 joerg Exp $ DISTNAME= openbox-3.3.1 CATEGORIES= wm x11 @@ -27,11 +27,16 @@ EGDIR= ${PREFIX}/share/examples/openbox CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/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/oroborus/Makefile b/wm/oroborus/Makefile index d6b8fa21eec..ee73d84c989 100644 --- a/wm/oroborus/Makefile +++ b/wm/oroborus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= oroborus_2.0.12-1 @@ -14,5 +14,12 @@ COMMENT= Small and simple window manager for X WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile index f3c932af369..6dcbeb9cc13 100644 --- a/wm/piewm/Makefile +++ b/wm/piewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:41 joerg Exp $ DISTNAME= piewm-1.02 PKGREVISION= 2 @@ -11,6 +11,11 @@ COMMENT= Minimalist window manager based on tvtwm with pie menus USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile index 0297460911e..9cdbc490222 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= skippy-0.5.0 @@ -21,4 +21,6 @@ post-install: .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile index 197cb256b30..c1c98549e88 100644 --- a/wm/tvtwm/Makefile +++ b/wm/tvtwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:41 joerg Exp $ DISTNAME= tvtwm.pl11 PKGNAME= tvtwm-11 @@ -12,5 +12,10 @@ COMMENT= Classic twm with virtual desktop support WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= YES +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile index 623d93396e1..b3ba812be60 100644 --- a/wm/uwm/Makefile +++ b/wm/uwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:41 joerg Exp $ DISTNAME= X.V11R3uwm PKGNAME= uwm-19881027 @@ -24,4 +24,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/uwm ${INSTALL_DATA} ${WRKSRC}/default.uwmrc ${PREFIX}/lib/X11/uwm/system.uwmrc +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/w9wm/Makefile b/wm/w9wm/Makefile index 812d42c1c98..2992534c516 100644 --- a/wm/w9wm/Makefile +++ b/wm/w9wm/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/27 13:37:41 joerg Exp $ DISTNAME= w9wm-0.4.2 PKGREVISION= 1 @@ -12,4 +12,6 @@ COMMENT= 8 1/2-like Window Manager for X with virtual desktops WRKSRC= ${WRKDIR}/${DISTNAME}.orig USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile index 49647524596..dd46d4db88e 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= windowlab-1.33 @@ -24,5 +24,7 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR} +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile index 56dd39f08c1..3cb3856401f 100644 --- a/wm/wmi/Makefile +++ b/wm/wmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= wmi-10 @@ -13,5 +13,10 @@ COMMENT= Minimalist, flexible and highly customizable window manager USE_LANGUAGES= c c++ GNU_CONFIGURE= yes +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index e755b98e58a..39e989631a2 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile.common,v 1.19 2006/12/27 13:37:42 joerg Exp $ DISTNAME= wmx-6 WMX_VERS= 6.0 @@ -30,4 +30,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" diff --git a/wm/wmx/distinfo b/wm/wmx/distinfo index 8386c80a6ff..a1bc8ada614 100644 --- a/wm/wmx/distinfo +++ b/wm/wmx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/12/06 16:25:26 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/12/27 13:37:42 joerg Exp $ SHA1 (wmx-6.tar.gz) = 89563c8c2af1d3ffbee06197928123fd03ae9c54 RMD160 (wmx-6.tar.gz) = 871c0de0ddd30ed90cc8f7eae287fa62177142c4 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 5921c882abd6769b2adf4fe26bb965982c9a5356 SHA1 (patch-ad) = b4b66989ecfe0dc535abae38ddbbc271200d0c19 SHA1 (patch-ae) = 20f155c556fd06d2cf721ab0620a0c5334b6ace4 SHA1 (patch-af) = 84faece4f23af6d51aa8a87a28da2f5056101113 +SHA1 (patch-ag) = 6b69f800da04ec83fcf40ae6b00ebacdfec193f8 diff --git a/wm/wmx/patches/patch-ag b/wm/wmx/patches/patch-ag new file mode 100644 index 00000000000..b88cfa021a6 --- /dev/null +++ b/wm/wmx/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1 2006/12/27 13:37:42 joerg Exp $ + +--- configure.orig 2000-05-17 10:53:13.000000000 +0000 ++++ configure +@@ -888,9 +888,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 890 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |