summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-02-24 00:05:00 +0000
committerjoerg <joerg@pkgsrc.org>2006-02-24 00:05:00 +0000
commit8507799fc1e2b35c0b130b44f6930efce66b0ab2 (patch)
tree93c3a5389204f065fa04634f2ec9426f33ce7a81 /math
parent81f5231e4f34b4edebeea48e7ac1b46067c21794 (diff)
downloadpkgsrc-8507799fc1e2b35c0b130b44f6930efce66b0ab2.tar.gz
Match PKGCONFIG_OVERRIDE with reality. Replace hard-coded -lpthread
reference to unbreak qalculate subpackages on DragonFly. Bump revision.
Diffstat (limited to 'math')
-rw-r--r--math/qalculate/Makefile11
-rw-r--r--math/qalculate/distinfo3
-rw-r--r--math/qalculate/patches/patch-ac11
3 files changed, 21 insertions, 4 deletions
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 231d287f02d..f4b91290be7 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/02/19 12:53:30 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/24 00:05:00 joerg Exp $
DISTNAME= libqalculate-0.8.2
PKGNAME= qalculate-0.8.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
@@ -16,10 +16,15 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE= ${WRKSRC}/src/libqalculate/libqalculate.pc.in
+PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in
UNLIMIT_RESOURCES= datasize
+SUBST_CLASSES+= pthread
+SUBST_FILES.pthread= libqalculate.pc.in
+SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
+SUBST_STAGE.pthread= post-patch
+
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../math/cln/buildlink3.mk"
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index fc9734d9491..891372c000f 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/01/03 20:54:15 joerg Exp $
+$NetBSD: distinfo,v 1.8 2006/02/24 00:05:00 joerg Exp $
SHA1 (libqalculate-0.8.2.tar.gz) = 70b6c31f2491c1bb1da8b28c98b594a9d76b4152
RMD160 (libqalculate-0.8.2.tar.gz) = 5a97646c249ac696e6334e56770a5c90c463d2f8
Size (libqalculate-0.8.2.tar.gz) = 683579 bytes
SHA1 (patch-aa) = 6d54e5ad2fde952ec96df7638ce73ea47cf684b1
SHA1 (patch-ab) = e3501b7df41fce3c214508f6a125f37ec15f4e99
+SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd
diff --git a/math/qalculate/patches/patch-ac b/math/qalculate/patches/patch-ac
new file mode 100644
index 00000000000..a1d1d6a978f
--- /dev/null
+++ b/math/qalculate/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2006/02/24 00:05:00 joerg Exp $
+
+--- libqalculate.pc.in.orig 2006-02-23 23:44:44.000000000 +0000
++++ libqalculate.pc.in
+@@ -7,5 +7,5 @@ Name: libqalculate
+ Description: libqalculate
+ Requires: glib-2.0 libxml-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @CLN_LIBS@ -lpthread -lqalculate
++Libs: -L${libdir} @CLN_LIBS@ @PTHREAD_LIBS@ -lqalculate
+ Cflags: -I${includedir} @CLN_CPPFLAGS@