Make it compile with cdparanoia, even though it doesn't quite work yet.

Move kdmrc creation to pkg_install time (fries@)
This commit is contained in:
espie 2001-08-23 22:25:49 +00:00
parent e71fd86290
commit efa9e7652e
8 changed files with 292 additions and 31 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2001/08/21 10:59:38 espie Exp $
# $OpenBSD: Makefile,v 1.21 2001/08/23 22:25:49 espie Exp $
COMMENT= "X11 toolkit, basic applications"
COMMENT-plugins= "X11 toolkit, netscape plugins"
@ -26,7 +26,9 @@ USE_MOTIF= any
.endif
LIB_DEPENDS= kdecore.3.::x11/kde/libs2 \
ldap.2::databases/openldap
ldap.2::databases/openldap \
vorbis.::audio/libvorbis \
libcdda_paranoia.::audio/cdparanoia
BUILD_DEPENDS= uic::x11/qt2-designer
BUILD_DEPENDS+= zsh:zsh-*:shells/zsh/stable
@ -65,6 +67,10 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
post-install:
rm -rf ${PREFIX}/share/config/kdm
${INSTALL_PROGRAM} ${WRKSRC}/kdm/kfrontend/genkdmconf ${PREFIX}/libexec
MTREE_FILE=${PORTSDIR}/x11/kde/libs2/files/mtree
.include <bsd.port.mk>

View File

@ -1,12 +1,15 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2001/08/20 23:42:08 espie Exp $
$OpenBSD: patch-aclocal_m4,v 1.3 2001/08/23 22:25:49 espie Exp $
--- aclocal.m4.orig Mon Aug 6 03:30:16 2001
+++ aclocal.m4 Fri Aug 17 02:11:03 2001
@@ -1,4 +1,4 @@
+++ aclocal.m4 Thu Aug 23 01:30:41 2001
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -4722,19 +4722,7 @@ netbsd*)
;;
@ -28,3 +31,39 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2001/08/20 23:42:08 espie Exp $
;;
newsos6)
@@ -4981,7 +4969,7 @@ AC_DEFUN([LT_AC_PROG_GCJ],
dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
@@ -5009,7 +4997,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
# Check to make sure that the build environment is sane.
#
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
@@ -5050,7 +5038,7 @@ AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
@@ -5066,7 +5054,7 @@ AC_SUBST($1)])
# Like AC_CONFIG_HEADER, but automatically create stamp file.
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.

View File

