From cc3a1b98dbb5f28f9899b166be27a16e4831791a Mon Sep 17 00:00:00 2001 From: martti Date: Thu, 12 Apr 2007 09:55:08 +0000 Subject: Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. --- x11/libxfce4util/Makefile | 7 ++--- x11/libxfce4util/PLIST | 63 ++++++++++++++++++++++++++++++++++----- x11/libxfce4util/buildlink3.mk | 7 +++-- x11/libxfce4util/distinfo | 9 +++--- x11/libxfce4util/patches/patch-aa | 24 --------------- 5 files changed, 67 insertions(+), 43 deletions(-) delete mode 100644 x11/libxfce4util/patches/patch-aa (limited to 'x11/libxfce4util') diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index c33a2212007..2aa576bcb19 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 4.2.4 - DISTNAME= libxfce4util-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce basic library +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc + PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index becd89f163a..5885fec78a2 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,26 +1,73 @@ -@comment $NetBSD: PLIST,v 1.9 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/04/12 09:55:21 martti Exp $ include/xfce4/libxfce4util/debug.h include/xfce4/libxfce4util/i18n.h include/xfce4/libxfce4util/libxfce4util-config.h +include/xfce4/libxfce4util/libxfce4util-enum-types.h include/xfce4/libxfce4util/libxfce4util.h include/xfce4/libxfce4util/utf8.h -include/xfce4/libxfce4util/util-enum-types.h include/xfce4/libxfce4util/util.h include/xfce4/libxfce4util/xfce-desktopentry.h include/xfce4/libxfce4util/xfce-fileutils.h include/xfce4/libxfce4util/xfce-generics.h +include/xfce4/libxfce4util/xfce-i18n.h include/xfce4/libxfce4util/xfce-kiosk.h +include/xfce4/libxfce4util/xfce-license.h include/xfce4/libxfce4util/xfce-miscutils.h include/xfce4/libxfce4util/xfce-rc.h include/xfce4/libxfce4util/xfce-resource.h +include/xfce4/libxfce4util/xfce-utf8.h lib/libxfce4util.la lib/pkgconfig/libxfce4util-1.0.pc sbin/xfce4-kiosk-query -share/xfce4/m4/X11.m4 -share/xfce4/m4/debug.m4 -share/xfce4/m4/depends.m4 -share/xfce4/m4/i18n.m4 -@dirrm share/xfce4/m4 +share/doc/libxfce4util/home.png +share/doc/libxfce4util/index.html +share/doc/libxfce4util/index.sgml +share/doc/libxfce4util/left.png +share/doc/libxfce4util/libxfce4util-Desktop-entries.html +share/doc/libxfce4util/libxfce4util-File-Utilities.html +share/doc/libxfce4util/libxfce4util-Internationalisation.html +share/doc/libxfce4util/libxfce4util-Miscellaneous-Utilities.html +share/doc/libxfce4util/libxfce4util-Resource-Config-File-Support.html +share/doc/libxfce4util/libxfce4util-Resource-lookup-functions.html +share/doc/libxfce4util/libxfce4util-Software-Licenses.html +share/doc/libxfce4util/libxfce4util-Unicode-Support-Functions.html +share/doc/libxfce4util/libxfce4util-Version-Information.html +share/doc/libxfce4util/libxfce4util-Xfce-Generics.html +share/doc/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html +share/doc/libxfce4util/libxfce4util-core.html +share/doc/libxfce4util/libxfce4util-datatypes.html +share/doc/libxfce4util/libxfce4util-fundamentals.html +share/doc/libxfce4util/libxfce4util-utilities.html +share/doc/libxfce4util/libxfce4util.devhelp +share/doc/libxfce4util/libxfce4util.devhelp2 +share/doc/libxfce4util/reference.html +share/doc/libxfce4util/right.png +share/doc/libxfce4util/style.css +share/doc/libxfce4util/up.png +share/locale/ar/LC_MESSAGES/libxfce4util.mo +share/locale/ca/LC_MESSAGES/libxfce4util.mo +share/locale/cs/LC_MESSAGES/libxfce4util.mo +share/locale/cy/LC_MESSAGES/libxfce4util.mo +share/locale/de/LC_MESSAGES/libxfce4util.mo +share/locale/dz/LC_MESSAGES/libxfce4util.mo +share/locale/en_GB/LC_MESSAGES/libxfce4util.mo +share/locale/eu/LC_MESSAGES/libxfce4util.mo +share/locale/fi/LC_MESSAGES/libxfce4util.mo +share/locale/fr/LC_MESSAGES/libxfce4util.mo +share/locale/gl/LC_MESSAGES/libxfce4util.mo +share/locale/he/LC_MESSAGES/libxfce4util.mo +share/locale/it/LC_MESSAGES/libxfce4util.mo +share/locale/ja/LC_MESSAGES/libxfce4util.mo +share/locale/ka/LC_MESSAGES/libxfce4util.mo +share/locale/ko/LC_MESSAGES/libxfce4util.mo +share/locale/lt/LC_MESSAGES/libxfce4util.mo +share/locale/mk/LC_MESSAGES/libxfce4util.mo +share/locale/nl/LC_MESSAGES/libxfce4util.mo +share/locale/pl/LC_MESSAGES/libxfce4util.mo +share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo +share/locale/sq/LC_MESSAGES/libxfce4util.mo +share/locale/tr/LC_MESSAGES/libxfce4util.mo +share/locale/uk/LC_MESSAGES/libxfce4util.mo +@dirrm share/doc/libxfce4util @dirrm include/xfce4/libxfce4util @dirrm include/xfce4 -@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE} diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 95d8d066ba6..5805bf7c982 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:21 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ @@ -12,10 +12,13 @@ BUILDLINK_PACKAGES+= libxfce4util BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util .if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.4 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.1 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util .endif # LIBXFCE4UTIL_BUILDLINK3_MK +.include "../../devel/xfce4-dev-tools/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 41763dc0d0b..38475774c0e 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.16 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.17 2007/04/12 09:55:21 martti Exp $ -SHA1 (libxfce4util-4.2.4.tar.gz) = 89cd2c9570e1f068a1a1d3ddf5e5887576d6812c -RMD160 (libxfce4util-4.2.4.tar.gz) = 88c70b3e3cc6dd5f0a1519dc12b8e4092943e899 -Size (libxfce4util-4.2.4.tar.gz) = 428865 bytes -SHA1 (patch-aa) = 448e78adfaa2dc0407419060dbb4d57fad8e8bf7 +SHA1 (libxfce4util-4.4.1.tar.bz2) = 20b0d8b952e780569b0d32bcf26f377867c659c8 +RMD160 (libxfce4util-4.4.1.tar.bz2) = fa05dcf9e48d96dcae8ea1368647064e10a41a87 +Size (libxfce4util-4.4.1.tar.bz2) = 372848 bytes diff --git a/x11/libxfce4util/patches/patch-aa b/x11/libxfce4util/patches/patch-aa deleted file mode 100644 index 750229168cc..00000000000 --- a/x11/libxfce4util/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/01/23 11:53:47 martti Exp $ - -No, it's not ok. Except for GNU C. - ---- libxfce4util/xfce-miscutils.h.orig 2007-01-13 21:41:32.000000000 +0000 -+++ libxfce4util/xfce-miscutils.h 2007-01-23 11:26:14.000000000 +0000 -@@ -32,12 +32,11 @@ - - #include - --/* This looks a bit "hacky", but its ok */ --#define _BUILTIN_LICENSE_TEXT(name) \ --({ \ -- extern const char xfce_builtin_license_##name[]; \ -- xfce_builtin_license_##name; \ --}) -+extern const char xfce_builtin_license_BSD[]; -+extern const char xfce_builtin_license_GPL[]; -+extern const char xfce_builtin_license_LGPL[]; -+ -+#define _BUILTIN_LICENSE_TEXT(name) xfce_builtin_license_##name - - #if defined (__sun) - extern const char xfce_builtin_license_BSD[]; -- cgit v1.2.3