diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/qwt | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/qwt')
| -rw-r--r-- | x11/qwt/Makefile | 8 | ||||
| -rw-r--r-- | x11/qwt/distinfo | 4 | ||||
| -rw-r--r-- | x11/qwt/patches/patch-aa | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 257bbbb1933..f33beae8c6d 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:03 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 21:52:43 jlam Exp $ DISTNAME= qwt-0.3.0 PKGREVISION= 1 @@ -10,13 +10,12 @@ HOMEPAGE= http://sourceforge.net/projects/qwt COMMENT= Qt widget library for technical purposes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -MAKE_ENV+= CXX="${CXX}" MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CONFLICTS= qwtlib-[0-9]* @@ -31,6 +30,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 2b8a6c39b3d..50ed84a922b 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:43 jlam Exp $ SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b Size (qwt-0.3.0.tar.gz) = 484675 bytes -SHA1 (patch-aa) = 37b74054101d51f1e60acd6afad1a128eb6b867d +SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa index a5c62893227..00c730e7863 100644 --- a/x11/qwt/patches/patch-aa +++ b/x11/qwt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:44 jlam Exp $ --- makefiles/netbsd-g++.orig Wed Dec 13 23:23:09 2000 +++ makefiles/netbsd-g++ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 jlam Exp $ -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm +#LINK = g++ +#LFLAGS = -Bshareable -+LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${BUILDLINK_X11_DIR}/lib -lqt -lXext -lX11 -lm ++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc |