head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.72
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.70
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.68
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.66
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.64
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.62
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.60
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.58
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.56
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.54
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.52
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.50
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.48
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.46
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.44
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.42
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.40
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.38
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.36
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.34
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.32
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.30
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.28
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.24
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.4
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.26
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.22
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.20
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.18
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.16
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.14
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.12
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.10
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.8
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.6
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.2
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.1.0.42
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.40
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.38
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.36
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.34
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.32
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.30
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.28
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.26
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.24
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.22
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.20
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.18
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.16
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.14
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.10
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.8
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.6
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2017.06.26.11.02.30;	author markd;	state Exp;
branches;
next	1.2;
commitid	znpUrhuYY5gbcSWz;

1.2
date	2017.06.25.19.58.04;	author youri;	state Exp;
branches;
next	1.1;
commitid	FVBYScUUvbc3cNWz;

1.1
date	2012.03.19.19.44.03;	author markd;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Revert two presumably unintended patches.
@
text
@$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $

Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX

--- kdm/kcm/main.cpp.orig	2010-05-27 17:23:09.000000000 +0000
+++ kdm/kcm/main.cpp
@@@@ -281,8 +281,12 @@@@ KConfig *KDModule::createTempConfig()
     pTempConfigFile->open();
     QString tempConfigName = pTempConfigFile->fileName();
 
+    QFile confFile (QString::fromLatin1( "@@PKG_SYSCONFDIR@@" "/kdm/kdmrc" ));
+    if ( !confFile.exists() )
+	confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+
     KConfig *pSystemKDMConfig = new KConfig(
-        QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
+        confFile.fileName(), KConfig::SimpleConfig);
 
     KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
     pTempConfig->sync();
@


1.2
log
@Fix NetBSD current build.
@
text
@d5 1
a5 1
--- kdm/kcm/main.cpp.orig	2015-08-12 07:03:15.000000000 +0000
d11 1
a11 1
+    QFile confFile (QString::fromLatin1( "/usr/pkg/etc" "/kdm/kdmrc" ));
@


1.1
log
@Update to KDE SC 4.8.0

add kactivities
rename kdebase4 -> kde-baseapps4
rename kdebase-runtime4 -> kde-runtime4
rename kdebase-workspace4 -> kde-workspace4
rename kdebindings4-python -> py-kde4
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.2 2010/10/25 20:55:28 markd Exp $
d5 1
a5 1
--- kdm/kcm/main.cpp.orig	2010-05-27 17:23:09.000000000 +0000
d11 1
a11 1
+    QFile confFile (QString::fromLatin1( "@@PKG_SYSCONFDIR@@" "/kdm/kdmrc" ));
@