From acaf474f80f526e29c8c9134e69580d11f7e9bca Mon Sep 17 00:00:00 2001
From: reinoud <reinoud@pkgsrc.org>
Date: Fri, 2 Jan 2004 18:11:06 +0000
Subject: Make qcad 1.5.4 compile again under NetBSD/alpha

---
 cad/qcad/Makefile         |  4 ++--
 cad/qcad/distinfo         |  4 ++--
 cad/qcad/patches/patch-aa | 20 ++++----------------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'cad')

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 313ac2a977f..039f7fb5412 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/08/05 13:35:36 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/02 18:11:06 reinoud Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
-PKGREVISION=		2
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=qcad/}
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 807ecdce900..0c083d1151e 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/04/29 21:51:53 jtb Exp $
+$NetBSD: distinfo,v 1.8 2004/01/02 18:11:06 reinoud Exp $
 
 SHA1 (qcad-1.5.4-src.tar.gz) = d28f31bb392cdcd5d7ea9396647e07851757c790
 Size (qcad-1.5.4-src.tar.gz) = 2884049 bytes
-SHA1 (patch-aa) = af0d42b157aac9f877741654c0c0a6b9dda939fa
+SHA1 (patch-aa) = b7e69c55aba5d026cd732267d0259ae89b7b394c
 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7
 SHA1 (patch-ac) = 3210453403685c1294547871eda4ec2f0df3c61a
 SHA1 (patch-ad) = 873961829011b8717c154d4c4caf7e8c428a848e
diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 32448a69b8b..f3200d40980 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2003/04/29 21:51:54 jtb Exp $
+$NetBSD: patch-aa,v 1.7 2004/01/02 18:11:06 reinoud Exp $
 
---- Makefile.orig
+--- Makefile.orig	2002-09-20 19:26:57.000000000 +0200
 +++ Makefile
 @@ -8,20 +8,20 @@
  
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.6 2003/04/29 21:51:54 jtb Exp $
  MOC      = $(QTDIR)/bin/moc
  UIC      = $(QTDIR)/bin/uic
  QMAKE    = qmake
-@@ -1766,10 +1766,16 @@
+@@ -1766,6 +1766,9 @@ moc_ractzoom.o: moc_ractzoom.cpp ractzoo
  
  moc_rappwin.o: moc_rappwin.cpp rappwin.h ractiondef.h \
  		rprgdef.h
@@ -43,14 +43,7 @@ $NetBSD: patch-aa,v 1.6 2003/04/29 21:51:54 jtb Exp $
  
  moc_rattribdialog.o: moc_rattribdialog.cpp rattribdialog.h rcombobox.h \
  		rgraphdef.h \
- 		rprgdef.h
-+.if (${MACHINE_ARCH} == "alpha")
-+	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rfontdialog.cpp
-+.endif
- 
- moc_rbuttongroup.o: moc_rbuttongroup.cpp rbuttongroup.h 
- 
-@@ -1836,8 +1842,14 @@
+@@ -1836,6 +1839,9 @@ moc_rgraphic.o: moc_rgraphic.cpp rgraphi
  		rtypes.h \
  		rprgdef.h \
  		rmathdef.h
@@ -59,9 +52,4 @@ $NetBSD: patch-aa,v 1.6 2003/04/29 21:51:54 jtb Exp $
 +.endif
  
  moc_rgroupbox.o: moc_rgroupbox.cpp rgroupbox.h 
-+.if (${MACHINE_ARCH} == "alpha")
-+	$(CXX) -c $(CXXFLAGS_NOOPT) $(INCPATH) -o $@ moc_rlayerwidget.cpp
-+.endif
  
- moc_rhatchdialog.o: moc_rhatchdialog.cpp rhatchdialog.h rcombobox.h \
- 		rgraphdef.h \
-- 
cgit v1.2.3