diff options
| author | jlam <jlam> | 2001-10-23 13:14:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-10-23 13:14:43 +0000 |
| commit | 3a8912d229bbbdeda3abaabb3f02f7d746d1c2a1 (patch) | |
| tree | c71c5298b558906fd133ec61d9111ec38e51b68d /chat | |
| parent | 49e3f8222654ff97010d276a087cf9bf7685b898 (diff) | |
| download | pkgsrc-3a8912d229bbbdeda3abaabb3f02f7d746d1c2a1.tar.gz | |
x11.buildlink.mk needs to be included before any buildlink.mk files that
use X11_BUILDLINK_MK as a test value. Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/gaim/Makefile | 4 | ||||
| -rw-r--r-- | chat/gtkyahoo/Makefile | 4 | ||||
| -rw-r--r-- | chat/kyahoo/Makefile | 23 |
3 files changed, 22 insertions, 9 deletions
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 6699a71f77a..2092995de4d 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/09/22 08:57:21 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:47 jlam Exp $ # DISTNAME= gaim-0.44 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-pixbuf CONFIGURE_ENV+= pixbufcfg="${GDK_PIXBUF_CONFIG}" +.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile index a11cedc92b5..f7891910525 100644 --- a/chat/gtkyahoo/Makefile +++ b/chat/gtkyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/23 02:04:32 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/10/23 13:14:47 jlam Exp $ DISTNAME= gtkyahoo-0.18.2 CATEGORIES= chat @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-libyahoo="${BUILDLINK_DIR}" pre-configure: ${RM} -rf ${WRKSRC}/libyahoo +.include "../../mk/x11.buildlink.mk" .include "../../chat/libyahoo/buildlink.mk" .include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile index 180f3f291eb..71791bc1e54 100644 --- a/chat/kyahoo/Makefile +++ b/chat/kyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/27 14:35:05 tron Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:47 jlam Exp $ DISTNAME= kyahoo-0.7 CATEGORIES= chat @@ -7,12 +7,25 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org HOMEPAGE= http://kyahoo.sourceforge.net/ -COMMENT= yahoo client for KDE +COMMENT= Yahoo! client for KDE -BUILD_DEPENDS+= automake>=1.4:../../devel/automake -BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf -DEPENDS+= kdebase>=2.1:../../x11/kdebase2 +USE_BUILDLINK_ONLY= YES .include "../../x11/kde2/Makefile.part2" +CONFIGURE_ARGS+= --with-libyahoo=${BUILDLINK_DIR} + +# Pass USER_LDFLAGS through MAKE_ENV as there doesn't seem to be a reliable +# way to stop the configure script from running again during the build step, +# and we need USER_LDFLAGS to be set to LDFLAGS by the configure script in +# accordance with the buildlink strategy outlined in kde2/Makefile.part2. +# +MAKE_ENV+= USER_LDFLAGS="${LDFLAGS}" + +pre-build: + ${CHMOD} +x ${WRKSRC}/missing + +.include "../../mk/x11.buildlink.mk" +.include "../../chat/libyahoo/buildlink.mk" +.include "../../x11/kdebase2/buildlink.mk" .include "../../mk/bsd.pkg.mk" |