[pkgsrc/trunk]: pkgsrc/x11/qt3-libs Fix library linkage for Interix.

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b0c0d96a9f2
branches:  trunk
changeset: 481821:3b0c0d96a9f2
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 13 12:06:36 2004 +0000

description:
Fix library linkage for Interix.

diffstat:

 x11/qt3-libs/Makefile.common  |  3 ++-
 x11/qt3-libs/distinfo         |  4 ++--
 x11/qt3-libs/patches/patch-ib |  8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (68 lines):

diff -r aebc0e8e11bb -r 3b0c0d96a9f2 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Wed Oct 13 12:05:51 2004 +0000
+++ b/x11/qt3-libs/Makefile.common      Wed Oct 13 12:06:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2004/10/13 02:08:43 tv Exp $
+# $NetBSD: Makefile.common,v 1.36 2004/10/13 12:06:36 tv Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -59,6 +59,7 @@
 CFLAGS+=               -I/usr/local/include/bind
 LDFLAGS+=              -L/usr/local/lib/bind -lbind
 BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS=              -lbind -ldl
 .endif
 
 .if !exists(${X11BASE}/lib/libXinerama.so)
diff -r aebc0e8e11bb -r 3b0c0d96a9f2 x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Wed Oct 13 12:05:51 2004 +0000
+++ b/x11/qt3-libs/distinfo     Wed Oct 13 12:06:36 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2004/10/13 02:08:43 tv Exp $
+$NetBSD: distinfo,v 1.26 2004/10/13 12:06:36 tv Exp $
 
 SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585
 Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes
@@ -16,4 +16,4 @@
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = 0493bc7a0e9b9fa3c88f77b6fc89f77a3e4e3481
 SHA1 (patch-ia) = c02d328458c49f6070e86b56de84bce776cfce1f
-SHA1 (patch-ib) = 5744905e7a2b97d951f30f2da01a0de64ac26b7e
+SHA1 (patch-ib) = 81a901ee3bcee6525d9bcd064aab70d4fe0afb8d
diff -r aebc0e8e11bb -r 3b0c0d96a9f2 x11/qt3-libs/patches/patch-ib
--- a/x11/qt3-libs/patches/patch-ib     Wed Oct 13 12:05:51 2004 +0000
+++ b/x11/qt3-libs/patches/patch-ib     Wed Oct 13 12:06:36 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ib,v 1.1 2004/10/13 02:08:43 tv Exp $
+$NetBSD: patch-ib,v 1.2 2004/10/13 12:06:36 tv Exp $
 
 --- mkspecs/interix-g++/qmake.conf.orig        Tue Oct 12 16:51:42 2004
 +++ mkspecs/interix-g++/qmake.conf
@@ -16,7 +16,7 @@
 +QMAKE_LEXFLAGS                = 
 +QMAKE_YACC            = yacc
 +QMAKE_YACCFLAGS               = -d
-+QMAKE_CFLAGS          = -pipe
++QMAKE_CFLAGS          = -pipe -I/usr/local/include/bind
 +QMAKE_CFLAGS_DEPS     = -M
 +QMAKE_CFLAGS_WARN_ON  = -Wall -W
 +QMAKE_CFLAGS_WARN_OFF = -w
@@ -49,7 +49,7 @@
 +QMAKE_LINK            = g++
 +QMAKE_LINK_SHLIB      = g++
 +QMAKE_LINK_SHLIB_CMD    = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-+QMAKE_LFLAGS          =
++QMAKE_LFLAGS          = -L/usr/local/lib/bind
 +QMAKE_LFLAGS_RELEASE  =
 +QMAKE_LFLAGS_DEBUG    =
 +QMAKE_LFLAGS_SHLIB    = -shared
@@ -60,7 +60,7 @@
 +
 +QMAKE_LIBS            =
 +QMAKE_LIBS_DYNLOAD    =
-+QMAKE_LIBS_X11                = -lXext -lX11 -lm
++QMAKE_LIBS_X11                = -lXext -lX11 -lm -ldl -lbind
 +QMAKE_LIBS_X11SM      = -lSM -lICE
 +QMAKE_LIBS_QT         = -lqt
 +QMAKE_LIBS_QT_THREAD  = -lqt-mt