@ -0,0 +1,53 @@
$OpenBSD: patch-kioslave_audiocd_audiocd_cpp,v 1.1 2001/08/23 22:25:49 espie Exp $
--- kioslave/audiocd/audiocd.cpp.orig Thu Aug 23 21:46:28 2001
+++ kioslave/audiocd/audiocd.cpp Thu Aug 23 22:08:18 2001
@@ -41,8 +41,13 @@ extern "C"
/* This is in support for the Mega Hack, if cdparanoia ever is fixed, or we
use another ripping library we can remove this. */
+#ifdef __linux__
#include <linux/cdrom.h>
+#endif
#include <sys/ioctl.h>
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/cdio.h>
+#endif
#ifdef HAVE_LAME
#include <lame/lame.h>
@@ -104,14 +109,24 @@ int FixupTOC(cdrom_drive *d, int tracks)
start_of_first_data_as_in_toc = -1;
hack_track = -1;
if (d->ioctl_fd != -1) {
+#ifdef __linux__
struct cdrom_multisession ms_str;
ms_str.addr_format = CDROM_LBA;
if (ioctl(d->ioctl_fd, CDROMMULTISESSION, &ms_str) == -1)
return -1;
- if (ms_str.addr.lba > 100) {
+#define ms_addr (ms_str.addr.lba)
+#endif
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+ int ms_addr;
+ ms_addr = 0; /* last session */
+ if (ioctl(d->ioctl_fd, CDIOREADMSADDR, &ms_addr) == -1)
+ return -1;
+#endif
+
+ if (ms_addr > 100) {
for (j = tracks-1; j >= 0; j--)
if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
- if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) {
+ if (d->disc_toc[j].dwStartSector > ms_addr - 11400) {
/* The next two code lines are the purpose of duplicating this
* function, all others are an exact copy of paranoias FixupTOC().
* The gory details: CD-Extra consist of N audio-tracks in the
@@ -132,7 +147,7 @@ int FixupTOC(cdrom_drive *d, int tracks)
* length is only implicitely given. Bloody sh*. */
start_of_first_data_as_in_toc = d->disc_toc[j].dwStartSector;
hack_track = j + 1;
- d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400;
+ d->disc_toc[j].dwStartSector = ms_addr - 11400;
}
break;
}

View File

@ -0,0 +1,65 @@
--- kioslave/audiocd/configure.in.in.orig Sun Jul 29 06:56:35 2001
+++ kioslave/audiocd/configure.in.in Thu Aug 23 22:38:05 2001
@@ -38,6 +38,11 @@ if test "x$with_cdparanoia" = "xCHECK" ;
break
fi
done
+ for dir in $kde_libraries /usr/lib /usr/local/lib; do
+ if ls $dir|grep "^libcdda_paranoia.so.*" 2>&1 >/dev/null; then
+ ext=so
+ fi
+ done
if test "$with_cdparanoia" = FOUND; then
if test "$ext" = la; then
grep "^library_names='*[a-z]*'" $para_libdir/libcdda_paranoia.$ext 2>&1 > /dev/null || with_cdparanoia=NOTFOUND
@@ -266,7 +271,7 @@ no) AC_MSG_RESULT(no) ;;
NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
*)
if test "x$with_vorbis" = "xFOUND" ; then
- msg="incs=$vorbis_libdir libs=$vorbis_incdir"
+ msg="incs=$vorbis_incdir libs=$vorbis_libdir"
else
msg="$with_vorbis"
VORBIS_ROOT="$with_vorbis"
@@ -280,8 +285,10 @@ NOTFOUND) AC_MSG_RESULT(searched but not
non_compile=no
if test "x$enable_vorbistest" = xyes ; then
ac_save_CFLAGS="$CFLAGS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
rm -f conf.vorbistest
AC_TRY_RUN([
@@ -298,6 +305,7 @@ int main ()
], , non_compile=yes , [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
# bogus return value, but it _did_ run
test -f conf.vorbistest && non_compile="no"
@@ -308,12 +316,13 @@ int main ()
AC_MSG_RESULT($msg)
AC_DEFINE_UNQUOTED(HAVE_VORBIS, 1, [Define if you have vorbis])
VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
+ VORBISENC_LIBS="-lvorbisenc -lvorbis"
KCM_AUDIOCD="kcmaudiocd"
else
AC_MSG_RESULT(no (but first try gave $msg))
echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $all_includes $VORBIS_INCS"
+ CXXFLAGS="$CXXFLAGS $all_includes $VORBIS_INCS"
LIBS="$LIBS $all_libraries $VORBIS_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -332,6 +341,7 @@ int main ()
echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
echo "*** or that you have moved Vorbis since it was installed." ])
CFLAGS="$ac_save_CFLAGS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
VORBIS_INCS=""
VORBIS_LIBS=""

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-konsole_src_Makefile_am,v 1.2 2001/08/20 23:42:08 espie Exp $
$OpenBSD: patch-konsole_src_Makefile_am,v 1.3 2001/08/23 22:25:49 espie Exp $
--- konsole/src/Makefile.am.orig Thu Jun 14 20:53:50 2001
+++ konsole/src/Makefile.am Fri Aug 17 02:09:16 2001
+++ konsole/src/Makefile.am Thu Aug 23 23:36:47 2001
@@ -61,6 +61,7 @@ konsole_LDFLAGS = $(all_libraries) $(KDE
konsole_grantpty_SOURCES = konsole_grantpty.c
konsole_grantpty_LDFLAGS = $(KDE_RPATH)
+konsole_grantpty_LIBADD = $(LIBUTIL)
+konsole_grantpty_LDADD = $(LIBUTIL)
install-data-local:
@echo ""

View File

@ -1,20 +1,107 @@
$OpenBSD: patch-konsole_src_Makefile_in,v 1.2 2001/08/20 23:42:08 espie Exp $
$OpenBSD: patch-konsole_src_Makefile_in,v 1.3 2001/08/23 22:25:49 espie Exp $
--- konsole/src/Makefile.in.orig Mon Aug 6 03:32:12 2001
+++ konsole/src/Makefile.in Fri Aug 17 02:09:16 2001
+++ konsole/src/Makefile.in Thu Aug 23 23:41:09 2001
@@ -1,7 +1,7 @@
# KDE tags expanded automatically by am_edit - $Revision: 1.3 $
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -326,6 +326,7 @@ konsole_LDFLAGS = $(all_libraries) $(KDE
konsole_grantpty_SOURCES = konsole_grantpty.c
konsole_grantpty_LDFLAGS = $(KDE_RPATH)
+konsole_grantpty_LIBADD = $(LIBUTIL)
+konsole_grantpty_LDADD = $(LIBUTIL)
# Not AUTO here, because there are some unused files
#>- METASOURCES = TEWidget.moc TEmuVt102.moc session.moc konsole.moc TEmulation.moc TEPty.moc kwrited.moc konsole_part.moc
@@ -573,7 +574,7 @@ konsole$(EXEEXT): $(konsole_OBJECTS) $(k
@@ -406,7 +407,6 @@ konsole_DEPENDENCIES =
#>- konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT)
#>+ 1
konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT)
-konsole_grantpty_LDADD = $(LDADD)
konsole_grantpty_DEPENDENCIES =
#>- kwrited_OBJECTS = dummy.$(OBJEXT)
#>+ 1
@@ -435,12 +435,12 @@ DIST_COMMON = Makefile.am Makefile.in
konsole_grantpty$(EXEEXT): $(konsole_grantpty_OBJECTS) $(konsole_grantpty_DEPENDENCIES)
@rm -f konsole_grantpty$(EXEEXT)
- $(LINK) $(konsole_grantpty_LDFLAGS) $(konsole_grantpty_OBJECTS) $(konsole_grantpty_LDADD) $(LIBS)
+ $(LINK) $(konsole_grantpty_LDFLAGS) $(konsole_grantpty_OBJECTS) $(konsole_grantpty_LDADD) $(konsole_grantpty_LIBADD) $(LIBS)
#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=x-konsole.desktop konsolerc sample.shell konsole_part.rc
+KDE_DIST=kwrited_la_meta_unload.C konsole_grantpty sample.shell konsole_part.rc kwrited konsole_la_meta_unload.C x-konsole.desktop libkonsolepart.la.closure libkonsolepart_la_meta_unload.C konsole konsolerc konsole_meta_unload.C
kwrited$(EXEEXT): $(kwrited_OBJECTS) $(kwrited_DEPENDENCIES)
@rm -f kwrited$(EXEEXT)
DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
SOURCES = $(libkonsolepart_la_SOURCES) $(kwrited_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
OBJECTS = $(libkonsolepart_la_OBJECTS) $(kwrited_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS)
@@ -676,17 +676,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
subdir = konsole/src
distdir: $(DISTFILES)
-#>- @for file in $(DISTFILES); do \
-#>- d=$(srcdir); \
-#>- if test -d $$d/$$file; then \
-#>- cp -pr $$/$$file $(distdir)/$$file; \
-#>- else \
-#>- test -f $(distdir)/$$file \
-#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-#>- || cp -p $$d/$$file $(distdir)/$$file || :; \
-#>- fi; \
-#>- done
-#>+ 10
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
@@ -925,7 +914,7 @@ clean-moc-classes:
-rm -f libkonsolepart_la_meta_unload.C kwrited_la_meta_unload.C konsole_la_meta_unload.C konsole_meta_unload.C
#>+ 11
-libkonsolepart_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C $(srcdir)/konsole_part.C libkonsolepart_la_meta_unload.C konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc
+libkonsolepart_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C $(srcdir)/konsole_part.C $(srcdir)/libkonsolepart_la_meta_unload.C konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc
@echo 'creating libkonsolepart_la.all_C.C ...'; \
rm -f libkonsolepart_la.all_C.files libkonsolepart_la.all_C.final; \
echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_C.final; \
@@ -937,7 +926,7 @@ libkonsolepart_la.all_C.C: $(srcdir)/Mak
rm -f libkonsolepart_la.all_C.final libkonsolepart_la.all_C.files
#>+ 11
-kwrited_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C kwrited_la_meta_unload.C
+kwrited_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C $(srcdir)/kwrited_la_meta_unload.C
@echo 'creating kwrited_la.all_C.C ...'; \
rm -f kwrited_la.all_C.files kwrited_la.all_C.final; \
echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_C.final; \
@@ -949,7 +938,7 @@ kwrited_la.all_C.C: $(srcdir)/Makefile.i
rm -f kwrited_la.all_C.final kwrited_la.all_C.files
#>+ 11
-konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C konsole_la_meta_unload.C
+konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C $(srcdir)/konsole_la_meta_unload.C
@echo 'creating konsole_la.all_C.C ...'; \
rm -f konsole_la.all_C.files konsole_la.all_C.final; \
echo "#define KDE_USE_FINAL 1" >> konsole_la.all_C.final; \
@@ -961,7 +950,7 @@ konsole_la.all_C.C: $(srcdir)/Makefile.i
rm -f konsole_la.all_C.final konsole_la.all_C.files
#>+ 11
-konsole.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/main.C $(srcdir)/konsole.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C konsole_meta_unload.C
+konsole.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/main.C $(srcdir)/konsole.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C $(srcdir)/konsole_meta_unload.C
@echo 'creating konsole.all_C.C ...'; \
rm -f konsole.all_C.files konsole.all_C.final; \
echo "#define KDE_USE_FINAL 1" >> konsole.all_C.final; \
@@ -973,7 +962,7 @@ konsole.all_C.C: $(srcdir)/Makefile.in $
rm -f konsole.all_C.final konsole.all_C.files
#>+ 11
-kwrited.all_C.C: $(srcdir)/Makefile.in dummy.C
+kwrited.all_C.C: $(srcdir)/Makefile.in $(srcdir)/dummy.C
@echo 'creating kwrited.all_C.C ...'; \
rm -f kwrited.all_C.files kwrited.all_C.final; \
echo "#define KDE_USE_FINAL 1" >> kwrited.all_C.final; \

View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PFRAG.shared,v 1.11 2001/08/20 23:42:08 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.12 2001/08/23 22:25:49 espie Exp $
lib/kde2/libgsthumbnail.so.0.0
lib/kde2/libhtmlthumbnail.so.0.0
lib/kde2/libimagethumbnail.so.0.0
lib/kde2/libkaccess.so.0.0
lib/kde2/libkcm_access.so.0.0
lib/kde2/libkcm_arts.so.0.0
lib/kde2/libkcm_audiocd.so.0.0
lib/kde2/libkcm_background.so.0.0
lib/kde2/libkcm_bell.so.0.0
lib/kde2/libkcm_clock.so.0.0
@ -52,6 +53,7 @@ lib/kde2/libkded_favicons.so.0.0
lib/kde2/libkfindpart.so.0.0
lib/kde2/libkhelpcenter.so.0.0
lib/kde2/libkhelpcenterpart.so.0.0
lib/kde2/libkio_audiocd.so.0.0
lib/kde2/libkio_filter.so.0.0
lib/kde2/libkio_finger.so.0.0
lib/kde2/libkio_floppy.so.0.0

View File

@ -1,10 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2001/08/20 23:42:08 espie Exp $
@mode u+s
@owner root
bin/konsole_grantpty
bin/kcheckpass
@mode
@owner
@comment $OpenBSD: PLIST,v 1.19 2001/08/23 22:25:49 espie Exp $
bin/appletproxy
bin/chooser
bin/conttest
@ -18,6 +12,11 @@ bin/kbanner.kss
bin/kblankscrn.kss
bin/kblob.kss
bin/kbouboule.kss
@owner root
@mode u+s
bin/kcheckpass
@mode
@owner
bin/kcminit
bin/kcmshell
bin/kcontrol
@ -49,6 +48,11 @@ bin/kmenuedit
bin/kmorph3d.kss
bin/konqueror
bin/konsole
@owner root
@mode u+s
bin/konsole_grantpty
@mode
@owner
bin/kpager
bin/kpartsaver.kss
bin/kpersonalizer
@ -138,6 +142,7 @@ lib/kde2/kcminit.la
lib/kde2/kcmshell.la
lib/kde2/kcontrol.la
lib/kde2/khelpcenter.la
lib/kde2/kio_audiocd.la
lib/kde2/kio_filter.la
lib/kde2/kio_finger.la
lib/kde2/kio_floppy.la
@ -154,6 +159,7 @@ lib/kde2/kio_tar.la
lib/kde2/kio_thumbnail.la
lib/kde2/libkcm_access.la
lib/kde2/libkcm_arts.la
lib/kde2/libkcm_audiocd.la
lib/kde2/libkcm_background.la
lib/kde2/libkcm_bell.la
lib/kde2/libkcm_clock.la
@ -269,6 +275,10 @@ lib/libtaskbar.la
lib/libtaskbarapplet.la
lib/libtaskbarextension.la
lib/libtaskmanager.la
libexec/genkdmconf
@exec mkdir -p %D/share/config/kdm
@exec %D/libexec/genkdmconf --in %D/share/config/kdm
@unexec echo "Remove %D/share/config/kdm by hand"
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
@ -357,6 +367,7 @@ share/applnk/Settings/PowerControl/.directory
share/applnk/Settings/PowerControl/energy.desktop
share/applnk/Settings/Sound/.directory
share/applnk/Settings/Sound/arts.desktop
share/applnk/Settings/Sound/audiocd.desktop
share/applnk/Settings/Sound/bell.desktop
share/applnk/Settings/Sound/kcmnotify.desktop
share/applnk/Settings/Sound/midi.desktop
@ -1123,8 +1134,6 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
share/config/kdm/README
share/config/kdm/kdmrc
share/config/klipperrc
share/config/konqsidebartng.rc
share/config/konsolerc
@ -1954,6 +1963,7 @@ share/locale/l10n/za/flag.png
share/mimelnk/application/x-konsole.desktop
share/mimelnk/application/x-ksysguard.desktop
share/mimelnk/application/x-ktheme.desktop
share/services/audiocd.protocol
share/services/bzip.protocol
share/services/bzip2.protocol
share/services/finger.protocol
@ -2250,7 +2260,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/doc/HTML/en/kcontrol
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en/kaddressbook
@dirrm share/config/kdm
@dirrm share/autostart
@dirrm share/apps/naughtyapplet/pics
@dirrm share/apps/naughtyapplet