diff options
| author | markd <markd> | 2005-09-03 21:34:44 +0000 |
|---|---|---|
| committer | markd <markd> | 2005-09-03 21:34:44 +0000 |
| commit | 72a0589332f9fc14b886ca64bd461788fd9d3ca6 (patch) | |
| tree | 66a186ccf549ec1bf0fd81abeb28775e32afcc27 /x11/kdebase3 | |
| parent | 2f55ca23ca2dc939abd761587641e2227271a604 (diff) | |
| download | pkgsrc-72a0589332f9fc14b886ca64bd461788fd9d3ca6.tar.gz | |
kdebase uses xmkmf to find out where base X11 binaries and libraries are
located and this is being confused by the pkgsrc tools wrappers so modify
its usage to conteract this. Fixes PR pkg/31058.
Bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3')
| -rw-r--r-- | x11/kdebase3/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-aa | 21 |
3 files changed, 19 insertions, 9 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 3ea26cf68a5..164d14ff0f7 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2005/08/29 10:36:54 jdc Exp $ +# $NetBSD: Makefile,v 1.88 2005/09/03 21:34:44 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 3495921c392..5a5c768c2c9 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2005/07/30 11:10:08 markd Exp $ +$NetBSD: distinfo,v 1.71 2005/09/03 21:34:44 markd Exp $ SHA1 (kdebase-3.4.2.tar.bz2) = 6df0c7c576a112a4e32f9e2e2b0d271dcb201f71 RMD160 (kdebase-3.4.2.tar.bz2) = bdb423ba3f95274cb20171a8e43482c5a09e804c @@ -12,7 +12,7 @@ Size (Daemon.README) = 2191 bytes SHA1 (NetBSD-flag.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c RMD160 (NetBSD-flag.png) = 2eac20df70396169819059a704e6a85ae10234b0 Size (NetBSD-flag.png) = 4532 bytes -SHA1 (patch-aa) = 5386271402506fe3024f0b152ef8cbee94315636 +SHA1 (patch-aa) = be18dabe9c66af9a7384ee652a80b7d971d4b5d6 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855 SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490 diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa index dd7ffc623ba..46771bd5ce2 100644 --- a/x11/kdebase3/patches/patch-aa +++ b/x11/kdebase3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 2005/04/14 21:01:48 markd Exp $ +$NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $ ---- configure.orig 2005-03-05 02:15:11.000000000 +1300 +--- configure.orig 2005-07-21 09:08:37.000000000 +1200 +++ configure -@@ -30682,7 +30682,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_ +@@ -30769,7 +30769,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_ # if you're trying to debug this check and think it's incorrect, # better check your installation. The check _is_ correct - your # installation is not. @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2005/04/14 21:01:48 markd Exp $ kde_cv_uic_plugins=yes fi fi -@@ -42279,6 +42279,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -42372,6 +42372,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_cv_have_dpms="-lXdpms" @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.13 2005/04/14 21:01:48 markd Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -44908,6 +44925,9 @@ case "$host" in +@@ -45004,6 +45021,9 @@ case "$host" in *-*-freebsd*) FOUND_USBVIEW=yes ;; @@ -45,7 +45,16 @@ $NetBSD: patch-aa,v 1.13 2005/04/14 21:01:48 markd Exp $ esac -@@ -52928,6 +52948,7 @@ fi +@@ -46214,7 +46234,7 @@ acimake: + + EOF + if $XMKMF >&5 2>&1 && test -f Makefile; then +- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"` ++ kde_cv_defines_imake=`${MAKE-make} PREFIX='${X11_ROOT}' acimake 2> /dev/null | grep -v "^make"` + kde_cv_defines_imake_version=$imkv + else + echo "$as_me:$LINENO: result: failed" >&5 +@@ -53104,6 +53124,7 @@ fi case "$UNAME" in Linux) LIBHOSTS="$LIBSENSORS" ;; FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;; |