pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Mechanically replace all includes of buildlink3.mk of ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/79d2c9110282
branches:  trunk
changeset: 522641:79d2c9110282
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 15 20:32:52 2006 +0000

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

 audio/dap/Makefile                      |   4 ++--
 audio/lmms/Makefile                     |   4 ++--
 audio/mixer.app/Makefile                |   4 ++--
 audio/wmmixer/Makefile                  |   4 ++--
 audio/wmmp3/Makefile                    |   4 ++--
 audio/wmsmixer/Makefile                 |   4 ++--
 audio/wmusic/Makefile                   |   4 ++--
 audio/xanalyser/Makefile                |   4 ++--
 audio/xmcd/Makefile                     |   4 ++--
 audio/xmradio/Makefile                  |   4 ++--
 audio/xwave/Makefile                    |   4 ++--
 cad/xchiplogo/Makefile                  |   4 ++--
 cad/xcircuit/Makefile                   |   4 ++--
 comms/xisp/Makefile                     |   4 ++--
 comms/xtel/Makefile                     |   4 ++--
 databases/xsqlmenu/Makefile             |   4 ++--
 devel/ddd/Makefile                      |   4 ++--
 devel/devIL/Makefile                    |   4 ++--
 devel/devIL/buildlink3.mk               |   4 ++--
 devel/libdockapp/Makefile               |   4 ++--
 devel/libdockapp/buildlink3.mk          |   4 ++--
 devel/libmatchbox/Makefile              |   6 +++---
 devel/libmatchbox/buildlink3.mk         |   6 +++---
 editors/cooledit/Makefile               |   4 ++--
 editors/elvis-x11/Makefile              |   6 +++---
 editors/emacs/Makefile                  |   4 ++--
 editors/ted/Makefile                    |   4 ++--
 editors/vim-gtk/Makefile                |   4 ++--
 editors/vim-motif/Makefile              |   4 ++--
 editors/vim-xaw/Makefile                |   4 ++--
 editors/xemacs/Makefile                 |   4 ++--
 editors/xvile/Makefile                  |   4 ++--
 emulators/tuxnes/Makefile               |   4 ++--
 emulators/vice/Makefile                 |   4 ++--
 emulators/xcopilot/Makefile             |   4 ++--
 finance/xinvest/Makefile                |   4 ++--
 finance/xquote/Makefile                 |   4 ++--
 fonts/Xft2/Makefile                     |   4 ++--
 fonts/Xft2/buildlink3.mk                |   4 ++--
 games/freeciv-client/Makefile           |   4 ++--
 games/freesci/Makefile                  |   4 ++--
 games/maelstrom-x11/Makefile            |   4 ++--
 games/nethack-qt/Makefile               |   4 ++--
 games/nethack-x11/Makefile              |   4 ++--
 games/nighthawk/Makefile                |   4 ++--
 games/tanked/Makefile                   |   4 ++--
 games/xarchon/Makefile                  |   4 ++--
 games/xbill/Makefile                    |   4 ++--
 games/xboard/Makefile                   |   4 ++--
 games/xboing/Makefile                   |   4 ++--
 games/xbreaky/Makefile                  |   4 ++--
 games/xdemineur/Makefile                |   4 ++--
 games/xevil/Makefile                    |   4 ++--
 games/xgalaga/Makefile                  |   4 ++--
 games/xgospel/Makefile                  |   4 ++--
 games/xjump/Makefile                    |   4 ++--
 games/xnibbles/Makefile                 |   4 ++--
 games/xpat2/Makefile                    |   4 ++--
 games/xpuyopuyo/Makefile                |   4 ++--
 games/xscorch/Makefile                  |   4 ++--
 games/xscrabble/Makefile                |   4 ++--
 games/xsoldier/Makefile                 |   4 ++--
 games/xtux/Makefile                     |   4 ++--
 games/zoom/Makefile                     |   4 ++--
 geography/mapserver/Makefile            |   4 ++--
 graphics/camlimages/Makefile            |   4 ++--
 graphics/fly/Makefile                   |   4 ++--
 graphics/gimp/Makefile                  |   4 ++--
 graphics/gimp1-base/buildlink3.mk       |   4 ++--
 graphics/gimp1-base/options.mk          |   4 ++--
 graphics/gthumb/Makefile                |   6 +++---
 graphics/libgdiplus/Makefile            |   6 +++---
 graphics/libgdiplus/buildlink3.mk       |   6 +++---
 graphics/pixmap/Makefile                |   4 ++--
 graphics/wmphoto/Makefile               |   4 ++--
 graphics/xart/Makefile                  |   4 ++--
 graphics/xbmbrowser/Makefile            |   4 ++--
 graphics/xfig/Makefile                  |   4 ++--
 graphics/xpaint/Makefile                |   4 ++--
 inputmethod/fcitx/Makefile              |   4 ++--
 lang/pnetlib/Makefile                   |   4 ++--
 lang/swi-prolog-packages/Makefile       |   6 +++---
 mail/wmbiff/Makefile                    |   4 ++--
 mail/xfmail/Makefile                    |   4 ++--
 mail/xmailbox/Makefile                  |   4 ++--
 math/abs/Makefile                       |   4 ++--
 math/grace/Makefile                     |   4 ++--
 math/snns/Makefile                      |   4 ++--
 math/xldlas/Makefile                    |   4 ++--
 math/xmgr/Makefile                      |   4 ++--
 misc/root/Makefile                      |   4 ++--
 misc/siag/Makefile                      |   4 ++--
 misc/xtide/Makefile                     |   4 ++--
 multimedia/fxtv/Makefile                |   4 ++--
 multimedia/gnash/Makefile               |   4 ++--
 multimedia/gst-plugins0.8/Makefile      |   4 ++--
 multimedia/xawtv/Makefile               |   6 +++---
 multimedia/xine-ui/Makefile             |   6 +++---
 net/llnlxdir/Makefile                   |   4 ++--
 net/llnlxftp/Makefile                   |   4 ++--
 net/wmget/Makefile                      |   4 ++--
 net/wminet/Makefile                     |   4 ++--
 net/wmpload/Makefile                    |   4 ++--
 net/xmftp/Makefile                      |   4 ++--
 net/xrmftp/Makefile                     |   4 ++--
 news/knews/Makefile                     |   4 ++--
 parallel/sge/Makefile                   |   4 ++--
 pkgtools/x11-links/xfree.mk             |  12 ++++++------
 pkgtools/x11-links/xorg.mk              |  16 ++++++++--------
 print/advi/Makefile                     |   4 ++--
 print/cjk-lyx/Makefile                  |   4 ++--
 print/mgv/Makefile                      |   4 ++--
 print/transfig/Makefile                 |   4 ++--
 print/transfig/buildlink3.mk            |   4 ++--
 sysutils/asapm/Makefile                 |   4 ++--
 sysutils/idesk/Makefile                 |   4 ++--
 sysutils/wmSMPmon/Makefile              |   4 ++--
 sysutils/wmcpuload/Makefile             |   4 ++--
 sysutils/wmmemmon/Makefile              |   4 ++--
 sysutils/xbatt/Makefile                 |   4 ++--
 sysutils/xfm/Makefile                   |   4 ++--
 sysutils/xosview/Makefile               |   4 ++--
 time/asclock-xlib/Makefile              |   4 ++--
 time/asclock/Makefile                   |   4 ++--
 time/gnyaclock/Makefile                 |   4 ++--
 time/pclock/Makefile                    |   4 ++--
 time/wmcalclock/Makefile                |   4 ++--
 time/wmclockmon/Makefile                |   4 ++--
 time/wmmoonclock/Makefile               |   4 ++--
 time/wmtime/Makefile                    |   4 ++--
 time/xbeats/Makefile                    |   4 ++--
 wm/afterstep1/Makefile                  |   4 ++--
 wm/bbrun/Makefile                       |   4 ++--
 wm/ctwm/Makefile                        |   4 ++--
 wm/cwm/Makefile                         |   4 ++--
 wm/enlightenment/Makefile               |   4 ++--
 wm/fluxbox/options.mk                   |   6 +++---
 wm/fvwm-devel/Makefile                  |   6 +++---
 wm/fvwm/Makefile                        |   4 ++--
 wm/golem/Makefile                       |   4 ++--
 wm/icewm/Makefile                       |   4 ++--
 wm/icewm/Makefile.common                |   6 +++---
 wm/jwm/Makefile                         |   6 +++---
 wm/matchbox-wm/Makefile                 |   4 ++--
 wm/metacity/Makefile                    |   8 ++++----
 wm/mlvwm/Makefile                       |   4 ++--
 wm/novawm/Makefile                      |   4 ++--
 wm/olvwm/Makefile                       |   4 ++--
 wm/openbox/Makefile                     |   4 ++--
 wm/openbox/buildlink3.mk                |   4 ++--
 wm/openbox2/Makefile                    |   4 ++--
 wm/oroborox/Makefile                    |   4 ++--
 wm/oroborus/Makefile                    |   4 ++--
 wm/pekwm/Makefile                       |   6 +++---
 wm/piewm/Makefile                       |   4 ++--
 wm/qvwm/Makefile                        |   4 ++--
 wm/skippy/Makefile                      |   4 ++--
 wm/tvtwm/Makefile                       |   4 ++--
 wm/vtwm/Makefile                        |   4 ++--
 wm/waimea/Makefile                      |   4 ++--
 wm/wampager/Makefile                    |   4 ++--
 wm/windowlab/Makefile                   |   4 ++--
 wm/windowmaker/Makefile                 |   6 +++---
 wm/windowmaker/buildlink3.mk            |   6 +++---
 wm/wmi/Makefile                         |   4 ++--
 wm/wmx/Makefile.common                  |   4 ++--
 wm/xfce4-wm/Makefile                    |   4 ++--
 wm/xfce4-wm/buildlink3.mk               |   4 ++--
 www/firefox/Makefile.common             |   4 ++--
 www/htmldoc-x11/Makefile                |   4 ++--
 www/seamonkey/Makefile.common           |   6 +++---
 x11/Xaw-Xpm/Makefile                    |   4 ++--
 x11/Xaw-Xpm/buildlink3.mk               |   4 ++--
 x11/Xaw3d/Makefile                      |   4 ++--
 x11/Xcomposite/Makefile                 |   4 ++--
 x11/Xcomposite/buildlink3.mk            |   4 ++--
 x11/XmHTML/Makefile                     |   4 ++--
 x11/XmHTML/buildlink3.mk                |   4 ++--
 x11/Xrandr-mixedcase/Makefile           |   4 ++--
 x11/Xrandr-mixedcase/buildlink3.mk      |   4 ++--
 x11/aterm/Makefile                      |   4 ++--
 x11/dfm/Makefile.common                 |   4 ++--
 x11/efltk/Makefile                      |   4 ++--
 x11/efltk/buildlink3.mk                 |   4 ++--
 x11/fbdesk/Makefile                     |   4 ++--
 x11/fspanel/Makefile                    |   6 +++---
 x11/fvwm-wharf/Makefile                 |   4 ++--
 x11/gdkxft/Makefile                     |   4 ++--
 x11/gnome-libs/Makefile                 |   4 ++--
 x11/gnome-libs/buildlink3.mk            |   4 ++--
 x11/gnome2-control-center/Makefile      |   6 +++---
 x11/gnome2-control-center/buildlink3.mk |   4 ++--
 x11/gnome2-terminal/Makefile            |   4 ++--
 x11/gnustep-back/Makefile               |   4 ++--
 x11/gnustep-back/buildlink3.mk          |   4 ++--
 x11/kdebase3/Makefile                   |   6 +++---
 x11/kdebase3/buildlink3.mk              |   6 +++---
 x11/kterm/Makefile                      |   4 ++--
 x11/lesstif/Makefile                    |   4 ++--
 x11/lesstif/buildlink3.mk               |   4 ++--
 x11/matchbox-panel/Makefile             |   4 ++--
 x11/mowitz/Makefile                     |   4 ++--
 x11/mowitz/buildlink3.mk                |   4 ++--
 x11/mrxvt/Makefile                      |   6 +++---
 x11/multi-aterm/Makefile                |   4 ++--
 x11/qt2-libs/Makefile                   |   4 ++--
 x11/qt2-libs/buildlink3.mk              |   4 ++--
 x11/qt3-libs/Makefile                   |   8 ++++----
 x11/qt3-libs/buildlink3.mk              |   8 ++++----
 x11/qt4-libs/Makefile                   |   8 ++++----
 x11/qt4-libs/buildlink3.mk              |   8 ++++----
 x11/rxvt-unicode/Makefile               |   4 ++--
 x11/rxvt-unicode/options.mk             |   4 ++--
 x11/rxvt/Makefile                       |   4 ++--
 x11/speyes/Makefile                     |   4 ++--
 x11/vte/Makefile                        |   4 ++--
 x11/wmavgload/Makefile                  |   4 ++--
 x11/wmfire/Makefile                     |   4 ++--
 x11/wmfstatus/Makefile                  |   4 ++--
 x11/wmweather/Makefile                  |   4 ++--
 x11/xbanner/Makefile                    |   4 ++--
 x11/xcompmgr/Makefile                   |   6 +++---
 x11/xcursor/Makefile                    |   6 +++---
 x11/xcursor/buildlink3.mk               |   8 +++-----
 x11/xcursorgen/Makefile                 |   4 ++--
 x11/xfce3/Makefile                      |   4 ++--
 x11/xforms/Makefile                     |   4 ++--
 x11/xforms/buildlink3.mk                |   4 ++--
 x11/xkbd/Makefile                       |   4 ++--
 x11/xlupe/Makefile                      |   4 ++--
 x11/xorg-clients/Makefile               |   8 ++++----
 x11/xorg-server/Makefile                |   4 ++--
 x11/xpenguins/Makefile                  |   4 ++--
 x11/xpmroot/Makefile                    |   4 ++--
 x11/xscreensaver/Makefile.common        |   4 ++--
 x11/xsnow/Makefile                      |   4 ++--
 x11/xteddy/Makefile                     |   4 ++--
 x11/xterm/options.mk                    |   4 ++--
 238 files changed, 523 insertions(+), 525 deletions(-)

