summaryrefslogtreecommitdiff
path: root/x11/qwt
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
committerjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
commit63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /x11/qwt
parent70004632b203c88d357d29ec8f217d1caa85f9c7 (diff)
downloadpkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'x11/qwt')
-rw-r--r--x11/qwt/Makefile3
-rw-r--r--x11/qwt/distinfo4
-rw-r--r--x11/qwt/patches/patch-aa4
3 files changed, 6 insertions, 5 deletions
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 8480a8084de..a37c5456329 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/26 20:42:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:30 jlam Exp $
DISTNAME= qwt-0.3.0
CATEGORIES= x11
@@ -31,4 +31,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3
.include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo
index 009b3d74ce3..2b8a6c39b3d 100644
--- a/x11/qwt/distinfo
+++ b/x11/qwt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/06/26 20:42:59 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:30 jlam Exp $
SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b
Size (qwt-0.3.0.tar.gz) = 484675 bytes
-SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e
+SHA1 (patch-aa) = 37b74054101d51f1e60acd6afad1a128eb6b867d
diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa
index 4561293d5a9..a5c62893227 100644
--- a/x11/qwt/patches/patch-aa
+++ b/x11/qwt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 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.2 2001/06/26 20:43:00 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${X11BASE}/lib -lqt -lXext -lX11 -lm
++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${BUILDLINK_X11_DIR}/lib -lqt -lXext -lX11 -lm
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc