Uses libtool and C++, patch away

3 files changed, 61 insertions, 2 deletions

diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index 2e1df0ea56c..01963e3a17b 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/05/07 13:51:20 joerg Exp $
 
 DISTNAME=	qalculate-kde-0.9.3.1
 PKGREVISION=	1
@@ -12,7 +12,9 @@ COMMENT=	Qalculate is a modern multi-purpose desktop calculator
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=	wget>=1.8:../../net/wget
 
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/kde
diff --git a/math/qalculate-kde/distinfo b/math/qalculate-kde/distinfo
index 285ed53e451..fe81bb54d74 100644
--- a/math/qalculate-kde/distinfo
+++ b/math/qalculate-kde/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/04/17 07:48:52 adam Exp $
+$NetBSD: distinfo,v 1.5 2006/05/07 13:51:20 joerg Exp $
 
 SHA1 (qalculate-kde-0.9.3.1.tar.gz) = 4e911c282babaf64dcafb958900682317320acbd
 RMD160 (qalculate-kde-0.9.3.1.tar.gz) = d087a3565af3ef7f27af1e66a48a41afbfb6509b
 Size (qalculate-kde-0.9.3.1.tar.gz) = 1486268 bytes
 SHA1 (patch-aa) = a9738cdb6ce9e27a7202e6c415af739a2fab3ef5
+SHA1 (patch-ab) = 602c47ba0bb574e4d66e86fffc8129ed41c7b4f7
diff --git a/math/qalculate-kde/patches/patch-ab b/math/qalculate-kde/patches/patch-ab
new file mode 100644
index 00000000000..d3d6b15d75c
--- /dev/null
+++ b/math/qalculate-kde/patches/patch-ab
@@ -0,0 +1,56 @@
+$NetBSD: patch-ab,v 1.1 2006/05/07 13:51:20 joerg Exp $
+
+--- configure.orig	2006-05-07 13:22:42.000000000 +0000
++++ configure
+@@ -27325,13 +27325,13 @@ fi
+   fi
+ 
+   if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27390,7 +27390,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  LIBPTHREAD="-lpthread"
++  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+   fi
+@@ -31113,13 +31113,13 @@ _ACEOF
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31178,7 +31178,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  LIBS="$LIBS -lpthread"
++  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+