diff options
author | joerg <joerg@pkgsrc.org> | 2007-01-13 16:50:12 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2007-01-13 16:50:12 +0000 |
commit | b5aa7f107e480ed30c5ec2bed17a71d813312478 (patch) | |
tree | 78809fbf83e16e82568574f9c655d343eda14000 | |
parent | 66a8ab6ab226ec89f2d9c34e9fd86fde31dceec8 (diff) | |
download | pkgsrc-b5aa7f107e480ed30c5ec2bed17a71d813312478.tar.gz |
Modular Xorg support.
-rw-r--r-- | audio/kid3/Makefile | 7 | ||||
-rw-r--r-- | chat/licq-gui-qt/Makefile | 7 | ||||
-rw-r--r-- | databases/kmysqladmin/Makefile | 8 | ||||
-rw-r--r-- | finance/kmymoney2/Makefile | 8 | ||||
-rw-r--r-- | games/knights/Makefile | 8 | ||||
-rw-r--r-- | graphics/kdegraphics3/Makefile | 3 | ||||
-rw-r--r-- | graphics/kphotools/Makefile | 7 | ||||
-rw-r--r-- | misc/kdeutils3/Makefile | 4 | ||||
-rw-r--r-- | multimedia/kmplayer/Makefile | 3 | ||||
-rw-r--r-- | net/kftpgrabber/Makefile | 8 | ||||
-rw-r--r-- | sysutils/k3b/Makefile | 7 | ||||
-rw-r--r-- | sysutils/krusader/Makefile | 7 | ||||
-rw-r--r-- | wm/metacity/Makefile | 6 | ||||
-rw-r--r-- | wm/obconf/Makefile | 4 | ||||
-rw-r--r-- | wm/oroborox/Makefile | 3 | ||||
-rw-r--r-- | x11/xmms-osd/Makefile | 3 | ||||
-rw-r--r-- | x11/xvattr/Makefile | 3 |
17 files changed, 71 insertions, 25 deletions
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index 2660d556199..96c3813b464 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/01/07 12:25:51 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/13 17:22:59 joerg Exp $ # DISTNAME= kid3-0.7 @@ -18,10 +18,15 @@ USE_LANGUAGES+= c c++ # Note: put app specific data files into kde dir CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../audio/flac/buildlink3.mk" .include "../../audio/id3lib/buildlink3.mk" .include "../../audio/libtunepimp0.4/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile index 09e0503c9a3..22909010091 100644 --- a/chat/licq-gui-qt/Makefile +++ b/chat/licq-gui-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/07/07 15:49:31 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/13 17:49:14 joerg Exp $ # DISTNAME= licq-1.2.6 @@ -28,6 +28,11 @@ WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/qt-gui} INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-* +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile index 71776b37bb9..a391aa915ba 100644 --- a/databases/kmysqladmin/Makefile +++ b/databases/kmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:19 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/13 17:35:40 joerg Exp $ DISTNAME= kmysqladmin-0.7.0 PKGREVISION= 5 @@ -17,9 +17,13 @@ MYSQLDIR= ${BUILDLINK_PREFIX.mysql-client} CONFIGURE_ARGS+= --with-mysql-include=${MYSQLDIR}/include/mysql CONFIGURE_ARGS+= --with-mysql-lib=${MYSQLDIR}/lib/mysql +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../mk/mysql.buildlink3.mk" .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" - +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 9861334e680..988db172728 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/10/07 12:14:18 markd Exp $ +# $NetBSD: Makefile,v 1.32 2007/01/13 17:45:46 joerg Exp $ DISTNAME= kmymoney2-0.8.5 CATEGORIES= finance kde @@ -28,9 +28,13 @@ SUBST_MESSAGE.hints= Fix includehints. SUBST_FILES.hints= kmymoney2/dialogs/*.ui kmymoney2/views/*.ui SUBST_FILTER_CMD.hints= ${GREP} -v includehint +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" - +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/knights/Makefile b/games/knights/Makefile index e16af2d230a..671c55d2ac5 100644 --- a/games/knights/Makefile +++ b/games/knights/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/04/17 13:46:29 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/13 17:30:18 joerg Exp $ DISTNAME= knights-0.6 PKGREVISION= 4 @@ -14,8 +14,12 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_LIBTOOL= YES +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" - +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 5a67b52977b..7721c0ad175 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2006/12/03 03:52:57 markd Exp $ +# $NetBSD: Makefile,v 1.69 2007/01/13 17:28:12 joerg Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} PKGREVISION= 1 @@ -40,4 +40,5 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "../../print/poppler-qt/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile index cdc983ce1d3..929496d2a58 100644 --- a/graphics/kphotools/Makefile +++ b/graphics/kphotools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:09 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/13 17:33:19 joerg Exp $ # DISTNAME= kphotools-0.2.1 @@ -25,7 +25,12 @@ SUBST_STAGE.kphotools= post-patch post-configure: ${_PKG_DEBUG}${_PKG_SILENT}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/ +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index cf6a7f1341a..bd576623f3b 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2006/06/01 13:58:57 markd Exp $ +# $NetBSD: Makefile,v 1.56 2007/01/13 17:13:59 joerg Exp $ DISTNAME= kdeutils-${_KDE_VERSION} COMMENT= Utilities for the KDE integrated X11 desktop @@ -37,5 +37,5 @@ CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../lang/python/application.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" - +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index 562dbaefba9..d97cb7eab68 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/01/07 12:25:55 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2007/01/13 17:28:24 joerg Exp $ # DISTNAME= kmplayer-0.9.3 @@ -36,4 +36,5 @@ SUBST_SED.desktop= -e 's|@PREFIX@|${PREFIX}|g' .include "../../meta-pkgs/kde3/kde3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile index 2271104806a..2ab86a42856 100644 --- a/net/kftpgrabber/Makefile +++ b/net/kftpgrabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/01/13 01:09:29 markd Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/13 17:14:14 joerg Exp $ DISTNAME= kftpgrabber-0.8.0 CATEGORIES= net kde @@ -14,9 +14,13 @@ USE_TOOLS+= gmake msgfmt perl USE_LIBTOOL= yes GNU_CONFIGURE= yes +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" - +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index eaee29df102..c027b9c8fec 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/01/07 12:25:55 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/13 16:50:12 joerg Exp $ # DISTNAME= k3b-0.12.17 @@ -21,6 +21,8 @@ USE_LIBTOOL= yes ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-* +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../audio/flac/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" @@ -29,4 +31,7 @@ ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-* .include "../../audio/taglib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile index da61e1d4bb1..075f252e9d7 100644 --- a/sysutils/krusader/Makefile +++ b/sysutils/krusader/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/08/30 00:07:00 markd Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/13 17:47:08 joerg Exp $ # DISTNAME= krusader-1.70.1 @@ -16,7 +16,12 @@ GNU_CONFIGURE= YES SHLIBTOOL_OVERRIDE= # empty +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index ee24fe6ef0e..4ffaeba9ded 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.65 2007/01/13 17:46:28 joerg Exp $ # DISTNAME= metacity-2.16.3 @@ -35,9 +35,9 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" - +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile index 7259ccf2b4c..3ebe0a0e7e7 100644 --- a/wm/obconf/Makefile +++ b/wm/obconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/10/04 22:02:29 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/13 17:48:34 joerg Exp $ DISTNAME= obconf-1.5 PKGREVISION= 8 @@ -16,6 +16,6 @@ GNU_CONFIGURE= YES .include "../../devel/libglade2/buildlink3.mk" .include "../../wm/openbox/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile index a6a8d169d3d..bc6b7884043 100644 --- a/wm/oroborox/Makefile +++ b/wm/oroborox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/13 17:51:06 joerg Exp $ # DISTNAME= OroboROX-0.9.8 @@ -84,5 +84,6 @@ do-install: .include "../../lang/python/application.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile index 94f8f0f0e70..2a9f48eb154 100644 --- a/x11/xmms-osd/Makefile +++ b/x11/xmms-osd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/04/17 13:47:01 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/13 17:53:07 joerg Exp $ # .include "../../x11/xosd/Makefile.common" @@ -18,5 +18,6 @@ INSTALL_DIRS= ${WRKSRC}/src/xmms_plugin .include "../../audio/xmms/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" .include "../../x11/xosd/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 3c108e77cd1..0d63b6b8c79 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:49 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/13 17:54:02 joerg Exp $ DISTNAME= xvattr-1.3 PKGREVISION= 4 @@ -16,4 +16,5 @@ USE_TOOLS+= pod2man .include "../../mk/bsd.prefs.mk" .include "../../x11/gtk/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |