, <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 02/05/2005 23:22:41
Hello Mark and tech-pkg!
I had noticed a while ago that kdelibs3 and kdebase3 used $PREFIX/etc. So
I made some changes to use share/examples/... and CONF_FILES for this.
I am not sure of the best way. I provide some patches below.
From some quick tests, it appears to be fine for me for upgrading from
3.3.1 today.
One problem with my patches is that I found several files missing from the
PLISTs that were unrelated to my initial goal. (This was built under
Linux.)
? x11/kdelibs3/patches/patch-ab
? x11/kdebase3/patches/patch-ga
? x11/kdebase3/patches/patch-gb
These three patches are at end of this email.
Also please ignore the BUILDLINK_TRANSFORM and some other random comments.
cvs diff: Diffing meta-pkgs/kde3
Index: meta-pkgs/kde3/kde3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/kde3/kde3.mk,v
retrieving revision 1.4
diff -b -u -r1.4 kde3.mk
--- meta-pkgs/kde3/kde3.mk 10 Dec 2004 05:59:50 -0000 1.4
+++ meta-pkgs/kde3/kde3.mk 6 Feb 2005 07:14:48 -0000
@@ -44,8 +44,10 @@
KDEDIR?= ${PREFIX}
QTDIR?= ${PREFIX}/qt3
+#jcr#PKG_SYSCONFSUBDIR?= kde # this will break /etc/kdm
CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde"
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}"
CONFIGURE_ARGS+= --with-extra-includes="${_KDE3_EXTRA_INCLUDES}"
CONFIGURE_ARGS+= --disable-rpath
@@ -60,7 +62,7 @@
_KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include
KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \
- ${KDEDIR}/etc/config.site
+ ${PKG_SYSCONFDIR}/kde/config.site
CONFIGURE_ENV+= KDEDIR="${KDEDIR}"
CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}"
cvs diff: Diffing meta-pkgs/kde3/files
cvs diff: Diffing x11/kdelibs3
Index: x11/kdelibs3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs3/Makefile,v
retrieving revision 1.76
diff -b -u -r1.76 Makefile
--- x11/kdelibs3/Makefile 31 Jan 2005 09:55:15 -0000 1.76
+++ x11/kdelibs3/Makefile 6 Feb 2005 07:14:48 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.76 2005/01/31 09:55:15 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -10,10 +10,16 @@
CONFLICTS+= koffice3<=1.1.1
USE_BUILDLINK3= YES
+BUILDLINK_TRANSFORM+= rm:-Wl,--allow-shlib-undefined
+BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
USE_DIRS+= xdg-1.1
USE_PERL5= run
USE_PKGINSTALL= YES
+MAKE_DIRS+= ${PKG_SYSCONFBASE}/xdg/menus
+CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \
+ ${PKG_SYSCONFBASE}/xdg/menus/applications.menu
+
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog
@@ -54,6 +60,7 @@
.include "../../print/cups/buildlink3.mk"
PLIST_SUBST+= CUPS=
.else
+CONFIGURE_ARGS+= --disable-cups
PLIST_SUBST+= CUPS="@comment "
.endif
@@ -68,10 +75,9 @@
.endif
.include "../../mk/krb5.buildlink3.mk"
+#CONFIGURE_ARGS+= --with-gssapi=no
CONFIGURE_ARGS+= --with-gssapi=yes
-
-
post-install:
.if ${OPSYS} == "NetBSD"
. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
@@ -86,6 +92,7 @@
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
+#CONFIGURE_ARGS+= --without-arts
.include "../../audio/arts/buildlink3.mk"
.include "../../audio/libaudiofile/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
@@ -130,3 +137,5 @@
# so force this as configure gets this wrong on Solaris 9
CONFIGURE_ENV+= ac_cv_lib_bzip2='no'
.endif
+
+#MAKE_ENV+= LD_LIBRARY_PATH=/usr/X11R6/lib
Index: x11/kdelibs3/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs3/PLIST,v
retrieving revision 1.21
diff -b -u -r1.21 PLIST
--- x11/kdelibs3/PLIST 14 Dec 2004 10:58:30 -0000 1.21
+++ x11/kdelibs3/PLIST 6 Feb 2005 07:15:08 -0000
@@ -58,7 +58,6 @@
bin/makekdewidgets
bin/meinproc
bin/preparetips
-etc/xdg/menus/applications.menu
include/arts/artskde.h
include/arts/kartsdispatcher.h
include/arts/kartsfloatwatch.h
@@ -753,6 +752,7 @@
lib/kde3/kimg_dds.la
lib/kde3/kimg_eps.la
lib/kde3/kimg_ico.la
+lib/kde3/kimg_jp2.la
lib/kde3/kimg_pcx.la
lib/kde3/kimg_rgb.la
lib/kde3/kimg_tga.la
@@ -835,6 +835,7 @@
lib/libkwalletclient.la
lib/libvcard.la
share/applications/kde/kresources.desktop
+${CUPS}share/cups/model/postscript.ppd.gz
share/doc/kde/HTML/en/common/1.png
share/doc/kde/HTML/en/common/10.png
share/doc/kde/HTML/en/common/2.png
@@ -885,6 +886,7 @@
share/doc/kde/HTML/en/kspell/common
share/doc/kde/HTML/en/kspell/index.cache.bz2
share/doc/kde/HTML/en/kspell/index.docbook
+share/examples/kdelibs3/applications.menu
share/kde/apps/LICENSES/ARTISTIC
share/kde/apps/LICENSES/BSD
share/kde/apps/LICENSES/GPL_V2
@@ -1024,6 +1026,10 @@
share/kde/apps/kdeprint/apsdriver2
${CUPS}share/kde/apps/kdeprint/cups_logo.png
${CUPS}share/kde/apps/kdeprint/cupsd.conf.template
+${CUPS}share/kde/apps/kdeprint/plugins/cups.print
+${CUPS}share/kde/apps/kdeprint/cupsd.conf.template
+share/kde/apps/kdeprint/preview.png
+share/kde/apps/kdeprint/preview-mini.png
share/kde/apps/kdeprint/filters/enscript.desktop
share/kde/apps/kdeprint/filters/enscript.xml
share/kde/apps/kdeprint/filters/imagetops.desktop
@@ -4433,6 +4439,7 @@
share/kde/services/http_cache_cleaner.desktop
share/kde/services/https.protocol
share/kde/services/ico.kimgio
+share/kde/services/jp2.kimgio
share/kde/services/jpeg.kimgio
share/kde/services/katepart.desktop
share/kde/services/kbzip2filter.desktop
@@ -4801,6 +4808,7 @@
@dirrm share/kde/apps/LICENSES
@dirrm share/kde/apps
@comment in kde: @dirrm share/kde
+@dirrm share/examples/kdelibs3
@dirrm share/doc/kde/HTML/en/kspell
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/libkmid/html
@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/libkmid/html
@@ -4864,6 +4872,7 @@
@dirrm share/doc/kde/HTML/en
@dirrm share/doc/kde/HTML
@dirrm share/doc/kde
+${CUPS}@dirrm share/cups/model
@dirrm share/applications/kde
@dirrm lib/kde3/plugins/styles
@dirrm lib/kde3/plugins/designer
@@ -4887,4 +4896,3 @@
@dirrm include/kabc
@dirrm include/dom
@comment in arts: @dirrm include/arts
-@comment dirrm etc/xdg/menus
Index: x11/kdelibs3/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs3/distinfo,v
retrieving revision 1.48
diff -b -u -r1.48 distinfo
--- x11/kdelibs3/distinfo 5 Jan 2005 10:36:23 -0000 1.48
+++ x11/kdelibs3/distinfo 6 Feb 2005 07:15:08 -0000
@@ -3,11 +3,12 @@
SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f
Size (kdelibs-3.3.2.tar.bz2) = 15623180 bytes
SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
+SHA1 (patch-ab) = cdcca5aaa02edd6909bf5a4efbfa456441eb522e
SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
SHA1 (patch-ae) = 8395dd9f24fb9cad91c1c04951dfc982cc8068f4
SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
-SHA1 (patch-an) = 0fccfa014212073f235945732ef3a3329756f9b5
+SHA1 (patch-an) = 3da384145e50820320ae389a7043a1d94ebf2025
SHA1 (patch-ao) = 5cc9be57db26a2615ae9c982eb2b894c2c193e6b
SHA1 (patch-ap) = bd0aa3b4a4b56cd74b674ce191b48268adecc8b9
SHA1 (patch-aq) = 0cbe989b24378a2f0218f6a32328ce56aa812de4
cvs diff: Diffing x11/kdelibs3/patches
Index: x11/kdelibs3/patches/patch-an
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs3/patches/patch-an,v
retrieving revision 1.6
diff -b -u -r1.6 patch-an
--- x11/kdelibs3/patches/patch-an 11 Dec 2004 01:19:29 -0000 1.6
+++ x11/kdelibs3/patches/patch-an 6 Feb 2005 07:15:08 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.6 2004/12/11 01:19:29 markd Exp $
+$NetBSD$
---- kdecore/kstandarddirs.cpp.orig 2004-01-26 06:24:42.000000000 +1300
+--- kdecore/kstandarddirs.cpp.orig 2004-10-03 00:40:15.000000000 -0700
+++ kdecore/kstandarddirs.cpp
-@@ -847,33 +847,33 @@ static int tokenize( QStringList& tokens
+@@ -920,33 +920,33 @@ static int tokenize( QStringList& tokens
QString KStandardDirs::kde_default(const char *type) {
if (!strcmp(type, "data"))
@@ -27,8 +27,7 @@
- return "share/sounds/";
+ return "share/kde/sounds/";
if (!strcmp(type, "locale"))
-- return "share/locale/";
-+ return "@PKGLOCALEDIR@/locale/";
+ return "share/locale/";
if (!strcmp(type, "services"))
- return "share/services/";
+ return "share/kde/services/";
@@ -50,7 +49,7 @@
if (!strcmp(type, "exe"))
return "bin/";
if (!strcmp(type, "lib"))
-@@ -889,7 +889,7 @@ QString KStandardDirs::kde_default(const
+@@ -962,7 +962,7 @@ QString KStandardDirs::kde_default(const
if (!strcmp(type, "xdgconf-menu"))
return "menus/";
if (!strcmp(type, "kcfg"))
@@ -59,7 +58,15 @@
qFatal("unknown resource type %s", type);
return QString::null;
}
-@@ -1129,6 +1129,7 @@ void KStandardDirs::addKDEDefaults()
+@@ -1187,7 +1187,6 @@ void KStandardDirs::addKDEDefaults()
+ else
+ {
+ xdgdirList.clear();
+- xdgdirList.append("/etc/xdg");
+ xdgdirList.append(KDESYSCONFDIR "/xdg");
+ }
+
+@@ -1232,6 +1231,7 @@ void KStandardDirs::addKDEDefaults()
}
xdgdirList.append("/usr/local/share/");
@@ -67,3 +74,21 @@
xdgdirList.append("/usr/share/");
}
+@@ -1402,7 +1402,7 @@ bool KStandardDirs::addCustomized(KConfi
+ for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++)
+ {
+ addPrefix(*it, priority);
+- addXdgConfigPrefix(*it+"/etc/xdg", priority);
++ addXdgConfigPrefix(*it+"/xdg", priority);
+ addXdgDataPrefix(*it+"/share", priority);
+ }
+ // If there are no prefixes defined, check if there is a directory
+@@ -1411,7 +1411,7 @@ bool KStandardDirs::addCustomized(KConfi
+ {
+ QString dir = profileDirsPrefix + profile;
+ addPrefix(dir, priority);
+- addXdgConfigPrefix(dir+"/etc/xdg", priority);
++ addXdgConfigPrefix(dir+"/xdg", priority);
+ addXdgDataPrefix(dir+"/share", priority);
+ }
+
cvs diff: Diffing x11/kdebase3
Index: x11/kdebase3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdebase3/Makefile,v
retrieving revision 1.66
diff -b -u -r1.66 Makefile
--- x11/kdebase3/Makefile 28 Dec 2004 02:47:52 -0000 1.66
+++ x11/kdebase3/Makefile 6 Feb 2005 07:15:09 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.66 2004/12/28 02:47:52 reed Exp $
DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
@@ -14,12 +14,15 @@
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK3= YES
+BUILDLINK_TRANSFORM+= rm:-Wl,--allow-shlib-undefined
+BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
USE_DIRS+= xdg-1.1
USE_PKGINSTALL= YES
USE_GNU_TOOLS+= awk
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap}"
+#jcr#CONFIGURE_ARGS+= --without-shadow
CONFIGURE_ARGS+= --without-pam
CONFIGURE_ARGS+= --without-cdparanoia
CONFIGURE_ARGS+= --without-lame
@@ -37,8 +40,21 @@
kwin/data/pluginlibFix.pl \
konsole/schemaStrip.pl
+# the next should be share/examples/kdebase3 ??
CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \
${PKG_SYSCONFDIR}/kdm/kdmrc
+CONF_FILES+= ${PREFIX}/share/examples/kdebase3/ksysguarddrc \
+ ${PKG_SYSCONFDIR}/ksysguarddrc
+CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-information.menu \
+ ${PKG_SYSCONFBASE}/xdg/menus/kde-information.menu
+CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-screensavers.menu \
+ ${PKG_SYSCONFBASE}/xdg/menus/kde-screensavers.menu
+CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-settings.menu \
+ ${PKG_SYSCONFBASE}/xdg/menus/kde-settings.menu
+# maybe should make this install one directory lower?
+CONF_FILES+= ${PREFIX}/share/examples/kdebase3/applications-merged/kde-essential.menu \
+ ${PKG_SYSCONFBASE}/xdg/menus/applications-merged/kde-essential.menu
+MAKE_DIRS+= ${PKG_SYSCONFBASE}/xdg/menus/applications-merged
OWN_DIRS= ${PKG_SYSCONFDIR}/kdm
RCD_SCRIPTS= kdm
@@ -56,6 +72,10 @@
#
CONFIGURE_ENV+= RUN_KAPPFINDER=no
+## just temporary
+#CONFIGURE_ENV+= LD_LIBRARY_PATH=/usr/X11R6/lib
+#MAKE_ENV+= LD_LIBRARY_PATH=/usr/X11R6/lib
+
PLIST_SRC+= ${PKGDIR}/PLIST
PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase
@@ -90,7 +110,7 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/${ICONDIR}
${INSTALL_DATA} ${DISTDIR}/Daemon.README \
- ${PREFIX}/share/doc/kde/HTML/en/kdm
+ ${PREFIX}/share/doc/kde/HTML/en/kdm/Daemon.README
@# The global desktop template files need to be user-writeable, or
@# else users won't be able to alter them after copying them to
Index: x11/kdebase3/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdebase3/PLIST,v
retrieving revision 1.27
diff -b -u -r1.27 PLIST
--- x11/kdebase3/PLIST 10 Dec 2004 06:05:16 -0000 1.27
+++ x11/kdebase3/PLIST 6 Feb 2005 07:15:26 -0000
@@ -71,11 +71,6 @@
bin/nspluginscan
bin/nspluginviewer
bin/startkde
-etc/ksysguarddrc
-etc/xdg/menus/applications-merged/kde-essential.menu
-etc/xdg/menus/kde-information.menu
-etc/xdg/menus/kde-screensavers.menu
-etc/xdg/menus/kde-settings.menu
include/KBackgroundIface.h
include/KDesktopIface.h
include/KScreensaverIface.h
@@ -142,6 +137,7 @@
lib/kde3/childpanel_panelextension.la
lib/kde3/clock_panelapplet.la
lib/kde3/cursorthumbnail.la
+lib/kde3/devices_panelapplet.la
lib/kde3/djvuthumbnail.la
lib/kde3/dockbar_panelextension.la
lib/kde3/extensionproxy.la
@@ -172,6 +168,7 @@
lib/kde3/kcm_info.la
lib/kde3/kcm_input.la
lib/kde3/kcm_ioslaveinfo.la
+lib/kde3/kcm_joystick.la
lib/kde3/kcm_kded.la
lib/kde3/kcm_kdm.la
lib/kde3/kcm_keyboard.la
@@ -203,7 +200,9 @@
lib/kde3/kcm_spellchecking.la
lib/kde3/kcm_style.la
lib/kde3/kcm_taskbar.la
+lib/kde3/kcm_usb.la
lib/kde3/kcm_useraccount.la
+lib/kde3/kcm_view1394.la
lib/kde3/kcm_xinerama.la
lib/kde3/kcminit.la
lib/kde3/kcmshell.la
@@ -212,6 +211,7 @@
lib/kde3/kded_favicons.la
lib/kde3/kded_konqy_preloader.la
lib/kde3/kded_kwrited.la
+lib/kde3/kded_mountwatcher.la
lib/kde3/kdesktop.la
lib/kde3/keditbookmarks.la
lib/kde3/kfile_font.la
@@ -228,6 +228,7 @@
lib/kde3/kickermenu_recentdocs.la
lib/kde3/kio_about.la
lib/kde3/kio_cgi.la
+lib/kde3/kio_devices.la
lib/kde3/kio_filter.la
lib/kde3/kio_finger.la
lib/kde3/kio_fish.la
@@ -378,6 +379,7 @@
share/applications/kde/interrupts.desktop
share/applications/kde/ioports.desktop
share/applications/kde/ioslaveinfo.desktop
+share/applications/kde/joystick.desktop
share/applications/kde/kappfinder.desktop
share/applications/kde/kate.desktop
share/applications/kde/kcm_useraccount.desktop
@@ -393,6 +395,8 @@
share/applications/kde/kcmperformance.desktop
share/applications/kde/kcmsmserver.desktop
share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
+share/applications/kde/kcmview1394.desktop
share/applications/kde/kdepasswd.desktop
share/applications/kde/kdeprintfax.desktop
share/applications/kde/kdm.desktop
@@ -971,6 +975,11 @@
share/doc/kde/HTML/en/kxkb/common
share/doc/kde/HTML/en/kxkb/index.cache.bz2
share/doc/kde/HTML/en/kxkb/index.docbook
+share/examples/kdebase3/applications-merged/kde-essential.menu
+share/examples/kdebase3/kde-information.menu
+share/examples/kdebase3/kde-screensavers.menu
+share/examples/kdebase3/kde-settings.menu
+share/examples/kdebase3/ksysguarddrc
share/kde/applnk/.hidden/battery.desktop
share/kde/applnk/.hidden/bwarning.desktop
share/kde/applnk/.hidden/cwarning.desktop
@@ -1272,6 +1281,8 @@
share/kde/apps/kcmkeys/win4.kksrc
share/kde/apps/kcmkeys/wm3.kksrc
share/kde/apps/kcmlocale/pics/background.png
+share/kde/apps/kcmusb/usb.ids
+share/kde/apps/kcmview1394/oui.db
share/kde/apps/kconf_update/convertShortcuts.pl
share/kde/apps/kconf_update/favicons.upd
share/kde/apps/kconf_update/kaccel.upd
@@ -1545,6 +1556,7 @@
share/kde/apps/khotkeys/kde32b1.khotkeys
share/kde/apps/khotkeys/konqueror_gestures_kde321.khotkeys
share/kde/apps/kicker/applets/clockapplet.desktop
+share/kde/apps/kicker/applets/devicesapplet.desktop
share/kde/apps/kicker/applets/klipper.desktop
share/kde/apps/kicker/applets/ksysguardapplet.desktop
share/kde/apps/kicker/applets/lockout.desktop
@@ -1716,12 +1728,14 @@
share/kde/apps/konqsidebartng/dirtree/history_module.desktop
share/kde/apps/konqsidebartng/entries/.version
share/kde/apps/konqsidebartng/entries/bookmarks.desktop
+share/kde/apps/konqsidebartng/entries/devices.desktop
share/kde/apps/konqsidebartng/entries/history.desktop
share/kde/apps/konqsidebartng/entries/home.desktop
share/kde/apps/konqsidebartng/entries/remote.desktop
share/kde/apps/konqsidebartng/entries/root.desktop
share/kde/apps/konqsidebartng/entries/services.desktop
share/kde/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/kde/apps/konqsidebartng/kicker_entries/devices.desktop
share/kde/apps/konqsidebartng/kicker_entries/history.desktop
share/kde/apps/konqsidebartng/kicker_entries/home.desktop
share/kde/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1788,9 +1802,23 @@
share/kde/apps/konqueror/profiles/simplebrowser
share/kde/apps/konqueror/profiles/tabbedbrowsing
share/kde/apps/konqueror/profiles/webbrowsing
+share/kde/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
share/kde/apps/konqueror/servicemenus/installfont.desktop
share/kde/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
share/kde/apps/konqueror/servicemenus/konsolehere.desktop
+share/kde/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
share/kde/apps/konqueror/servicemenus/text-ada-print.desktop
share/kde/apps/konqueror/servicemenus/text-c++-print.desktop
share/kde/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1809,6 +1837,8 @@
share/kde/apps/konqueror/servicemenus/text-tex-print.desktop
share/kde/apps/konqueror/servicemenus/text-xml-print.desktop
share/kde/apps/konqueror/servicemenus/text-xslt-print.desktop
+share/kde/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
+share/kde/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
share/kde/apps/konqueror/tiles/bluemorning.png
share/kde/apps/konqueror/tiles/canvas.png
share/kde/apps/konqueror/tiles/checker.png
@@ -1959,6 +1989,7 @@
share/kde/config/konqsidebartng.rc
share/kde/config/kshorturifilterrc
share/kde/config/kxkb_groups
+share/kde/config/mountwatcher.desktop
share/kde/doc/kdm/README
share/kde/fonts/9x15.pcf.gz
share/kde/fonts/console8x16.pcf.gz
@@ -2727,6 +2758,24 @@
${HAVE_SMB}share/kde/mimelnk/application/x-smb-workgroup.desktop
share/kde/mimelnk/fonts/folder.desktop
share/kde/mimelnk/fonts/system-folder.desktop
+share/kde/mimelnk/kdedevice/cdrom_mounted.desktop
+share/kde/mimelnk/kdedevice/cdrom_unmounted.desktop
+share/kde/mimelnk/kdedevice/cdwriter_mounted.desktop
+share/kde/mimelnk/kdedevice/cdwriter_unmounted.desktop
+share/kde/mimelnk/kdedevice/dvd_mounted.desktop
+share/kde/mimelnk/kdedevice/dvd_unmounted.desktop
+share/kde/mimelnk/kdedevice/floppy5_mounted.desktop
+share/kde/mimelnk/kdedevice/floppy5_unmounted.desktop
+share/kde/mimelnk/kdedevice/floppy_mounted.desktop
+share/kde/mimelnk/kdedevice/floppy_unmounted.desktop
+share/kde/mimelnk/kdedevice/hdd_mounted.desktop
+share/kde/mimelnk/kdedevice/hdd_unmounted.desktop
+share/kde/mimelnk/kdedevice/nfs_mounted.desktop
+share/kde/mimelnk/kdedevice/nfs_unmounted.desktop
+share/kde/mimelnk/kdedevice/smb_mounted.desktop
+share/kde/mimelnk/kdedevice/smb_unmounted.desktop
+share/kde/mimelnk/kdedevice/zip_mounted.desktop
+share/kde/mimelnk/kdedevice/zip_unmounted.desktop
share/kde/mimelnk/print/class.desktop
share/kde/mimelnk/print/driver.desktop
share/kde/mimelnk/print/folder.desktop
@@ -2740,6 +2789,7 @@
share/kde/services/bzip2.protocol
share/kde/services/cgi.protocol
share/kde/services/cursorthumbnail.desktop
+share/kde/services/devices.protocol
share/kde/services/djvuthumbnail.desktop
share/kde/services/finger.protocol
share/kde/services/fish.protocol
@@ -2757,6 +2807,7 @@
share/kde/services/kded/favicons.desktop
share/kde/services/kded/konqy_preloader.desktop
share/kde/services/kded/kwrited.desktop
+share/kde/services/kded/mountwatcher.desktop
share/kde/services/kdeprint_part.desktop
share/kde/services/kfile_font.desktop
share/kde/services/kfindpart.desktop
@@ -2875,6 +2926,7 @@
${HAVE_SMB}share/kde/services/smb.protocol
share/kde/services/smtp.protocol
share/kde/services/smtps.protocol
+share/kde/services/system.protocol
share/kde/services/tar.protocol
share/kde/services/textthumbnail.desktop
share/kde/services/thumbnail.protocol
@@ -3777,6 +3829,7 @@
@comment in kde: @dirrm share/kde/services/kded
@comment in kde: @dirrm share/kde/services
@comment in kde: @dirrm share/kde/mimelnk/print
+@comment in kde: @dirrm share/kde/mimelnk/kdedevice
@comment in kde: @dirrm share/kde/mimelnk/fonts
@comment in kde: @dirrm share/kde/mimelnk/application
@comment in kde: @dirrm share/kde/mimelnk
@@ -3948,6 +4001,8 @@
@comment in kde: @dirrm share/kde/apps/kcontrol/pics
@comment in kde: @dirrm share/kde/apps/kcontrol
@comment in kde: @dirrm share/kde/apps/kconf_update
+@dirrm share/kde/apps/kcmview1394
+@dirrm share/kde/apps/kcmusb
@dirrm share/kde/apps/kcmlocale/pics
@dirrm share/kde/apps/kcmlocale
@dirrm share/kde/apps/kcmkeys
@@ -4007,11 +4062,14 @@
@dirrm share/kde/applnk/Settings/WebBrowsing
@dirrm share/kde/applnk/Settings/LookNFeel/Themes
@dirrm share/kde/applnk/Settings/LookNFeel
+@dirrm share/kde/applnk/Settings/Information
@comment in kde: @dirrm share/kde/applnk/Settings
@comment in kde: @dirrm share/kde/applnk/Internet
@comment in kde: @dirrm share/kde/applnk/.hidden
@comment in kde: @dirrm share/kde/applnk
@comment in kde: @dirrm share/kde
+@dirrm share/examples/kdebase3/applications-merged
+@dirrm share/examples/kdebase3
@dirrm share/doc/kde/HTML/en/kxkb
@dirrm share/doc/kde/HTML/en/kwrite
@dirrm share/doc/kde/HTML/en/ksysguard
@@ -4051,6 +4109,9 @@
@dirrm share/doc/kde/HTML/en/kdesu
@dirrm share/doc/kde/HTML/en/kdeprint
@dirrm share/doc/kde/HTML/en/kdebugdialog
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html
+@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html
+@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdebase-apidocs/kwin/lib/html
@dirrm share/doc/kde/HTML/en/kdebase-apidocs/kwin/lib/html
@dirrm share/doc/kde/HTML/en/kdebase-apidocs/kwin/lib
@@ -4064,9 +4125,6 @@
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdebase-apidocs/kate/html
@dirrm share/doc/kde/HTML/en/kdebase-apidocs/kate/html
@dirrm share/doc/kde/HTML/en/kdebase-apidocs/kate
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html
-@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html
-@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq
@dirrm share/doc/kde/HTML/en/kdebase-apidocs
@dirrm share/doc/kde/HTML/en/kcontrol/windowmanagement
@dirrm share/doc/kde/HTML/en/kcontrol/useragent
@@ -4124,5 +4182,3 @@
@dirrm include/ksgrd
@dirrm include/kate/utils
@comment in kde: @dirrm include/kate
-@dirrm etc/xdg/menus/applications-merged
-@comment dirrm etc/xdg/menus
Index: x11/kdebase3/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdebase3/distinfo,v
retrieving revision 1.59
diff -b -u -r1.59 distinfo
--- x11/kdebase3/distinfo 14 Dec 2004 11:05:27 -0000 1.59
+++ x11/kdebase3/distinfo 6 Feb 2005 07:15:26 -0000
@@ -49,3 +49,5 @@
SHA1 (patch-fx) = 95451a2c5c614d5e1ff4799991b2e2dc11eada0f
SHA1 (patch-fy) = cf91cc7a5fe14bdfb38e4ca3ad4d82ffba86a05e
SHA1 (patch-fz) = 49dcc3508edf4deccadce5ff788b424bb0fc6d78
+SHA1 (patch-ga) = 67b82e693ebd582b02c6a851f3d2c9976e6dd692
+SHA1 (patch-gb) = 2b058d450a6657290f9be7e0d099519044e2912f
cvs diff: Diffing x11/kdebase3/files
cvs diff: Diffing x11/kdebase3/patches
$NetBSD$
--- kded/Makefile.in.orig 2004-11-30 06:42:04.000000000 -0800
+++ kded/Makefile.in
@@ -545,7 +545,7 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
+xdg_menudir = $(prefix)/share/examples/kdelibs3
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
#>- lib_LTLIBRARIES =
#>+ 1
$NetBSD$
--- ksysguard/example/Makefile.in.orig 2004-11-29 07:43:14.000000000 -0800
+++ ksysguard/example/Makefile.in
@@ -490,7 +490,7 @@ xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
ksysguard_example_datadir = $(kde_datadir)/ksysguard
ksysguard_example_data_DATA = eventsrc
-etcdir = $(sysconfdir)
+etcdir = $(prefix)/share/examples/kdebase3
etc_DATA = ksysguarddrc
#>- all: all-am
#>+ 1
$NetBSD$
--- applnk/Makefile.in.orig 2004-11-29 07:43:04.000000000 -0800
+++ applnk/Makefile.in
@@ -74,7 +74,7 @@ am__installdirs = "$(DESTDIR)$(xdg_direc
xdg_directoryDATA_INSTALL = $(INSTALL_DATA)
xdg_menuDATA_INSTALL = $(INSTALL_DATA)
xdg_mergedmenuDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(xdg_directory_DATA) $(xdg_menu_DATA) $(xdg_mergedmenu_DATA)
+DATA = $(xdg_directory_DATA) $(xdg_menu_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -504,9 +504,9 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
+xdg_menudir = $(prefix)/share/examples/kdebase3
SUBDIRS = compat
-xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
+xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu kde-essential.menu
xdg_mergedmenu_DATA = kde-essential.menu
xdg_mergedmenudir = $(xdg_menudir)/applications-merged
xdg_directory_DATA = \
Jeremy C. Reed
BSD News, BSD tutorials, BSD links
http://www.bsdnewsletter.com/