diff options
author | dmcmahill <dmcmahill> | 2000-03-28 00:12:29 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2000-03-28 00:12:29 +0000 |
commit | 0eb7c07b27905b8d1e85ac187486c3310161b139 (patch) | |
tree | 8ee3b673ba2f5c6538c486412d7adc655028a216 /x11/qwspritefield | |
parent | 485df84fe5b267a5ee80411df9eb943a049e6451 (diff) | |
download | pkgsrc-0eb7c07b27905b8d1e85ac187486c3310161b139.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/qwspritefield')
-rw-r--r-- | x11/qwspritefield/Makefile | 10 | ||||
-rw-r--r-- | x11/qwspritefield/files/patch-sum | 4 | ||||
-rw-r--r-- | x11/qwspritefield/patches/patch-aa | 27 | ||||
-rw-r--r-- | x11/qwspritefield/pkg/PLIST | 10 |
4 files changed, 24 insertions, 27 deletions
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index 8c8b0adf8da..6aa850e0bcd 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/10/07 17:42:01 tron Exp $ +# $NetBSD: Makefile,v 1.4 2000/03/28 00:12:31 dmcmahill Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.troll.no/contrib/ MAINTAINER= packages@netbsd.org -DEPENDS+= qt-1.44:../../x11/qt +DEPENDS+= qt1-1.44:../../x11/qt1 CONFLICTS= kdesupport-1.0 @@ -18,11 +18,15 @@ WRKSRC= ${WRKDIR}/QwSpriteField QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h +PATH= ${X11BASE}/qt1/bin:$$PATH + +MAKE_ENV+= "QTDIR=${X11BASE}/qt1" + do-install: @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \ ${PREFIX}/lib .for FILE in ${QW_INCLUDES} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/include/qt + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/qt1/include .endfor .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwspritefield/files/patch-sum b/x11/qwspritefield/files/patch-sum index 90e031bdd90..e71e4ff8bbb 100644 --- a/x11/qwspritefield/files/patch-sum +++ b/x11/qwspritefield/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:29 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $ -MD5 (patch-aa) = 0732a2c35870312baa3bffd830a7c163 +MD5 (patch-aa) = f16c0a2a4a8b01d6b4e38d477567745c diff --git a/x11/qwspritefield/patches/patch-aa b/x11/qwspritefield/patches/patch-aa index 47534a65d9c..fd392f6a65d 100644 --- a/x11/qwspritefield/patches/patch-aa +++ b/x11/qwspritefield/patches/patch-aa @@ -1,22 +1,20 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $ +$NetBSD: patch-aa,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $ ---- Makefile.orig Wed Dec 9 09:41:59 1998 -+++ Makefile Tue Mar 23 21:45:32 1999 -@@ -1,9 +1,9 @@ +--- Makefile.orig Wed Dec 9 03:41:59 1998 ++++ Makefile Sun Mar 26 10:55:12 2000 +@@ -1,8 +1,8 @@ VERSION=1.6 -LDFLAGS=-L/usr/X11/lib -L$(QTDIR)/lib -+LDFLAGS=-L$(PREFIX)/lib -L$(QTDIR)/lib ++LDFLAGS=-L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib LDLIBS=$(LIBRARY) -lqt -lX11 -CXXFLAGS=-Wall -g -I$(QTDIR)/include -I. -#CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I. +#CXXFLAGS=-Wall -g -I$(PREFIX)/include/qt -I. -+CXXFLAGS=-Wall -O2 -I$(PREFIX)/include/qt -I. ++CXXFLAGS=-Wall -O2 -I$(QTDIR)/include -I. MOCS=moc_QwSpriteField.cpp SRC=QwSpriteField.cpp QwSpriteField-double.cpp QwSpriteField-int.cpp \ - QwSpriteField-mobdouble.cpp QwSpriteField-mobint.cpp QwCluster.cpp \ -@@ -11,12 +11,12 @@ - OBJ=QwSpriteField.o QwSpriteField-double.o QwSpriteField-int.o \ +@@ -12,10 +12,10 @@ QwSpriteField-mobdouble.o QwSpriteField-mobint.o QwCluster.o \ moc_QwSpriteField.o -LIBRARY=libQwSpriteField.a @@ -27,12 +25,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $ $(LIBRARY): $(OBJ) - ar rs $(LIBRARY) $? -+ $(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib -version-info 6:0 -o $(LIBRARY) $(OBJ:.o=.lo) ++ $(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib -rpath $(QTDIR)/lib -version-info 6:0 -o $(LIBRARY) $(OBJ:.o=.lo) example: example.o moc_example.o $(LIBRARY) - -@@ -95,11 +95,8 @@ - moc_%.cpp: %.h +@@ -96,9 +96,6 @@ moc $*.h -o moc_$*.cpp -QwSpriteField-%.o: QwSpriteField-%.cpp @@ -43,13 +39,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $ + $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $< clean: - -rm doc/html/*~ *~ *.o *.moc core -@@ -112,7 +109,7 @@ - Dependencies: +@@ -113,5 +110,5 @@ @echo "Making file $@ automatically." touch Dependencies - make depend + ${MAKE} depend include Dependencies - diff --git a/x11/qwspritefield/pkg/PLIST b/x11/qwspritefield/pkg/PLIST index 4cbdbcbce31..75adf585572 100644 --- a/x11/qwspritefield/pkg/PLIST +++ b/x11/qwspritefield/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/23 21:08:02 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/03/28 00:12:32 dmcmahill Exp $ lib/libQwSpriteField.a lib/libQwSpriteField.so.6.0 -include/qt/Pix.h -include/qt/QwCluster.h -include/qt/QwPublicList.h -include/qt/QwSpriteField.h +qt1/include/Pix.h +qt1/include/QwCluster.h +qt1/include/QwPublicList.h +qt1/include/QwSpriteField.h |