summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-03-18 17:00:37 +0000
committerjmmv <jmmv@pkgsrc.org>2003-03-18 17:00:37 +0000
commit07ada1cbd555bf9ccc932233dfa50af3f66baff2 (patch)
tree8a6af60ddc42ea39153982a757fdd47c0c05e997 /devel
parent6b7643b00ff5dba9955e67813643b8f5724fdaaf (diff)
downloadpkgsrc-07ada1cbd555bf9ccc932233dfa50af3f66baff2.tar.gz
Fix linkage problem: LDFLAGS was not properly set, so rpaths for X11 were lost.
Use LIBTOOL_OVERRIDE. Sort USE_BUILDLINK2 to avoid pkglint warnings.
Diffstat (limited to 'devel')
-rw-r--r--devel/kdbg/Makefile11
-rw-r--r--devel/kdbg/distinfo4
-rw-r--r--devel/kdbg/patches/patch-aa16
3 files changed, 20 insertions, 11 deletions
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index c0bb3e209fa..0e8877e918c 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/03/11 13:30:40 markd Exp $
+# $NetBSD: Makefile,v 1.34 2003/03/18 17:00:37 jmmv Exp $
DISTNAME= kdbg-1.2.7
CATEGORIES= devel kde
@@ -10,12 +10,13 @@ HOMEPAGE= http://members.telecom.at/~johsixt/kdbg.html
COMMENT= Graphical User Interface around gdb using KDE
BUILD_USES_MSGFMT= yes
+
USE_BUILDLINK2= YES
+USE_GMAKE= YES
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-kde-version=3
diff --git a/devel/kdbg/distinfo b/devel/kdbg/distinfo
index 0cd5fae174a..e882b593307 100644
--- a/devel/kdbg/distinfo
+++ b/devel/kdbg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/03/11 13:30:40 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/03/18 17:00:37 jmmv Exp $
SHA1 (kdbg-1.2.7.tar.gz) = bc79c4573b45d0875848dbd56fddf26214241f5b
Size (kdbg-1.2.7.tar.gz) = 526415 bytes
-SHA1 (patch-aa) = 98dc1182a09cf809f2edf1a4343305b37e3ca8ab
+SHA1 (patch-aa) = 4f9f0f8288a0ed36852cf1100c148543a29183db
SHA1 (patch-ac) = ef7ae69e39d01db396da61cc2231b282095cd20d
diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
index 3f1b85cbe8a..9bdf89dd95c 100644
--- a/devel/kdbg/patches/patch-aa
+++ b/devel/kdbg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/03/11 13:30:41 markd Exp $
+$NetBSD: patch-aa,v 1.7 2003/03/18 17:00:37 jmmv Exp $
---- configure.orig Sun Feb 2 03:50:30 2003
+--- configure.orig 2003-03-18 17:35:40.000000000 +0000
+++ configure
-@@ -11112,7 +11112,7 @@ ac_ldflags_safe="$LDFLAGS"
+@@ -7766,7 +7766,7 @@ ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2003/03/11 13:30:41 markd Exp $
LIBS="$LIBS $LIBQT"
-@@ -11233,7 +11233,7 @@ ac_libs_safe="$LIBS"
+@@ -7887,7 +7887,7 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_includes"
LDFLAGS="$X_LDFLAGS"
@@ -20,3 +20,11 @@ $NetBSD: patch-aa,v 1.6 2003/03/11 13:30:41 markd Exp $
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
LIBRARY_PATH=
+@@ -10432,6 +10432,7 @@ fi
+
+
+ CXXFLAGS="$ac_cxxflags_safe"
++LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+
+ echo "$as_me:$LINENO: result: $this_is_kde3" >&5
+ echo "${ECHO_T}$this_is_kde3" >&6