pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc - fine grained X11 dependencies for packages which hav...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e846c96658a
branches:  trunk
changeset: 522846:9e846c96658a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 27 13:37:35 2006 +0000

description:
- 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:

 audio/bmp/Makefile.common             |   5 ++++-
 audio/mixer.app/Makefile              |   4 +++-
 audio/nas/Makefile                    |   6 +++++-
 audio/terminatorx/Makefile            |   3 ++-
 audio/wmmixer/Makefile                |   4 +++-
 audio/wmmp3/Makefile                  |   4 +++-
 audio/wmsmixer/Makefile               |   4 +++-
 audio/xcdplayer/Makefile              |   6 +++++-
 audio/xmix/Makefile                   |   4 +++-
 audio/xwave/Makefile                  |   3 ++-
 benchmarks/xengine/Makefile           |   4 +++-
 comms/xtel/Makefile                   |   7 +++++--
 devel/at-spi/Makefile                 |   3 ++-
 devel/at-spi/buildlink3.mk            |   3 ++-
 devel/libdockapp/Makefile             |   8 +++++++-
 devel/libmatchbox/Makefile            |   5 ++++-
 devel/libmatchbox/buildlink3.mk       |   4 +++-
 devel/xxgdb/Makefile                  |   4 +++-
 editors/cooledit/Makefile             |   3 ++-
 editors/sam/Makefile                  |   3 ++-
 editors/ted/Makefile                  |   6 +++---
 emulators/spim/Makefile               |   5 ++++-
 emulators/vice/Makefile               |   4 +++-
 emulators/x48/Makefile                |   4 +++-
 emulators/xcopilot/Makefile           |   5 ++++-
 games/cbzone/Makefile                 |   4 +++-
 games/crack-attack/Makefile           |   3 ++-
 games/jetpack/Makefile                |   4 +++-
 games/maelstrom-x11/Makefile          |   6 ++++--
 games/nethack-x11/Makefile            |   4 +++-
 games/spider/Makefile                 |   5 ++++-
 games/svb/Makefile                    |   3 ++-
 games/tanked/Makefile                 |   3 ++-
 games/xbat/Makefile                   |   4 +++-
 games/xbill/Makefile                  |   6 ++++--
 games/xboing/Makefile                 |   3 ++-
 games/xdemineur/Makefile              |   3 ++-
 games/xemeraldia/Makefile             |   5 ++++-
 games/xgalaga/Makefile                |   4 +++-
 games/xjewel/Makefile                 |   6 ++++--
 games/xjig/Makefile                   |   4 +++-
 games/xjump/Makefile                  |   4 +++-
 games/xkobo/Makefile                  |   4 +++-
 games/xmris/Makefile                  |   4 +++-
 games/xpat2/Makefile                  |   7 +++++--
 games/xpilot/Makefile                 |   4 +++-
 games/xpipeman/Makefile               |   4 +++-
 games/xscavenger/Makefile             |   4 +++-
 games/xscrabble/Makefile              |   4 +++-
 games/xskat/Makefile                  |   7 +++++--
 games/xvier/Makefile                  |   4 +++-
 games/zoom/Makefile                   |   7 ++++++-
 geography/xrmap-base/Makefile         |   6 +++++-
 geography/xrmap-base/distinfo         |   4 ++--
 geography/xrmap-base/patches/patch-aa |  20 +-------------------
 graphics/MesaDemos/Makefile           |   5 ++++-
 graphics/glut/buildlink3.mk           |   3 ++-
 graphics/gtkglext/Makefile            |   5 ++++-
 graphics/plotmtv/Makefile             |   4 +++-
 graphics/tgif/Makefile                |   4 +++-
 graphics/viewfax/Makefile             |   4 +++-
 graphics/wmphoto/Makefile             |   4 +++-
 graphics/xart/Makefile                |   5 ++++-
 graphics/xbmbrowser/Makefile          |   5 ++++-
 graphics/xgraph/Makefile              |   4 +++-
 graphics/xli/Makefile                 |   5 ++++-
 graphics/xpaint/Makefile              |   4 ++--
 graphics/xpm/Makefile                 |   5 ++++-
 graphics/xv/Makefile                  |   6 +++++-
 inputmethod/gcin/Makefile             |   3 ++-
 inputmethod/kinput2/Makefile          |   5 ++++-
 inputmethod/skkinput/Makefile         |   4 +++-
 lang/classpath-gui/Makefile           |   3 ++-
 lang/sablevm-classpath-gui/Makefile   |   6 +++++-
 lang/swi-prolog-packages/Makefile     |   4 +++-
 mail/xmailbox/Makefile                |   5 ++++-
 mail/xmailwatcher/Makefile            |   5 ++++-
 math/abs/Makefile                     |   4 +++-
 math/snns/Makefile                    |   4 +++-
 math/xlife/Makefile                   |   4 +++-
 misc/kdrill/Makefile                  |   4 +++-
 misc/root-tail/Makefile               |   4 +++-
 misc/xtide/Makefile                   |   4 +++-
 multimedia/mpeg_play/Makefile         |   4 +++-
 multimedia/xanim/Makefile             |   5 ++++-
 net/tightvncviewer/Makefile           |   5 ++++-
 net/vncviewer/Makefile                |   9 ++++++++-
 net/vncviewer/distinfo                |   4 +++-
 net/vncviewer/patches/patch-ab        |  16 ++++++++++++++++
 net/vncviewer/patches/patch-ac        |  16 ++++++++++++++++
 net/wmget/Makefile                    |   4 +++-
 net/wminet/Makefile                   |   4 +++-
 net/wmnet/Makefile                    |   4 +++-
 news/xrn/Makefile                     |   5 ++++-
 print/ja-ptex-bin/Makefile            |   4 +++-
 security/ssh-askpass/Makefile         |   3 ++-
 sysutils/asapm/Makefile               |   6 +++---
 sysutils/xdu/Makefile                 |   5 ++++-
 sysutils/xmeter/Makefile              |   5 ++++-
 time/asclock-xlib/Makefile            |   4 +++-
 time/asclock/Makefile                 |   4 +++-
 time/emiclock/Makefile                |   3 ++-
 time/gnyaclock/Makefile               |   5 ++++-
 time/lmclock/Makefile                 |   4 +++-
 time/pclock/Makefile                  |   4 +++-
 time/polclock/Makefile                |   3 ++-
 time/sunclock/Makefile                |   3 ++-
 time/swisswatch/Makefile              |   6 +++++-
 time/titrax/Makefile                  |   5 ++++-
 time/wmcalclock/Makefile              |   4 +++-
 time/wmmoonclock/Makefile             |   4 +++-
 time/xbeats/Makefile                  |   4 +++-
 time/xcal/Makefile                    |   5 ++++-
 time/xchrono/Makefile                 |   4 +++-
 time/xtimer/Makefile                  |   5 ++++-
 wm/9wm/Makefile                       |   5 ++++-
 wm/afterstep1/Makefile                |   6 +++++-
 wm/ctwm/Makefile                      |   5 ++++-
 wm/cwm/Makefile                       |   5 ++++-
 wm/enlightenment/Makefile             |   9 ++++++++-
 wm/fvwm-devel/Makefile                |   9 ++++++++-
 wm/fvwm/Makefile                      |   8 +++++++-
 wm/fvwm1/Makefile                     |   8 +++++++-
 wm/golem/Makefile                     |   8 +++++++-
 wm/icewm/Makefile                     |  10 ++++++++--
 wm/larswm/Makefile                    |   5 ++++-
 wm/lwm/Makefile                       |   5 ++++-
 wm/mlvwm/Makefile                     |   4 +++-
 wm/openbox/Makefile                   |   7 ++++++-
 wm/oroborus/Makefile                  |   9 ++++++++-
 wm/piewm/Makefile                     |   7 ++++++-
 wm/skippy/Makefile                    |   4 +++-
 wm/tvtwm/Makefile                     |   7 ++++++-
 wm/uwm/Makefile                       |   4 +++-
 wm/w9wm/Makefile                      |   4 +++-
 wm/windowlab/Makefile                 |   4 +++-
 wm/wmi/Makefile                       |   7 ++++++-
 wm/wmx/Makefile.common                |   7 ++++++-
 wm/wmx/distinfo                       |   3 ++-
 wm/wmx/patches/patch-ag               |  16 ++++++++++++++++
 www/chimera/Makefile                  |   5 ++++-
 www/firefox/Makefile.common           |   8 +++++++-
 x11/Xaw-Xpm/buildlink3.mk             |   6 +++---
 x11/Xaw3d/Makefile                    |   6 +++++-
 x11/Xrandr-mixedcase/Makefile         |   3 ++-
 x11/asnap/Makefile                    |   4 +++-
 x11/aterm/Makefile                    |  11 ++++++++---
 x11/fbdesk/Makefile                   |   9 ++++++++-
 x11/fvwm-wharf/Makefile               |   4 +++-
 x11/gnome-mag/Makefile                |   7 ++++++-
 x11/gtkterm2/Makefile                 |   3 ++-
 x11/hanterm/Makefile                  |   5 ++++-
 x11/kterm/Makefile                    |   3 ++-
 x11/lesstif/Makefile                  |   6 +++++-
 x11/libXpm/buildlink3.mk              |   4 +++-
 x11/mowitz/Makefile                   |   3 ++-
 x11/multi-aterm/Makefile              |   4 ++--
 x11/oneko/Makefile                    |   4 +++-
 x11/rxvt/Makefile                     |   7 ++++---
 x11/speyes/Makefile                   |   5 ++++-
 x11/unclutter/Makefile                |   4 +++-
 x11/vte/Makefile                      |   3 ++-
 x11/wmavgload/Makefile                |   4 +++-
 x11/wmfire/Makefile                   |   4 +++-
 x11/wmfstatus/Makefile                |   4 +++-
 x11/wmweather/Makefile                |   7 ++++++-
 x11/wterm/Makefile                    |   4 ++--
 x11/x2x/Makefile                      |   4 +++-
 x11/x3270/Makefile                    |   5 ++++-
 x11/xaniroc/Makefile                  |   5 ++++-
 x11/xautolock/Makefile                |   4 +++-
 x11/xcb/Makefile                      |   4 +++-
 x11/xclip/Makefile                    |   3 ++-
 x11/xcolors/Makefile                  |   5 ++++-
 x11/xcompmgr/Makefile                 |   3 ++-
 x11/xcruise/Makefile                  |   4 +++-
 x11/xcursorgen/Makefile               |   3 ++-
 x11/xearth/Makefile                   |   4 +++-
 x11/xfishtank/Makefile                |   4 +++-
 x11/xflame/Makefile                   |   4 +++-
 x11/xforms/Makefile                   |   3 ++-
 x11/xgas/Makefile                     |   4 +++-
 x11/xhangglider/Makefile              |   4 +++-
 x11/xkbd/Makefile                     |   7 ++++++-
 x11/xkeycaps/Makefile                 |   5 ++++-
 x11/xless/Makefile                    |   5 ++++-
 x11/xlockmore/Makefile.common         |   9 ++++++++-
 x11/xlogout/Makefile                  |   5 ++++-
 x11/xlupe/Makefile                    |   6 +++++-
 x11/xmascot/Makefile                  |   9 ++++-----
 x11/xmon/Makefile                     |   4 +++-
 x11/xmountains/Makefile               |   4 +++-
 x11/xmove/Makefile                    |   3 ++-
 x11/xp/Makefile                       |   5 ++++-
 x11/xpad/Makefile                     |   6 +++++-
 x11/xpaste/Makefile                   |   4 +++-
 x11/xpenguins/Makefile                |   7 ++++++-
 x11/xphoon/Makefile                   |   4 +++-
 x11/xplanet/Makefile                  |   6 +++++-
 x11/xpmroot/Makefile                  |   5 ++++-
 x11/xpostit/Makefile                  |   5 ++++-
 x11/xscribble/Makefile                |   6 +++++-
 x11/xscript/Makefile                  |   4 +++-
 x11/xsnow/Makefile                    |   5 ++++-
 x11/xteddy/Makefile                   |   5 ++++-
 x11/xtoolwait/Makefile                |   3 ++-
 x11/xview-clients/Makefile            |   4 +++-
 x11/xview-lib/Makefile                |   3 ++-
 x11/xview-lib/buildlink3.mk           |   4 +++-
 x11/xwatchwin/Makefile                |   4 +++-
 x11/xwit/Makefile                     |   4 +++-
 211 files changed, 805 insertions(+), 251 deletions(-)

