diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /cad/qcad | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-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 'cad/qcad')
| -rw-r--r-- | cad/qcad/Makefile | 4 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 4 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-aa | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 70dc6f10a49..5f72118daa2 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/26 20:10:22 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:05 jlam Exp $ DISTNAME= qcad-1.4.7-src PKGNAME= qcad-1.4.7 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.qcad.org/ COMMENT= 2D CAD System USE_BUILDLINK_ONLY= # defined -USE_X11= # defined do-configure: @for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \ @@ -35,4 +34,5 @@ do-install: (cd ${PREFIX}/share/qcad; ${GTAR} vxf - ) .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 33b65b20efa..e34cbf78dba 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 20:10:23 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:05 jlam Exp $ SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes -SHA1 (patch-aa) = f066d56f80c1875a1d792fce677f06560f1af507 +SHA1 (patch-aa) = 46d4350760f96e4da7854a48d81d0d69d9776436 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7 SHA1 (patch-ac) = 4e0dc2d55c9f3cb5a612c60699772bee0d9c82f0 SHA1 (patch-ad) = 0961a104cfa006e5c08682aa45f08e1206f41308 diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa index 56b85db8817..c1f40d6a4fe 100644 --- a/cad/qcad/patches/patch-aa +++ b/cad/qcad/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $ --- Makefile.orig Sun Mar 25 06:17:10 2001 +++ Makefile @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $ -MOC = moc +LINK = $(CXX) +LFLAGS = ${LDFLAGS} -+LIBS = -L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg ++LIBS = -L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg +MOC = $(QTDIR)/bin/moc ####### Files |