diffs (truncated from 4326 to 300 lines):

diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/dap/Makefile
--- a/audio/dap/Makefile        Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/dap/Makefile        Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:32:52 joerg Exp $
 
 DISTNAME=              dap-2.1.2
 PKGREVISION=           6
@@ -24,7 +24,7 @@
                ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/lmms/Makefile
--- a/audio/lmms/Makefile       Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/lmms/Makefile       Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/08/22 14:29:07 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:52 joerg Exp $
 #
 
 DISTNAME=              lmms-0.2.0
@@ -29,7 +29,7 @@
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/mixer.app/Makefile
--- a/audio/mixer.app/Makefile  Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/mixer.app/Makefile  Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      Mixer.app-1.8.0
@@ -25,6 +25,6 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/wmmixer/Makefile
--- a/audio/wmmixer/Makefile    Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/wmmixer/Makefile    Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/14 15:22:08 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      wmmixer-1.0-beta1
@@ -22,6 +22,6 @@
 pre-build:
        ${TOUCH} ${WRKSRC}/wmmixer.man
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/wmmp3/Makefile
--- a/audio/wmmp3/Makefile      Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/wmmp3/Makefile      Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/14 07:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=      wmmp3-0.12
 PKGREVISION=   2
@@ -22,5 +22,5 @@
        @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
        ${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/wmsmixer/Makefile
--- a/audio/wmsmixer/Makefile   Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/wmsmixer/Makefile   Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      wmsmixer-0.5.1
@@ -27,6 +27,6 @@
        ${INSTALL_DATA} ${WRKSRC}/README.wmmixer \
                ${PREFIX}/share/doc/wmsmixer/README.wmsmixer
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/wmusic/Makefile
--- a/audio/wmusic/Makefile     Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/wmusic/Makefile     Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=      wmusic-1.5.0
 PKGREVISION=   2
@@ -21,5 +21,5 @@
        ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic
 
 .include "../../audio/xmms/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/xanalyser/Makefile
--- a/audio/xanalyser/Makefile  Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/xanalyser/Makefile  Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/22 04:46:14 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      xanalyser-1.24
@@ -14,7 +14,7 @@
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/xmcd/Makefile
--- a/audio/xmcd/Makefile       Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/xmcd/Makefile       Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=      xmcd-3.0.2
 PKGREVISION=    9
@@ -61,7 +61,7 @@
 .if ${OPSYS} != "SunOS"
 .include "../../devel/ncurses/buildlink3.mk"
 .endif
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/xmradio/Makefile
--- a/audio/xmradio/Makefile    Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/xmradio/Makefile    Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=      xmradio-1.2
 PKGREVISION=   3
@@ -21,7 +21,7 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmradio
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 audio/xwave/Makefile
--- a/audio/xwave/Makefile      Fri Dec 15 20:23:52 2006 +0000
+++ b/audio/xwave/Makefile      Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=              xwave2
@@ -24,7 +24,7 @@
                        ${WRKSRC}/INSTALL \
                        ${PREFIX}/share/doc/xwave2
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 cad/xchiplogo/Makefile
--- a/cad/xchiplogo/Makefile    Fri Dec 15 20:23:52 2006 +0000
+++ b/cad/xchiplogo/Makefile    Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      xchiplogo
@@ -17,7 +17,7 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${PREFIX}/bin/xchiplogo
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 cad/xcircuit/Makefile
--- a/cad/xcircuit/Makefile     Fri Dec 15 20:23:52 2006 +0000
+++ b/cad/xcircuit/Makefile     Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/11/12 14:25:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=      xcircuit-3.4.26
 CATEGORIES=    cad graphics
@@ -41,7 +41,7 @@
        ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${PREFIX}/share/examples/xcircuit/
        ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${PREFIX}/share/examples/xcircuit/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 comms/xisp/Makefile
--- a/comms/xisp/Makefile       Fri Dec 15 20:23:52 2006 +0000
+++ b/comms/xisp/Makefile       Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/10/06 22:14:44 reed Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=              xisp-2.7p1
@@ -24,7 +24,7 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/
        ${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/xisp/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 comms/xtel/Makefile
--- a/comms/xtel/Makefile       Fri Dec 15 20:23:52 2006 +0000
+++ b/comms/xtel/Makefile       Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/28 17:38:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      xtel-3.3.0
@@ -17,6 +17,6 @@
 REQD_DIRS=     ${PREFIX}/lib/X11/fonts/xtel
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 databases/xsqlmenu/Makefile
--- a/databases/xsqlmenu/Makefile       Fri Dec 15 20:23:52 2006 +0000
+++ b/databases/xsqlmenu/Makefile       Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      xsqlmenu-2.10
@@ -24,7 +24,7 @@
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 devel/ddd/Makefile
--- a/devel/ddd/Makefile        Fri Dec 15 20:23:52 2006 +0000
+++ b/devel/ddd/Makefile        Fri Dec 15 20:32:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/09/04 08:56:09 martti Exp $
+# $NetBSD: Makefile,v 1.73 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=      ddd-3.3.11
@@ -48,6 +48,6 @@
        ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd-paper.ps
        ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd.ps
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5bb7eb48fc40 -r 79d2c9110282 devel/devIL/Makefile
--- a/devel/devIL/Makefile      Fri Dec 15 20:23:52 2006 +0000
+++ b/devel/devIL/Makefile      Fri Dec 15 20:32:52 2006 +0000



Home | Main Index | Thread Index | Old Index