From ddda678338aee98d7b1f2466f4361a363309b062 Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 6 Mar 2005 12:48:09 +0000 Subject: $PKG_SYSCONFDIR support from Jeremy C. Reed with minor changes from me. Bump PKG_REVISION. --- x11/kdelibs3/Makefile | 9 +++++++-- x11/kdelibs3/PLIST | 6 +++--- x11/kdelibs3/distinfo | 5 +++-- x11/kdelibs3/patches/patch-ab | 13 +++++++++++++ x11/kdelibs3/patches/patch-an | 28 +++++++++++++++++++++++----- 5 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 x11/kdelibs3/patches/patch-ab (limited to 'x11') diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c6b2e5e9f26..88944d3fb3f 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2005/01/31 09:55:15 markd Exp $ +# $NetBSD: Makefile,v 1.77 2005/03/06 12:48:09 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -14,6 +14,10 @@ USE_DIRS+= xdg-1.1 USE_PERL5= run USE_PKGINSTALL= YES +MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus +CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \ + ${PKG_SYSCONFDIR}/xdg/menus/applications.menu + CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog @@ -54,6 +58,7 @@ PKG_SUPPORTED_OPTIONS= cups .include "../../print/cups/buildlink3.mk" PLIST_SUBST+= CUPS= .else +CONFIGURE_ARGS+= --disable-cups PLIST_SUBST+= CUPS="@comment " .endif diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST index 4db6c5f9f78..3b1903241da 100644 --- a/x11/kdelibs3/PLIST +++ b/x11/kdelibs3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2004/12/14 10:58:30 markd Exp $ +@comment $NetBSD: PLIST,v 1.22 2005/03/06 12:48:09 markd Exp $ bin/artsmessage bin/checkXML ${CUPS}bin/cupsdconf @@ -58,7 +58,6 @@ bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc bin/preparetips -etc/xdg/menus/applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h include/arts/kartsfloatwatch.h @@ -885,6 +884,7 @@ share/doc/kde/HTML/en/kdelibs-apidocs/common 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 @@ -4801,6 +4801,7 @@ ${PKGLOCALEDIR}/locale/all_languages @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 @@ -4887,4 +4888,3 @@ ${PKGLOCALEDIR}/locale/all_languages @dirrm include/kabc @dirrm include/dom @comment in arts: @dirrm include/arts -@comment dirrm etc/xdg/menus diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 10b98a9f2ff..8f7d438e4d0 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.49 2005/02/23 17:36:16 wiz Exp $ +$NetBSD: distinfo,v 1.50 2005/03/06 12:48:09 markd Exp $ SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f RMD160 (kdelibs-3.3.2.tar.bz2) = 66d8bf05cff7aaf875a640a08b1a259085385036 Size (kdelibs-3.3.2.tar.bz2) = 15623180 bytes SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779 +SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64 SHA1 (patch-ae) = 8395dd9f24fb9cad91c1c04951dfc982cc8068f4 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952 -SHA1 (patch-an) = 0fccfa014212073f235945732ef3a3329756f9b5 +SHA1 (patch-an) = 1c13a19a72218c2d4385cb7e490e5dd03c2f4b07 SHA1 (patch-ao) = 5cc9be57db26a2615ae9c982eb2b894c2c193e6b SHA1 (patch-ap) = bd0aa3b4a4b56cd74b674ce191b48268adecc8b9 SHA1 (patch-aq) = 0cbe989b24378a2f0218f6a32328ce56aa812de4 diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab new file mode 100644 index 00000000000..a929da8d2c2 --- /dev/null +++ b/x11/kdelibs3/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.11 2005/03/06 12:48:09 markd Exp $ + +--- kded/Makefile.in.orig 2004-12-01 03:42:04.000000000 +1300 ++++ 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 diff --git a/x11/kdelibs3/patches/patch-an b/x11/kdelibs3/patches/patch-an index c668f8c7a72..390e9a5bf29 100644 --- a/x11/kdelibs3/patches/patch-an +++ b/x11/kdelibs3/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.6 2004/12/11 01:19:29 markd Exp $ +$NetBSD: patch-an,v 1.7 2005/03/06 12:48:09 markd Exp $ ---- kdecore/kstandarddirs.cpp.orig 2004-01-26 06:24:42.000000000 +1300 +--- kdecore/kstandarddirs.cpp.orig 2004-10-03 20:40:15.000000000 +1300 +++ 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")) @@ -50,7 +50,7 @@ $NetBSD: patch-an,v 1.6 2004/12/11 01:19:29 markd Exp $ 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 +59,7 @@ $NetBSD: patch-an,v 1.6 2004/12/11 01:19:29 markd Exp $ qFatal("unknown resource type %s", type); return QString::null; } -@@ -1129,6 +1129,7 @@ void KStandardDirs::addKDEDefaults() +@@ -1232,6 +1232,7 @@ void KStandardDirs::addKDEDefaults() } xdgdirList.append("/usr/local/share/"); @@ -67,3 +67,21 @@ $NetBSD: patch-an,v 1.6 2004/12/11 01:19:29 markd Exp $ xdgdirList.append("/usr/share/"); } +@@ -1402,7 +1403,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 +1412,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); + } + -- cgit v1.2.3