diffs (truncated from 3791 to 300 lines):

diff -r 6d3bc478794f -r 9e846c96658a audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/bmp/Makefile.common Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2006/07/31 21:43:55 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.22 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=      bmp-0.9.7.1
@@ -85,6 +85,8 @@
 .  endif
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=    build
+
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -92,5 +94,6 @@
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/mixer.app/Makefile
--- a/audio/mixer.app/Makefile  Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/mixer.app/Makefile  Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=      Mixer.app-1.8.0
@@ -25,6 +25,8 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/nas/Makefile
--- a/audio/nas/Makefile        Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/nas/Makefile        Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/10/22 16:03:18 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=      nas-1.8.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -95,4 +95,8 @@
 pre-configure:
        cd ${WRKSRC}/config && ${SETENV} ${CONFIGURE_ENV} ./configure
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/terminatorx/Makefile
--- a/audio/terminatorx/Makefile        Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/terminatorx/Makefile        Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/11 14:34:17 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=      terminatorX-3.82
@@ -37,6 +37,7 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/wmmixer/Makefile
--- a/audio/wmmixer/Makefile    Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/wmmixer/Makefile    Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=      wmmixer-1.0-beta1
@@ -22,6 +22,8 @@
 pre-build:
        ${TOUCH} ${WRKSRC}/wmmixer.man
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/wmmp3/Makefile
--- a/audio/wmmp3/Makefile      Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/wmmp3/Makefile      Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=      wmmp3-0.12
 PKGREVISION=   2
