summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-05-22 07:11:58 +0000
committerjperkin <jperkin@pkgsrc.org>2013-05-22 07:11:58 +0000
commitbef0bc729ad46bd25a5442529f192374d6fb3b29 (patch)
tree58a1427637636e083b2e2fc349d9d3eed36f7b7c
parent522088fab366a5fe43765c05f3de941c19320f2f (diff)
downloadpkgsrc-bef0bc729ad46bd25a5442529f192374d6fb3b29.tar.gz
Build fixes for SunOS.
-rw-r--r--x11/kde-runtime4/Makefile8
-rw-r--r--x11/kde-runtime4/distinfo3
-rw-r--r--x11/kde-runtime4/patches/patch-kwalletd_backend_blowfish.h15
3 files changed, 22 insertions, 4 deletions
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index c18a0be0735..a724a4e7e04 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/05/21 12:49:37 markd Exp $
+# $NetBSD: Makefile,v 1.25 2013/05/22 07:11:58 jperkin Exp $
DISTNAME= kde-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -22,9 +22,11 @@ USE_TOOLS+= gmake
# Some files are conditional on 'md5sum' or 'md5' being present.
PLIST_VARS+= md5
-.if ${OPSYS} != "SunOS"
+.for dir in ${PATH:C/\:/ /g}
+. if exists(${dir}/md5sum) || exists(${dir}/md5)
PLIST.md5= yes
-.endif
+. endif
+.endfor
SUBST_CLASSES+= htdig
SUBST_STAGE.htdig= post-patch
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index f42692f81d1..6b27f72635b 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/05/21 12:49:37 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/05/22 07:11:58 jperkin Exp $
SHA1 (kde-runtime-4.10.3.tar.xz) = 22869b2ee7eb4b5b341a6d596dd904c0b0b812d1
RMD160 (kde-runtime-4.10.3.tar.xz) = 707da4cb365f283d6e5f9af69b7bb8d109c9d8cc
@@ -11,3 +11,4 @@ SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
+SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457
diff --git a/x11/kde-runtime4/patches/patch-kwalletd_backend_blowfish.h b/x11/kde-runtime4/patches/patch-kwalletd_backend_blowfish.h
new file mode 100644
index 00000000000..7e43b3e0ca7
--- /dev/null
+++ b/x11/kde-runtime4/patches/patch-kwalletd_backend_blowfish.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-kwalletd_backend_blowfish.h,v 1.1 2013/05/22 07:11:58 jperkin Exp $
+
+--- kwalletd/backend/blowfish.h.orig 2013-03-01 06:34:47.475075625 +0000
++++ kwalletd/backend/blowfish.h
+@@ -29,6 +29,10 @@
+ #ifdef HAVE_SYS_BITYPES_H
+ #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
+ #endif
++#ifdef __sun
++#undef _S
++#undef _P
++#endif
+
+ #include "blockcipher.h"
+ #include <kwallet_export.h>