pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/konversation Tidy up KDE handling. Bump PKGREVIS...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e1f6857dbcb9
branches: trunk
changeset: 522335:e1f6857dbcb9
user: markd <markd%pkgsrc.org@localhost>
date: Thu Dec 07 11:08:26 2006 +0000
description:
Tidy up KDE handling. Bump PKGREVISION as PLIST changed slightly.
diffstat:
chat/konversation/Makefile | 22 ++----------
chat/konversation/PLIST | 64 ++++++++++++++++---------------------
chat/konversation/distinfo | 3 +-
chat/konversation/patches/patch-aa | 13 -------
4 files changed, 33 insertions(+), 69 deletions(-)
diffs (187 lines):
diff -r 54616c084527 -r e1f6857dbcb9 chat/konversation/Makefile
--- a/chat/konversation/Makefile Thu Dec 07 10:50:27 2006 +0000
+++ b/chat/konversation/Makefile Thu Dec 07 11:08:26 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/10/30 23:02:26 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/07 11:08:26 markd Exp $
#
DISTNAME= konversation-1.0.1
-CATEGORIES= chat
+PKGREVISION= 1
+CATEGORIES= chat kde
MASTER_SITES= http://download.berlios.de/konversation/
EXTRACT_SUFX= .tar.bz2
@@ -14,10 +15,7 @@
USE_LIBTOOL= YES
USE_TOOLS+= gmake perl msgfmt
USE_LANGUAGES= c c++
-LANGS= da en es et st it nl pt ru sv
-USE_PKGLOCALEDIR= YES
-CONFIGURE_ENV+= kde_htmldir=${PREFIX}/share/doc/kde/HTML
REPLACE_PERL+= konversation/src/konversation-0.19-appearance.pl \
konversation/src/konversation-0.19-colorcodes.pl \
konversation/src/konversation-0.19-colors.pl \
@@ -30,24 +28,12 @@
REPLACE_BASH+= konversation/scripts/mail
USE_TOOLS+= bash:run
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
CONFIGURE_ARGS+= --disable-threading
.endif
-CONFIGURE_ARGS+= --with-extra-includes=${BUILDLINK_PREFIX.jpeg}/include
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde
-
-BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.4.0
-
-post-install:
-.for f in ${LANGS}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kde/HTML/${f}/common
-.endfor
-
-.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 54616c084527 -r e1f6857dbcb9 chat/konversation/PLIST
--- a/chat/konversation/PLIST Thu Dec 07 10:50:27 2006 +0000
+++ b/chat/konversation/PLIST Thu Dec 07 11:08:26 2006 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2006/10/30 23:02:26 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/12/07 11:08:26 markd Exp $
bin/konversation
bin/konversationircprotocolhandler
+share/applications/kde/konversation.desktop
share/doc/kde/HTML/da/konversation/common
share/doc/kde/HTML/da/konversation/index.cache.bz2
share/doc/kde/HTML/da/konversation/index.docbook
@@ -160,6 +161,7 @@
share/doc/kde/HTML/pt/konversation/common
share/doc/kde/HTML/pt/konversation/index.cache.bz2
share/doc/kde/HTML/pt/konversation/index.docbook
+share/doc/kde/HTML/ru/konversation/common
share/doc/kde/HTML/ru/konversation/index.cache.bz2
share/doc/kde/HTML/ru/konversation/index.docbook
share/doc/kde/HTML/sv/konversation/addchannel.png
@@ -193,8 +195,6 @@
share/doc/kde/HTML/sv/konversation/serverlist_co.png
share/doc/kde/HTML/sv/konversation/urlcatcher_screen_co.png
share/doc/kde/HTML/sv/konversation/webbrowser_screen_co.png
-@comment move to: share/kde/apps/konversation/konversation.desktop
-share/kde/applications/kde/konversation.desktop
share/kde/apps/kconf_update/konversation-0.19-appearance.pl
share/kde/apps/kconf_update/konversation-0.19-colorcodes.pl
share/kde/apps/kconf_update/konversation-0.19-colors.pl
@@ -325,18 +325,19 @@
share/locale/ta/LC_MESSAGES/konversation.mo
share/locale/tr/LC_MESSAGES/konversation.mo
share/locale/zh_TW/LC_MESSAGES/konversation.mo
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/scalable/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/64x64/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/48x48/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/32x32/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/22x22/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/16x16/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/128x128/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/crystalsvg/scalable/actions 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/crystalsvg/32x32/actions 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/crystalsvg/22x22/actions 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/crystalsvg/16x16/actions 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/config.kcfg 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/kde/services
+@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/kde/config.kcfg
@dirrm share/kde/apps/konversation/themes/square
@dirrm share/kde/apps/konversation/themes/smiling
@dirrm share/kde/apps/konversation/themes/default
@@ -346,32 +347,23 @@
@dirrm share/kde/apps/konversation/themes
@dirrm share/kde/apps/konversation/scripts
@dirrm share/kde/apps/konversation
-@unexec ${RMDIR} %D/share/kde/apps/kconf_update 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/apps 2>/dev/null || ${TRUE}
-@dirrm share/kde/applications/kde
-@dirrm share/kde/applications
-@unexec ${RMDIR} %D/share/kde 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/kde/apps/kconf_update
+@comment in kde: @dirrm share/kde/apps
@dirrm share/doc/kde/HTML/sv/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/sv 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/sv
+@dirrm share/doc/kde/HTML/ru/konversation
@dirrm share/doc/kde/HTML/pt/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/pt 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/pt
@dirrm share/doc/kde/HTML/nl/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/nl 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/nl
@dirrm share/doc/kde/HTML/it/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/it 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/it
@dirrm share/doc/kde/HTML/et/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/et 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/et
@dirrm share/doc/kde/HTML/es/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/es 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/es
@dirrm share/doc/kde/HTML/en/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/en 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/en
@dirrm share/doc/kde/HTML/da/konversation
-@unexec ${RMDIR} %D/share/doc/kde/HTML/da 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/da/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/en/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/es/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/et/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/it/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/nl/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/pt/common 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/kde/HTML/sv/common 2>/dev/null || ${TRUE}
+@comment in kde: @dirrm share/doc/kde/HTML/da
+@comment in kde: @dirrm share/applications/kde
diff -r 54616c084527 -r e1f6857dbcb9 chat/konversation/distinfo
--- a/chat/konversation/distinfo Thu Dec 07 10:50:27 2006 +0000
+++ b/chat/konversation/distinfo Thu Dec 07 11:08:26 2006 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/10/30 23:02:26 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/12/07 11:08:26 markd Exp $
SHA1 (konversation-1.0.1.tar.bz2) = 7e4b2356e942848fb83584db1bf2a1b6ef63234d
RMD160 (konversation-1.0.1.tar.bz2) = 1cf79a87f451aa2718560f00ddf987b68938310a
Size (konversation-1.0.1.tar.bz2) = 5848563 bytes
-SHA1 (patch-aa) = 1143627dbe906f77a8d16195b403653e1ab2d232
SHA1 (patch-ab) = 68c11c4e1c00286607d394cb0b0b4132cd4789d0
diff -r 54616c084527 -r e1f6857dbcb9 chat/konversation/patches/patch-aa
--- a/chat/konversation/patches/patch-aa Thu Dec 07 10:50:27 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/18 21:49:31 adrianp Exp $
-
---- configure.orig 2006-01-30 08:48:56.000000000 +0000
-+++ configure
-@@ -30948,7 +30948,7 @@ if test "$ac_use_path_checking" = "defau
- kde_datadir='\${datadir}/apps'
- fi
- if test -z "$kde_locale"; then
-- kde_locale='\${datadir}/locale'
-+ kde_locale='\${prefix}/share/locale'
- fi
- if test -z "$kde_cgidir"; then
- kde_cgidir='\${exec_prefix}/cgi-bin'
Home |
Main Index |
Thread Index |
Old Index