diff options
| author | dmcmahill <dmcmahill> | 2000-03-28 00:09:19 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2000-03-28 00:09:19 +0000 |
| commit | 485df84fe5b267a5ee80411df9eb943a049e6451 (patch) | |
| tree | c5f4a711bf29a6633f7270cfd946002d75aceb5f /x11/xglobe | |
| parent | 20f29d5d48f48f149b8dcf39185f89a4450d2ccd (diff) | |
| download | pkgsrc-485df84fe5b267a5ee80411df9eb943a049e6451.tar.gz | |
make qt1 install in its own directory instead of renaming its installed
components. This allows users of Qt to specify QTDIR=/path/to/qt instead
of having to patch all configure scripts and makefiles to look for alternate
names. This is the recommended approach from Troll Tech (Qt authors).
update pkgs which use qt1 to reflect this.
Diffstat (limited to 'x11/xglobe')
| -rw-r--r-- | x11/xglobe/Makefile | 4 | ||||
| -rw-r--r-- | x11/xglobe/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/xglobe/patches/patch-aa | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index 11c3abe925b..755bf017b43 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/03/23 21:31:40 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.9 2000/03/28 00:09:23 dmcmahill Exp $ # DISTNAME= xglobe-0.2 @@ -25,7 +25,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_X11BASE= YES USE_GMAKE= YES -MAKE_ENV+= QTDIR=${X11BASE} +MAKE_ENV+= QTDIR=${X11BASE}/qt1 post-install: ${INSTALL_DATA_DIR} ${X11BASE}/lib/X11/xglobe diff --git a/x11/xglobe/files/patch-sum b/x11/xglobe/files/patch-sum index 34c95dff2f2..f8a6cc92993 100644 --- a/x11/xglobe/files/patch-sum +++ b/x11/xglobe/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.3 2000/03/23 21:31:41 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.4 2000/03/28 00:09:24 dmcmahill Exp $ -MD5 (patch-aa) = c6c01730808a9fc2084ee5bcaa05dd8c +MD5 (patch-aa) = df9a88ec39172c32584e77d1fe19a161 diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa index bb7bbf54b97..9d598aeae6f 100644 --- a/x11/xglobe/patches/patch-aa +++ b/x11/xglobe/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $ --- Makefile.orig Mon Apr 19 05:21:04 1999 +++ Makefile Wed Mar 22 16:07:59 2000 @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = /usr/lib/qt/include +X11_INCLUDE_DIR = ${X11BASE}/include -+QT_INCLUDE_DIR = $(QTDIR)/include/qt1 ++QT_INCLUDE_DIR = $(QTDIR)/include -QT_LIB_DIR = /usr/lib/qt/lib -X11_LIB_DIR = /usr/X11R6/lib @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $ LINK = g++ -MOC = moc -INSTALL = install -+MOC = moc1 ++MOC = ${QTDIR}/bin/moc +INSTALL = install -c ####### compile and link options @@ -37,15 +37,15 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $ INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) -LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) -+LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR) ++LIB_DIRS = -L$(QT_LIB_DIR) -Wl,-R${QT_LIB_DIR} -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR) -LIBS = -lX11 -lqt -lm -+LIBS = -lX11 -lqt1 -lm ++LIBS = -lX11 -lqt -lm # If you want to use the QImageIO lib (to support jpg and png maps) use this # line and comment the one above (don't forget to edit config.h as well!) @@ -41,4 +41,5 @@ # If the linker complains about unresolved references try this: #LIBS = -lX11 -lqt -lm -lqimgio -lpng -lz -+LIBS = -lqt1 -lm -lXext -lX11 ++LIBS = -lqt -lm -lXext -lX11 ####### Target |