diff options
| -rw-r--r-- | sysutils/kdf/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/klavg/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/klavg/patches/patch-aa | 24 | ||||
| -rw-r--r-- | x11/khostchooser/Makefile | 9 | ||||
| -rw-r--r-- | x11/korganizer/Makefile | 8 | ||||
| -rw-r--r-- | x11/kworldwatch/Makefile | 11 |
6 files changed, 35 insertions, 28 deletions
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index a95fadc6cb8..86bde4ad01f 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/01/10 19:11:10 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2000/04/12 23:55:47 dmcmahill Exp $ # DISTNAME= kdf-0.5.1 @@ -15,11 +15,12 @@ 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 \ + --with-qt-dir=${X11BASE}/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ + QTDIR=${X11BASE}/qt1 \ + MOC=${X11BASE}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" diff --git a/sysutils/klavg/files/patch-sum b/sysutils/klavg/files/patch-sum index d4409023898..71e8fc8c632 100644 --- a/sysutils/klavg/files/patch-sum +++ b/sysutils/klavg/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/11/06 15:57:41 hubertf Exp $ +$NetBSD: patch-sum,v 1.2 2000/04/13 00:11:49 dmcmahill Exp $ -MD5 (patch-aa) = dc77e5dea61304d3a25e127c9b23965c +MD5 (patch-aa) = d3a057c22ae0c4369e06c3f9d8d5a746 MD5 (patch-ab) = 69cb0398aee1539cce93098522090ab1 diff --git a/sysutils/klavg/patches/patch-aa b/sysutils/klavg/patches/patch-aa index 344f308e0d2..82a88674e75 100644 --- a/sysutils/klavg/patches/patch-aa +++ b/sysutils/klavg/patches/patch-aa @@ -1,28 +1,32 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/06 15:57:41 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2000/04/13 00:11:49 dmcmahill Exp $ ---- Makefile.orig Mon Jun 28 08:44:35 1999 -+++ Makefile Fri Nov 5 14:29:58 1999 -@@ -2,12 +2,15 @@ - +--- Makefile.orig Wed Apr 12 20:06:49 2000 ++++ Makefile Wed Apr 12 20:05:44 2000 +@@ -3,15 +3,18 @@ KLAVGVER=1.1 -+QTDIR= ${X11BASE} ++QTDIR= ${X11BASE}/qt1 +KDEDIR= ${X11BASE} + #------------ -INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include -I/usr/include/qt -CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include -+INCDIR = -I$(QTDIR)/include/qt -I$(KDEDIR)/include ++INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include +CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I${X11BASE}/include LIBCFLAGS = -LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(KDEDIR)/lib \ -+LFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE} -L$(QTDIR)/lib -L$(KDEDIR)/lib \ ++LFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE} -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -L$(KDEDIR)/lib \ -lqt -lkdecore -lkdeui -lkfile -lkfm -lXext -lX11 CC = gcc -@@ -61,6 +64,4 @@ - cd ..; rm -f klavg-$(KLAVGVER).tar klavg-$(KLAVGVER).tar.gz; tar --exclude CVS -cvf klavg-$(KLAVGVER).tar klavg; gzip -9 klavg-$(KLAVGVER).tar +-#MOC = $(QTDIR)/bin/moc +-MOC = moc ++MOC = $(QTDIR)/bin/moc ++#MOC = moc + SHELL = /bin/sh + +@@ -62,5 +65,3 @@ install: $(TARGET) - cp klavg /usr/bin 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" |