summaryrefslogtreecommitdiff
path: root/cad/qcad
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-20 21:13:39 +0000
committerjlam <jlam@pkgsrc.org>2002-09-20 21:13:39 +0000
commita6d9e3b18929cc6d367e8f6d888dc18ca3c6c015 (patch)
tree00539e9230c4ae24431c568d17a90aac93607d85 /cad/qcad
parent6449f14956177092bd79b2659197182b9359b9d8 (diff)
downloadpkgsrc-a6d9e3b18929cc6d367e8f6d888dc18ca3c6c015.tar.gz
buildlink1 -> buildlink2
Diffstat (limited to 'cad/qcad')
-rw-r--r--cad/qcad/Makefile8
-rw-r--r--cad/qcad/distinfo4
-rw-r--r--cad/qcad/patches/patch-aa4
3 files changed, 8 insertions, 8 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 8f7fe785847..75a1d9945eb 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:40 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/20 21:17:13 jlam Exp $
DISTNAME= qcad-1.4.7-src
PKGNAME= qcad-1.4.7
@@ -10,7 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.qcad.org/
COMMENT= 2D CAD System
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
+USE_X11= # defined
do-configure:
@for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \
@@ -34,6 +35,5 @@ do-install:
TODO cur doc examples fonts hatches libraries messages xpm) | \
(cd ${PREFIX}/share/qcad; ${GTAR} vxf - )
-.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/cad/qcad/distinfo b/cad/qcad/distinfo
index e34cbf78dba..ec3f5dacfb7 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/08/29 22:41:05 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/09/20 21:17:13 jlam Exp $
SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48
Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes
-SHA1 (patch-aa) = 46d4350760f96e4da7854a48d81d0d69d9776436
+SHA1 (patch-aa) = f066d56f80c1875a1d792fce677f06560f1af507
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 c1f40d6a4fe..5831e6d60d1 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $
--- Makefile.orig Sun Mar 25 06:17:10 2001
+++ Makefile
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $
-MOC = moc
+LINK = $(CXX)
+LFLAGS = ${LDFLAGS}
-+LIBS = -L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
++LIBS = -L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
+MOC = $(QTDIR)/bin/moc
####### Files