pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 bl3ify and update to kde3.2.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/c9ac67ca4a43
branches: trunk
changeset: 473485:c9ac67ca4a43
user: markd <markd%pkgsrc.org@localhost>
date: Tue Apr 20 12:22:22 2004 +0000
description:
bl3ify and update to kde3.2.2
Changes:
* Fix CR at end of line in source file
* Make the kalyptus script install with the executable bit set
* Respect "EffectsEnabled" for tearoff handle setting
diffstat:
x11/kdelibs3/Makefile | 37 ++++++++++++++++++-------------------
x11/kdelibs3/PLIST | 39 ++++++++++++++++++++++++++++++++++++---
x11/kdelibs3/buildlink3.mk | 37 +++++++++++++++++++++++++++++++++++++
x11/kdelibs3/distinfo | 8 ++++----
x11/kdelibs3/patches/patch-ce | 18 +++++++++---------
5 files changed, 104 insertions(+), 35 deletions(-)
diffs (truncated from 364 to 300 lines):
diff -r ae797136a691 -r c9ac67ca4a43 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile Tue Apr 20 12:15:51 2004 +0000
+++ b/x11/kdelibs3/Makefile Tue Apr 20 12:22:22 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2004/04/14 16:15:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2004/04/20 12:22:22 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -9,8 +8,9 @@
CONFLICTS+= koffice3<=1.1.1
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_DIRS+= xdg-1.1
+USE_PERL5= run
USE_PKGINSTALL= YES
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
@@ -25,8 +25,6 @@
LIBS+= ${EXPORT_SYMBOLS_LDFLAGS}
.endif
-KDEDIR= ${PREFIX}
-
REPLACE_PERL= \
kio/proxytype.pl \
kio/useragent.pl \
@@ -54,7 +52,7 @@
done
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/cups/buildlink3.mk"
BUILD_DEFS+= USE_CUPS
PLIST_SUBST+= CUPS=
@@ -109,20 +107,21 @@
USE_PKGSRC_GCC= # defined
.endif
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../audio/arts/buildlink2.mk"
-.include "../../audio/libaudiofile/buildlink2.mk"
-.include "../../devel/pcre/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/libxslt/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../audio/arts/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
-.include "../../x11/qt3-libs/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ae797136a691 -r c9ac67ca4a43 x11/kdelibs3/PLIST
--- a/x11/kdelibs3/PLIST Tue Apr 20 12:15:51 2004 +0000
+++ b/x11/kdelibs3/PLIST Tue Apr 20 12:22:22 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/03/09 11:22:23 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/04/20 12:22:22 markd Exp $
bin/artsmessage
bin/checkXML
${CUPS}bin/cupsdconf
@@ -1271,6 +1271,7 @@
share/kde/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
share/kde/apps/kjava/kjava.jar
share/kde/apps/kjava/kjava.policy
+share/kde/apps/kjava/pluginsinfo
share/kde/apps/knotify/eventsrc
share/kde/apps/ksgmltools2/customization/README
share/kde/apps/ksgmltools2/customization/af/catalog
@@ -2534,7 +2535,9 @@
share/kde/icons/crystalsvg/128x128/filesystems/folder_crystal.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_favorite.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_green.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_green_open.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_grey.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_grey_open.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_home.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_home2.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_html.png
@@ -2543,6 +2546,8 @@
share/kde/icons/crystalsvg/128x128/filesystems/folder_locked.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_man.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_open.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_orange.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_orange_open.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_print.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_red.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_red_open.png
@@ -2551,7 +2556,9 @@
share/kde/icons/crystalsvg/128x128/filesystems/folder_txt.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_video.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_violet.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_violet_open.png
share/kde/icons/crystalsvg/128x128/filesystems/folder_yellow.png
+share/kde/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png
share/kde/icons/crystalsvg/128x128/filesystems/lockoverlay.png
share/kde/icons/crystalsvg/128x128/filesystems/network.png
share/kde/icons/crystalsvg/128x128/filesystems/network_local.png
@@ -2873,11 +2880,14 @@
share/kde/icons/crystalsvg/16x16/filesystems/chardevice.png
share/kde/icons/crystalsvg/16x16/filesystems/desktop.png
share/kde/icons/crystalsvg/16x16/filesystems/exec.png
+share/kde/icons/crystalsvg/16x16/filesystems/file_broken.png
share/kde/icons/crystalsvg/16x16/filesystems/folder.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_crystal.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_favorite.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_green.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_green_open.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_grey.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_grey_open.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_home.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_home2.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_html.png
@@ -2887,6 +2897,8 @@
share/kde/icons/crystalsvg/16x16/filesystems/folder_locked.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_man.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_open.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_orange.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_orange_open.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_outbox.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_print.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_red.png
@@ -2897,7 +2909,9 @@
share/kde/icons/crystalsvg/16x16/filesystems/folder_txt.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_video.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_violet.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow.png
+share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
share/kde/icons/crystalsvg/16x16/filesystems/link.png
share/kde/icons/crystalsvg/16x16/filesystems/lockoverlay.png
share/kde/icons/crystalsvg/16x16/filesystems/network.png
@@ -3514,11 +3528,14 @@
share/kde/icons/crystalsvg/32x32/filesystems/chardevice.png
share/kde/icons/crystalsvg/32x32/filesystems/desktop.png
share/kde/icons/crystalsvg/32x32/filesystems/exec.png
+share/kde/icons/crystalsvg/32x32/filesystems/file_broken.png
share/kde/icons/crystalsvg/32x32/filesystems/folder.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_crystal.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_favorite.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_green.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_green_open.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_grey.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_grey_open.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_home.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_home2.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_html.png
@@ -3527,6 +3544,8 @@
share/kde/icons/crystalsvg/32x32/filesystems/folder_locked.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_man.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_open.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_orange.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_orange_open.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_print.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_red.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_red_open.png
@@ -3535,7 +3554,9 @@
share/kde/icons/crystalsvg/32x32/filesystems/folder_txt.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_video.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_violet.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow.png
+share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
share/kde/icons/crystalsvg/32x32/filesystems/link.png
share/kde/icons/crystalsvg/32x32/filesystems/lockoverlay.png
share/kde/icons/crystalsvg/32x32/filesystems/network.png
@@ -3677,11 +3698,14 @@
share/kde/icons/crystalsvg/48x48/filesystems/chardevice.png
share/kde/icons/crystalsvg/48x48/filesystems/desktop.png
share/kde/icons/crystalsvg/48x48/filesystems/exec.png
+share/kde/icons/crystalsvg/48x48/filesystems/file_broken.png
share/kde/icons/crystalsvg/48x48/filesystems/folder.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_crystal.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_favorite.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_green.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_green_open.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_grey.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_grey_open.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_home.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_home2.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_html.png
@@ -3691,6 +3715,8 @@
share/kde/icons/crystalsvg/48x48/filesystems/folder_locked.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_man.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_open.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_orange.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_orange_open.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_outbox.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_print.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_red.png
@@ -3700,7 +3726,9 @@
share/kde/icons/crystalsvg/48x48/filesystems/folder_txt.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_video.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_violet.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow.png
+share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
share/kde/icons/crystalsvg/48x48/filesystems/link.png
share/kde/icons/crystalsvg/48x48/filesystems/lockoverlay.png
share/kde/icons/crystalsvg/48x48/filesystems/network.png
@@ -3834,11 +3862,14 @@
share/kde/icons/crystalsvg/64x64/filesystems/chardevice.png
share/kde/icons/crystalsvg/64x64/filesystems/desktop.png
share/kde/icons/crystalsvg/64x64/filesystems/exec.png
+share/kde/icons/crystalsvg/64x64/filesystems/file_broken.png
share/kde/icons/crystalsvg/64x64/filesystems/folder.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_crystal.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_favorite.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_green.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_green_open.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_grey.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_grey_open.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_home.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_home2.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_html.png
@@ -3847,6 +3878,8 @@
share/kde/icons/crystalsvg/64x64/filesystems/folder_locked.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_man.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_open.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_orange.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_orange_open.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_print.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_red.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_red_open.png
@@ -3855,7 +3888,9 @@
share/kde/icons/crystalsvg/64x64/filesystems/folder_txt.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_video.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_violet.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_violet_open.png
share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow.png
+share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png
share/kde/icons/crystalsvg/64x64/filesystems/lockoverlay.png
share/kde/icons/crystalsvg/64x64/filesystems/network.png
share/kde/icons/crystalsvg/64x64/filesystems/network_local.png
@@ -4173,11 +4208,9 @@
share/kde/mimelnk/application/x-kpovmodeler.desktop
share/kde/mimelnk/application/x-kpresenter.desktop
share/kde/mimelnk/application/x-krita.desktop
-share/kde/mimelnk/application/x-kspread-crypt.desktop
share/kde/mimelnk/application/x-kspread.desktop
share/kde/mimelnk/application/x-kudesigner.desktop
share/kde/mimelnk/application/x-kugar.desktop
-share/kde/mimelnk/application/x-kword-crypt.desktop
share/kde/mimelnk/application/x-kword.desktop
share/kde/mimelnk/application/x-lha.desktop
share/kde/mimelnk/application/x-linguist.desktop
diff -r ae797136a691 -r c9ac67ca4a43 x11/kdelibs3/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/buildlink3.mk Tue Apr 20 12:22:22 2004 +0000
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 12:22:23 markd Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= kdelibs
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdelibs}
+BUILDLINK_PACKAGES+= kdelibs
+
+.if !empty(KDELIBS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.2.0
+BUILDLINK_RECOMMENDED.kdelibs?= kdelibs>=3.2.2
+BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3
+.endif # KDELIBS_BUILDLINK3_MK
+
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
+. include "../../print/cups/buildlink3.mk"
+.endif
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../audio/arts/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index