@@ -22,5 +22,7 @@
        @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
        ${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/wmsmixer/Makefile
--- a/audio/wmsmixer/Makefile   Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/wmsmixer/Makefile   Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=      wmsmixer-0.5.1
@@ -27,6 +27,8 @@
        ${INSTALL_DATA} ${WRKSRC}/README.wmmixer \
                ${PREFIX}/share/doc/wmsmixer/README.wmsmixer
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/xcdplayer/Makefile
--- a/audio/xcdplayer/Makefile  Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/xcdplayer/Makefile  Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/12 14:51:39 darcy Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=       xcdplayer-2.2
 PKGREVISION=   3
@@ -19,4 +19,8 @@
        ${CP} ${FILESDIR}/cdrom_freebsd.h ${WRKSRC}
        ${CP} ${WRKSRC}/xcdplayer.1 ${WRKSRC}/xcdplayer.man
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/xmix/Makefile
--- a/audio/xmix/Makefile       Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/xmix/Makefile       Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=              xmix-2.1
 PKGREVISION=           2
@@ -22,5 +22,7 @@
 pre-install:
        ${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a audio/xwave/Makefile
--- a/audio/xwave/Makefile      Wed Dec 27 12:43:58 2006 +0000
+++ b/audio/xwave/Makefile      Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=              xwave2
@@ -24,6 +24,7 @@
                        ${WRKSRC}/INSTALL \
                        ${PREFIX}/share/doc/xwave2
 
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff -r 6d3bc478794f -r 9e846c96658a benchmarks/xengine/Makefile
--- a/benchmarks/xengine/Makefile       Wed Dec 27 12:43:58 2006 +0000
+++ b/benchmarks/xengine/Makefile       Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/03 00:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=      xengine-1.0.1
 PKGREVISION=   3
@@ -31,4 +31,6 @@
        @${ECHO} "   1067 RPMs with P100, Winner 2000PRO/X, resolution: 1152x900"
        @${ECHO} ""
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a comms/xtel/Makefile
--- a/comms/xtel/Makefile       Wed Dec 27 12:43:58 2006 +0000
+++ b/comms/xtel/Makefile       Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=      xtel-3.3.0
@@ -11,12 +11,15 @@
 COMMENT=       Minitel(r) emulator
 
 USE_IMAKE=     YES
-USE_TOOLS+=    mkfontdir
+USE_TOOLS+=    mkfontdir bdftopcf
 
 FONTS_DIRS.x11=        ${PREFIX}/lib/X11/fonts/xtel
 REQD_DIRS=     ${PREFIX}/lib/X11/fonts/xtel
 
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a devel/at-spi/Makefile
--- a/devel/at-spi/Makefile     Wed Dec 27 12:43:58 2006 +0000
+++ b/devel/at-spi/Makefile     Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/10/17 16:55:49 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=              at-spi-1.7.12
@@ -26,4 +26,5 @@
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a devel/at-spi/buildlink3.mk
--- a/devel/at-spi/buildlink3.mk        Wed Dec 27 12:43:58 2006 +0000
+++ b/devel/at-spi/buildlink3.mk        Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/12/27 13:37:36 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+
@@ -22,5 +22,6 @@
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 6d3bc478794f -r 9e846c96658a devel/libdockapp/Makefile
--- a/devel/libdockapp/Makefile Wed Dec 27 12:43:58 2006 +0000
+++ b/devel/libdockapp/Makefile Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=      libdockapp-0.4.0
@@ -18,5 +18,11 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
 
+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 -r 6d3bc478794f -r 9e846c96658a devel/libmatchbox/Makefile
--- a/devel/libmatchbox/Makefile        Wed Dec 27 12:43:58 2006 +0000
+++ b/devel/libmatchbox/Makefile        Wed Dec 27 13:37:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=      libmatchbox-1.9
@@ -14,7 +14,10 @@
 USE_TOOLS+=    pkg-config
 
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6d3bc478794f -r 9e846c96658a devel/libmatchbox/buildlink3.mk
--- a/devel/libmatchbox/buildlink3.mk   Wed Dec 27 12:43:58 2006 +0000
+++ b/devel/libmatchbox/buildlink3.mk   Wed Dec 27 13:37:35 2006 +0000



Home | Main Index | Thread Index | Old Index