diff options
| author | skrll <skrll> | 2002-03-28 08:57:38 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2002-03-28 08:57:38 +0000 |
| commit | aea14107900e99a120b545aff92c5fbd94a0780c (patch) | |
| tree | c73ce13e1fede193e0e83b6079e64bd7c1832074 | |
| parent | 9741a6cf87f49bcbd57a092eacca8b6855675f04 (diff) | |
| download | pkgsrc-aea14107900e99a120b545aff92c5fbd94a0780c.tar.gz | |
Do the kded fix differently.
Don't mess with startkde which caused timing problems on slower machines
(see pkg/16071). Instead, delete the kded module files so that kdeinit
falls back to exec(3)ing the binary.
(bye bye sed script)
| -rw-r--r-- | x11/kdebase2/Makefile | 10 | ||||
| -rw-r--r-- | x11/kdelibs2/Makefile | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index ef9a55308e4..8c66b18675d 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/03/25 11:02:36 skrll Exp $ +# $NetBSD: Makefile,v 1.37 2002/03/28 08:57:38 skrll Exp $ DISTNAME= kdebase-2.2.2 PKGREVISION= 1 @@ -115,14 +115,6 @@ post-install: ${SED} -e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/${ICONDIR}/Daemon.png|' \ kdmrc > ${WRKDIR}/kdmrc.ad; \ ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc -. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} - cd ${PREFIX}/bin; \ - ${SED} \ - -e '1{x;s/^/kded/;x;}' \ - -e '/LD_BIND_NOW=true/{ s:kdeinit:& --no-kded:;G; }' \ - startkde > ${WRKDIR}/startkde.fix; \ - ${CP} -f ${WRKDIR}/startkde.fix startkde -. endif .endif .include "../../databases/openldap/buildlink.mk" diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 9bcfc1a9847..21a232e987b 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2002/03/15 04:09:14 markd Exp $ +# $NetBSD: Makefile,v 1.35 2002/03/28 08:57:39 skrll Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 1 @@ -56,6 +56,14 @@ PLIST_SUBST+= CUPS= PLIST_SUBST+= CUPS="@comment " .endif +.if ${OPSYS} == "NetBSD" +. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} +PLIST_SUBST+= KDED_WORKAROUND="@comment " +. else +PLIST_SUBST+= KDED_WORKAROUND="" +. endif +.endif + # Add a newline to EOF so patch on Solaris succeeds with patch-bk pre-patch: @@ -70,6 +78,11 @@ ICONDIRS= actions/kde actions apps devices filesystems mimetypes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kde/locale +.if ${OPSYS} == "NetBSD" +. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} + @${RM} ${PREFIX}/lib/kded.* +. endif +.endif @( ${CAT} ${PKGDIR}/PLIST; \ for color in ${ICONCOLORS}; do \ colordir=share/kde/icons/$${color}; \ |