2 files changed, 14 insertions, 14 deletions
diff --git a/audio/klira/Makefile b/audio/klira/Makefile
index 1777a03fd..3020fa278 100644
--- a/audio/klira/Makefile
+++ b/audio/klira/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 USE_BZIP2=	yes
 USE_GSTREAMER80=	yes
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
diff --git a/audio/klira/pkg-plist b/audio/klira/pkg-plist
index aab2e7593..5f0feb944 100644
--- a/audio/klira/pkg-plist
+++ b/audio/klira/pkg-plist
@@ -7,18 +7,18 @@ share/doc/HTML/en/klira/index.docbook
 share/icons/hicolor/16x16/apps/klira.png
 share/icons/hicolor/32x32/apps/klira.png
 share/icons/hicolor/64x64/apps/klira.png
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/klira
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/klira
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk