diff options
| author | joerg <joerg> | 2006-01-05 16:24:37 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-05 16:24:37 +0000 |
| commit | c7fdfd86005bd58588817e246dd005a18b6ccd4a (patch) | |
| tree | 5a27c0a515067118ded9551d2342b87a30244b31 /cad/qcad/patches | |
| parent | 9aefc0aa315bb117a96dfb081a0da899d7dcd788 (diff) | |
| download | pkgsrc-c7fdfd86005bd58588817e246dd005a18b6ccd4a.tar.gz | |
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.
Diffstat (limited to 'cad/qcad/patches')
| -rw-r--r-- | cad/qcad/patches/patch-aa | 4 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-ac | 6 |
2 files changed, 5 insertions, 5 deletions
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 |