diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2000-03-28 00:12:29 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2000-03-28 00:12:29 +0000 |
| commit | efd6402596246f87fcfaddb8aaba5a3971ebd84b (patch) | |
| tree | 8ee3b673ba2f5c6538c486412d7adc655028a216 /x11/kdelibs | |
| parent | 07c67df8fdbb88d9d46d88ffe78dba3ef8941b5c (diff) | |
| download | pkgsrc-efd6402596246f87fcfaddb8aaba5a3971ebd84b.tar.gz | |
Change from using qt to qt1. This clears the way to allow Qt to be upgraded
to Qt-2 without breaking KDE which still requires Qt-1.
Diffstat (limited to 'x11/kdelibs')
| -rw-r--r-- | x11/kdelibs/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index eeac1948b27..d61ccfa7e63 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2000/03/21 22:40:58 tron Exp $ +# $NetBSD: Makefile,v 1.45 2000/03/28 00:12:31 dmcmahill Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -13,7 +13,7 @@ HOMEPAGE= http://www.kde.org/ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png>=1.0.6:../../graphics/png -DEPENDS+= qt-1.44:../../x11/qt +DEPENDS+= qt1-1.44:../../x11/qt1 DEPENDS+= tiff-*:../../graphics/tiff USE_X11BASE= yes @@ -21,9 +21,8 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=${PREFIX} \ - --with-qt-includes=${PREFIX}/include/qt +CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ + "--with-qt-dir=${PREFIX}/qt1" CFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" @@ -38,6 +37,6 @@ post-install: CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" + all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" .include "../../mk/bsd.pkg.mk" |