summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/khostchooser/Makefile9
-rw-r--r--x11/korganizer/Makefile8
-rw-r--r--x11/kworldwatch/Makefile11
3 files changed, 15 insertions, 13 deletions
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 38a8e269b71..e7a573a38ed 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/09 20:27:36 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/04/13 00:20:38 dmcmahill Exp $
#
DISTNAME= khostchooser-0.3
@@ -19,11 +19,12 @@ USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \
- --with-qt-dir=${PREFIX} \
- --with-qt-includes=${PREFIX}/include/qt
+ --with-qt-dir=${X11BASE}/qt1
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${PREFIX} \
+ QTDIR=${X11BASE}/qt1 \
+ MOC=${X11BASE}/qt1/bin/moc \
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"
diff --git a/x11/korganizer/Makefile b/x11/korganizer/Makefile
index 6bbad20177d..e79ff83ab91 100644
--- a/x11/korganizer/Makefile
+++ b/x11/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/11/24 11:45:27 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2000/04/13 00:43:17 dmcmahill Exp $
DISTNAME= korganizer-1.1.2
CATEGORIES= kde
@@ -15,11 +15,11 @@ USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \
- "--with-qt-dir=${PREFIX}" \
- "--with-qt-includes=${PREFIX}/include/qt"
+ "--with-qt-dir=${X11BASE}/qt1"
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${PREFIX} \
+ QTDIR=${X11BASE}/qt1 \
CXXFLAGS="${CFLAGS}" \
- all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile
index 5c69fa089e8..369c42a71f6 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/10 19:11:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/04/13 01:05:45 dmcmahill Exp $
#
DISTNAME= kworldwatch-0.6
@@ -14,13 +14,14 @@ DEPENDS+= kde-1.1.2:../../x11/kde
USE_X11BASE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \
- --with-qt-dir=${X11BASE} \
- --with-qt-includes='${X11BASE}/include/qt -I${LOCALBASE}/include' \
- --with-qt-libraries='${X11BASE}/lib -L${LOCALBASE}/lib' \
+ --with-qt-dir=${X11BASE}/qt1 \
+ --with-qt-libraries='${X11BASE}/qt1/lib -L${LOCALBASE}/lib' \
--enable-path-check
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${PREFIX} \
+ MOC=${X11BASE}/qt1/bin/moc \
+ QTDIR=${X11BASE}/qt1 \
CXXFLAGS="${CFLAGS}" \
- all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
.include "../../mk/bsd.pkg.mk"