summaryrefslogtreecommitdiff
path: root/cad/qcad
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2003-03-15 00:25:42 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2003-03-15 00:25:42 +0000
commit85cdf0fc011e4e43e2b21e99bbde0180a761b473 (patch)
treeadcf6f49509222387516687f814ffda8b187b9fe /cad/qcad
parent9f39809852d609fde946c49f3a4b9faaf4114702 (diff)
downloadpkgsrc-85cdf0fc011e4e43e2b21e99bbde0180a761b473.tar.gz
on alpha lower optimization level on a handful of key problem files that
triggered a compiler error. This package now builds and seems to run on NetBSD-1.6/alpha
Diffstat (limited to 'cad/qcad')
-rw-r--r--cad/qcad/Makefile3
-rw-r--r--cad/qcad/distinfo4
-rw-r--r--cad/qcad/patches/patch-aa45
3 files changed, 41 insertions, 11 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 75a1d9945eb..4d4fce1f224 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/20 21:17:13 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/15 00:25:42 dmcmahill Exp $
DISTNAME= qcad-1.4.7-src
PKGNAME= qcad-1.4.7
@@ -12,6 +12,7 @@ COMMENT= 2D CAD System
USE_BUILDLINK2= # defined
USE_X11= # defined
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
do-configure:
@for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index ec3f5dacfb7..9f6cbe390cf 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/09/20 21:17:13 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/03/15 00:25:42 dmcmahill 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) = 2326e9c3ae06f89975f36148aac67a7765c37619
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 5831e6d60d1..2a437058be8 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2003/03/15 00:25:42 dmcmahill Exp $
--- Makefile.orig Sun Mar 25 06:17:10 2001
-+++ Makefile
-@@ -7,13 +7,14 @@
-
++++ Makefile Fri Mar 14 07:13:56 2003
+@@ -8,11 +8,13 @@
####### Compiler, tools and options
-CC = g++
@@ -11,6 +10,7 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $
+#CC = g++
+CXXFLAGS+= -fno-strength-reduce
+CFLAGS+= -fno-strength-reduce
++CXXFLAGS_NOOPT= ${CXXFLAGS:C/-O[0-9]*//g}
INCPATH = -I$(QTDIR)/include
-LINK = g++
-LFLAGS = -static
@@ -22,9 +22,7 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $
+MOC = $(QTDIR)/bin/moc
####### Files
-
-@@ -367,13 +368,13 @@
- .SUFFIXES: .cpp .cxx .cc .C .c
+@@ -368,11 +370,11 @@
.cpp.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
@@ -39,4 +37,35 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.C.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+@@ -1791,4 +1793,7 @@
+ ractiondef.h \
+ rprgdef.h
++.if (${MACHINE_ARCH} == "alpha")
++ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rappwin.cpp
++.endif
+
+ moc_rattribdialog.o: moc_rattribdialog.cpp \
+@@ -1869,4 +1874,7 @@
+ rfontdialog.h \
+ rgraphdef.h
++.if (${MACHINE_ARCH} == "alpha")
++ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rfontdialog.cpp
++.endif
+
+ moc_rgraphic.o: moc_rgraphic.cpp \
+@@ -1882,4 +1890,7 @@
+ rmath.h \
+ rmathdef.h
++.if (${MACHINE_ARCH} == "alpha")
++ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rgraphic.cpp
++.endif
+
+ moc_rgroupbox.o: moc_rgroupbox.cpp \
+@@ -1963,4 +1974,7 @@
+ rlistboxitem.h \
+ rwidget.h
++.if (${MACHINE_ARCH} == "alpha")
++ $(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rlayerwidget.cpp
++.endif
+
+ moc_rlibrarybrowser.o: moc_rlibrarybrowser.cpp \