diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-26 19:54:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-26 19:54:48 +0000 |
| commit | 5df6c35daf7b8d201c677bed392859058d134589 (patch) | |
| tree | 6cc3e4a77d59d1c8c10e7862f1188404521dba7d /x11/qwt | |
| parent | 3e78114e4987412f584d47f0f1137e52d6f0ce3b (diff) | |
| download | pkgsrc-5df6c35daf7b8d201c677bed392859058d134589.tar.gz | |
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
Diffstat (limited to 'x11/qwt')
| -rw-r--r-- | x11/qwt/Makefile | 11 | ||||
| -rw-r--r-- | x11/qwt/distinfo | 4 | ||||
| -rw-r--r-- | x11/qwt/patches/patch-aa | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index cd98b4f5c54..8480a8084de 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/04/30 11:03:30 skrll Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/26 20:42:59 jlam Exp $ DISTNAME= qwt-0.3.0 CATEGORIES= x11 @@ -8,15 +8,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://sourceforge.net/projects/qwt COMMENT= Qt widget library for technical purposes -DEPENDS+= qt2-libs-2.3.0:../../x11/qt2-libs +BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.0 +USE_BUILDLINK_ONLY= yes USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -EVAL_PREFIX+= QT2DIR=qt2-libs -MAKE_ENV+= CXX="${CXX}" \ - QTDIR="${QT2DIR}/qt2" +MAKE_ENV+= CXX="${CXX}" +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CONFLICTS= qwtlib-* @@ -30,4 +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/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 3dd47f2385d..009b3d74ce3 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/04/30 11:03:30 skrll Exp $ +$NetBSD: distinfo,v 1.4 2001/06/26 20:42:59 jlam Exp $ SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b Size (qwt-0.3.0.tar.gz) = 484675 bytes -SHA1 (patch-aa) = 5c55cc77207e6fba850c8534cae4db2384c31bbb +SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa index c047a083141..4561293d5a9 100644 --- a/x11/qwt/patches/patch-aa +++ b/x11/qwt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2001/04/30 11:03:31 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 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.1 2001/04/30 11:03:31 skrll Exp $ -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm +#LINK = g++ +#LFLAGS = -Bshareable -+LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm -Wl,-R${X11BASE}/lib ++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc |