diff options
| author | jlam <jlam> | 2001-06-26 19:54:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-26 19:54:48 +0000 |
| commit | abe58e8bba301b2a4a9eab16511b1080165e2d9b (patch) | |
| tree | 6cc3e4a77d59d1c8c10e7862f1188404521dba7d /cad/qcad | |
| parent | eba5643dac1930397d1e4d5441dea066b558f699 (diff) | |
| download | pkgsrc-abe58e8bba301b2a4a9eab16511b1080165e2d9b.tar.gz | |
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
Diffstat (limited to 'cad/qcad')
| -rw-r--r-- | cad/qcad/Makefile | 17 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 4 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-aa | 19 |
3 files changed, 11 insertions, 29 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index d4a706a2a6c..70dc6f10a49 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/05/03 22:02:59 jtb Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/26 20:10:22 jlam Exp $ DISTNAME= qcad-1.4.7-src PKGNAME= qcad-1.4.7 @@ -9,18 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.qcad.org/ COMMENT= 2D CAD System -DEPENDS+= qt2-libs>=2.2.4:../../x11/qt2-libs - -USE_X11= #defined - -EVAL_PREFIX+= QT2_PREFIX=qt2 -MAKE_ENV+= QTDIR=${QT2_PREFIX}/qt2 - -JPEG_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= JPEG_PREFIX=jpeg - -PNG_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= PNG_PREFIX=png +USE_BUILDLINK_ONLY= # defined +USE_X11= # defined do-configure: @for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \ @@ -44,4 +34,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/bsd.pkg.mk" diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index ed08398117f..33b65b20efa 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/26 20:10:23 jlam Exp $ SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes -SHA1 (patch-aa) = c95cb47e57ad4bd617ffca3f9c2b76cb4e6b5f76 +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 e9d0e329788..56b85db8817 100644 --- a/cad/qcad/patches/patch-aa +++ b/cad/qcad/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $ ---- Makefile.orig Sun Mar 25 11:17:10 2001 +--- Makefile.orig Sun Mar 25 06:17:10 2001 +++ Makefile @@ -7,13 +7,14 @@ @@ -17,9 +17,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc +LINK = $(CXX) -+#LFLAGS = -static -+LIBS = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -Wl,-R${PNG_PREFIX}/lib -L${PNG_PREFIX}/lib -lpng -lz -Wl,-R${JPEG_PREFIX}/lib -L${JPEG_PREFIX}/lib -ljpeg -+MOC = ${QTDIR}/bin/moc ++LFLAGS = ${LDFLAGS} ++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 @@ -40,12 +40,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ .C.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -@@ -386,7 +387,7 @@ - all: $(TARGET) - - $(TARGET): $(OBJECTS) $(OBJMOC) -- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -+ $(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) - - moc: $(SRCMOC) - |