From 3a27a4a0a4c5519b25d6f31c4990a238e5366dfb Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 5 Jan 2006 16:24:37 +0000
Subject: Always link the thread library explicitly when linking against qt-mt,
 needed on DragonFly and FreeBSD 4, not hurting on other platforms. Add
 DragonFly to the BSD enumeration.

---
 cad/qcad/Makefile         | 3 ++-
 cad/qcad/distinfo         | 6 +++---
 cad/qcad/patches/patch-aa | 4 ++--
 cad/qcad/patches/patch-ac | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'cad')

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 4638de5e84b..bfb2f9facc7 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/01/05 10:08:58 ghen Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/05 16:24:37 joerg Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@@ -52,4 +52,5 @@ do-install:
 # If it is, then remove this comment.  If it is not, then remove
 # this comment and the line below, and bump PKGREVISION.
 BUILDLINK_DEPMETHOD.qt3-tools=	full
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index d4ad09599f6..761d1b9aff4 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2005/08/18 23:51:24 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2006/01/05 16:24:37 joerg Exp $
 
 SHA1 (qcad-1.5.4-src.tar.gz) = d28f31bb392cdcd5d7ea9396647e07851757c790
 RMD160 (qcad-1.5.4-src.tar.gz) = 3afa9e1e8ff7e3dc3c064310c1ad586cd0a9cfc1
 Size (qcad-1.5.4-src.tar.gz) = 2884049 bytes
-SHA1 (patch-aa) = f2752f57849a237a66029dfd80d5afcbf533cddc
+SHA1 (patch-aa) = eb8288507af50870ac8d49c9feb69e7a37edf4e2
 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7
-SHA1 (patch-ac) = d3879d61fca6b47ba179b7991c7d718392c05d71
+SHA1 (patch-ac) = 1806cadf475ab4c53b327d26c98eea10189e99de
 SHA1 (patch-ad) = 873961829011b8717c154d4c4caf7e8c428a848e
 SHA1 (patch-af) = 61b18b29e50246dce977bc7cee24aaa2b78d4a95
diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 57865100af9..8a893905555 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2004/10/12 21:02:18 ben Exp $
+$NetBSD: patch-aa,v 1.9 2006/01/05 16:24:37 joerg Exp $
 
 --- Makefile.orig	2002-09-20 19:26:57.000000000 +0200
 +++ Makefile
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2004/10/12 21:02:18 ben Exp $
 -LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
 -AR       = ar cqs
 -RANLIB   = 
-+LIBS     = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
++LIBS     = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 +AR       ?= ar cqs
 +RANLIB   ?= 
  MOC      = $(QTDIR)/bin/moc
diff --git a/cad/qcad/patches/patch-ac b/cad/qcad/patches/patch-ac
index 15314829568..db3f2728ff4 100644
--- a/cad/qcad/patches/patch-ac
+++ b/cad/qcad/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/08/18 23:51:24 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2006/01/05 16:24:37 joerg Exp $
 
---- rprgdef.h.orig	2002-09-20 13:26:57.000000000 -0400
+--- rprgdef.h.orig	2002-09-20 17:26:57.000000000 +0000
 +++ rprgdef.h
 @@ -22,16 +22,27 @@
  //#define DEF_LESS_DIALOGS    // Don't show the startup dialog
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.3 2005/08/18 23:51:24 dmcmahill Exp $
  
 -#ifdef __FreeBSD__
 +
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  #define DEF_FREEBSD
  #undef DEF_LINUX
  #define RUNNING_LINUX   true    // close enough
-- 
cgit v1.2.3