diff options
| author | dmcmahill <dmcmahill> | 2000-03-23 21:31:40 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2000-03-23 21:31:40 +0000 |
| commit | b0c2ba44c475e1161fdcd1703eaca5627f99f580 (patch) | |
| tree | 1f99c84588aec758e87d87b724613a9955817ea6 | |
| parent | 17354576e16c9859c0d6292de9df93227c996fe2 (diff) | |
| download | pkgsrc-b0c2ba44c475e1161fdcd1703eaca5627f99f580.tar.gz | |
move dependency from qt-1.44 to qt1-1.44.
| -rw-r--r-- | x11/xglobe/Makefile | 4 | ||||
| -rw-r--r-- | x11/xglobe/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/xglobe/patches/patch-aa | 31 |
3 files changed, 18 insertions, 21 deletions
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index 9a56ed95021..11c3abe925b 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1999/07/04 23:42:52 kim Exp $ +# $NetBSD: Makefile,v 1.8 2000/03/23 21:31:40 dmcmahill Exp $ # DISTNAME= xglobe-0.2 @@ -17,7 +17,7 @@ DISTFILES+= ${MAPS} ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.uni-karlsruhe.de/~uddn/xglobe/ -DEPENDS+= qt-1.44:../../x11/qt +DEPENDS+= qt1-1.44:../../x11/qt1 DIST_SUBDIR= xglobe MAPS= LE.400.gif Brill.400.gif mggd.gif diff --git a/x11/xglobe/files/patch-sum b/x11/xglobe/files/patch-sum index 78281c843b5..34c95dff2f2 100644 --- a/x11/xglobe/files/patch-sum +++ b/x11/xglobe/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.2 1999/11/12 15:46:58 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/03/23 21:31:41 dmcmahill Exp $ -MD5 (patch-aa) = acb715b70e599a9d182e70887977065d +MD5 (patch-aa) = c6c01730808a9fc2084ee5bcaa05dd8c diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa index 3a38cf36a0c..bb7bbf54b97 100644 --- a/x11/xglobe/patches/patch-aa +++ b/x11/xglobe/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.4 1999/11/12 15:46:59 rh Exp $ +$NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $ ---- Makefile.orig Mon Apr 19 11:21:04 1999 -+++ Makefile Fri Nov 12 16:43:28 1999 -@@ -4,17 +4,17 @@ - +--- Makefile.orig Mon Apr 19 05:21:04 1999 ++++ Makefile Wed Mar 22 16:07:59 2000 +@@ -5,15 +5,15 @@ ####### Installation directory -XGLOBE_DIR = /usr/local @@ -17,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 1999/11/12 15:46:59 rh Exp $ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = /usr/lib/qt/include +X11_INCLUDE_DIR = ${X11BASE}/include -+QT_INCLUDE_DIR = $(QTDIR)/include/qt ++QT_INCLUDE_DIR = $(QTDIR)/include/qt1 -QT_LIB_DIR = /usr/lib/qt/lib -X11_LIB_DIR = /usr/X11R6/lib @@ -25,30 +24,28 @@ $NetBSD: patch-aa,v 1.4 1999/11/12 15:46:59 rh Exp $ +X11_LIB_DIR = ${X11BASE}/lib - ####### Compiler and tools -@@ -22,7 +22,7 @@ +@@ -22,6 +22,6 @@ CPP = g++ LINK = g++ - MOC = moc +-MOC = moc -INSTALL = install ++MOC = moc1 +INSTALL = install -c ####### compile and link options - -@@ -32,7 +32,7 @@ - +@@ -33,7 +33,7 @@ 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) - LIBS = -lX11 -lqt -lm +-LIBS = -lX11 -lqt -lm ++LIBS = -lX11 -lqt1 -lm # If you want to use the QImageIO lib (to support jpg and png maps) use this -@@ -40,6 +40,7 @@ - #LIBS = -lX11 -lqt -lm -lqimgio + # 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 = -lqt -lm -lXext -lX11 ++LIBS = -lqt1 -lm -lXext -lX11 ####### Target - |