summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2004-05-26 13:20:53 +0000
committermarkd <markd@pkgsrc.org>2004-05-26 13:20:53 +0000
commitf87f439fd1dec1eb6f8ec7693f2a1a58586cbf47 (patch)
treec327bec8037811eaa3f9d954255df81c25dbd72e
parent427eb601ce44c5337024409e5fcc6c6f87c4b10d (diff)
downloadpkgsrc-f87f439fd1dec1eb6f8ec7693f2a1a58586cbf47.tar.gz
Don't look at old kdm or xdm configs that may be on the machine when
creating the new kdm config as the output is non deterministic. Bump PKGREVISION.
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase3/PLIST3
-rw-r--r--x11/kdebase3/distinfo3
-rw-r--r--x11/kdebase3/patches/patch-aj13
4 files changed, 18 insertions, 5 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index bb319851ab4..b08c7a12c64 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2004/05/18 11:25:19 markd Exp $
+# $NetBSD: Makefile,v 1.52 2004/05/26 13:20:53 markd Exp $
DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 0629bf60246..236d99a5a79 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2004/05/13 14:14:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.20 2004/05/26 13:20:53 markd Exp $
bin/appletproxy
bin/drkonqi
bin/extensionproxy
@@ -2102,7 +2102,6 @@ share/kde/config/kdesktop_custom_menu2
share/kde/config/kdm/README
share/kde/config/kdm/Xaccess
share/kde/config/kdm/Xreset
-share/kde/config/kdm/Xresources
share/kde/config/kdm/Xservers
share/kde/config/kdm/Xsession
share/kde/config/kdm/Xsetup
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index d6d7e3285c4..db6d11d10f1 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2004/05/01 07:32:15 tron Exp $
+$NetBSD: distinfo,v 1.51 2004/05/26 13:20:53 markd Exp $
SHA1 (kdebase-3.2.2.tar.bz2) = bc941b3faa4440ca2048d9332371c974d0e17f5b
Size (kdebase-3.2.2.tar.bz2) = 17216476 bytes
@@ -15,6 +15,7 @@ SHA1 (patch-af) = ad9b3a97151c964d4adea2d8fecd780c6198b205
SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
SHA1 (patch-ah) = dad5cd23522073d088329b4da2c2978d807005bc
SHA1 (patch-ai) = 5638690e617dd27b88aa00928828d3ef585bd6ff
+SHA1 (patch-aj) = 3ed17b109394ce3d24accbbd6afcad40013d6b48
SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff --git a/x11/kdebase3/patches/patch-aj b/x11/kdebase3/patches/patch-aj
new file mode 100644
index 00000000000..93494ef0123
--- /dev/null
+++ b/x11/kdebase3/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.6 2004/05/26 13:20:53 markd Exp $
+
+--- kdm/kfrontend/Makefile.in.orig 2004-04-06 03:09:12.000000000 +1200
++++ kdm/kfrontend/Makefile.in
+@@ -602,7 +602,7 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+
+ # use 'make GENKDMCONF_FLAGS=... install' to override
+-GENKDMCONF_FLAGS =
++GENKDMCONF_FLAGS = --no-old
+ SUBDIRS = pics sessions
+ AM_CPPFLAGS = -I$(srcdir)/../backend -I$(top_srcdir)/kcontrol/background \
+ $(all_includes) $(XDMCP_DEFINE)