From 8f452557507cf8d1a570c23fdf3dfcc0634b78c8 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 17 Jul 2000 13:58:20 +0000 Subject: Use EVAL_PREFIX to find the installed location of the kdebase package, and use it accordingly. --- audio/kdemultimedia/Makefile | 10 +++++----- devel/kdevelop/Makefile | 6 +++--- games/kdegames/Makefile | 8 ++++---- games/kdetoys/Makefile | 8 ++++---- graphics/kdegraphics/Makefile | 8 ++++---- misc/kdeutils/Makefile | 6 +++--- net/kdenetwork/Makefile | 10 +++++----- net/kxicq/Makefile | 8 ++++---- sysutils/kdf/Makefile | 4 ++-- x11/korganizer/Makefile | 8 ++++---- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile index 03b6bd23edd..92f0c316f44 100644 --- a/audio/kdemultimedia/Makefile +++ b/audio/kdemultimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:13 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/17 13:58:20 agc Exp $ DISTNAME= kdemultimedia-1.1.2 CATEGORIES= audio kde @@ -15,15 +15,15 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" post-install: - @${CHMOD} -R go-w ${PREFIX}/share/kde/apps/kscd/cddb + @${CHMOD} -R go-w ${KDEBASEDIR}/share/kde/apps/kscd/cddb .include "../../mk/bsd.pkg.mk" diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 4aa3be5f4ad..5cee9efe558 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:17 agc Exp $ +# $NetBSD: Makefile,v 1.18 2000/07/17 13:58:20 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -21,12 +21,12 @@ USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-qt-dir=${QT1DIR}/qt1 CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=${QT1DIR}/qt1" +CONFIGURE_ENV= "KDEDIR=${KDEBASEDIR} QTDIR=${QT1DIR}/qt1" .include "../../mk/bsd.pkg.mk" diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index eae82451483..f30456a2684 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:18 agc Exp $ +# $NetBSD: Makefile,v 1.41 2000/07/17 13:58:20 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -18,11 +18,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index 4a7d10fa4a5..b0e560beb56 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:18 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/17 13:58:21 agc Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -17,11 +17,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ QTDIR=${QT1DIR}/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index f1e6d27576a..7f7a711c62f 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2000/07/15 20:39:20 agc Exp $ +# $NetBSD: Makefile,v 1.32 2000/07/17 13:58:21 agc Exp $ # DISTNAME= kdegraphics-1.1.2 @@ -16,11 +16,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 49bb513a761..e44f265bde1 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:21 agc Exp $ +# $NetBSD: Makefile,v 1.41 2000/07/17 13:58:21 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -17,10 +17,10 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase CONFIGURE_ARGS= "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index c07a1153f6c..1bf71cdfe1a 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2000/07/15 20:39:23 agc Exp $ +# $NetBSD: Makefile,v 1.48 2000/07/17 13:58:21 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -23,10 +23,10 @@ USE_GMAKE= yes USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" @@ -51,7 +51,7 @@ CFLAGS+= -I${LOCALBASE}/include post-install: .if (${GCC_VERSION:C/-.*$$//} != egcs) - @${FIND} ${PREFIX}/share/kde/locale -name ksirc.mo | xargs ${RM} + @${FIND} ${KDEBASEDIR}/share/kde/locale -name ksirc.mo | xargs ${RM} .endif .include "../../mk/bsd.pkg.mk" diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index e0aa2872e27..7507a6797d1 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:23 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/17 13:58:22 agc Exp $ DISTNAME= kxicq-03132000 CATEGORIES= net kde @@ -16,10 +16,10 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_LIBTOOL= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS+= --datadir=${KDEBASEDIR}/share/kde \ --with-qt-dir=${QT1DIR}/qt1 -CONFIGURE_ENV+= KDEDIR=${PREFIX} \ +CONFIGURE_ENV+= KDEDIR=${KDEBASEDIR} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 5a6d92c78db..cd9a660e7b9 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/17 13:58:22 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \ --with-qt-dir=${QT1DIR}/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ QTDIR=${QT1DIR}/qt1 \ MOC=${QT1DIR}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ diff --git a/x11/korganizer/Makefile b/x11/korganizer/Makefile index 3c2c5acaf38..b5bf3c757e6 100644 --- a/x11/korganizer/Makefile +++ b/x11/korganizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:27 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/17 13:58:22 agc Exp $ DISTNAME= korganizer-1.1.2 CATEGORIES= kde @@ -15,11 +15,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -EVAL_PREFIX+= QT1DIR=qt1 -CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=${PREFIX} \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ QTDIR=${QT1DIR}/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" -- cgit v1.2.3