diff options
| author | reed <reed> | 2009-09-16 01:15:32 +0000 |
|---|---|---|
| committer | reed <reed> | 2009-09-16 01:15:32 +0000 |
| commit | 6a1ae5e3c60551eab5e38831e943bd5740d23cc1 (patch) | |
| tree | 0c5ff254424640857c1e834eb6a64837b8b09958 | |
| parent | 8406a9d0b61c5cb8f38f3b06e7972e715d366690 (diff) | |
| download | pkgsrc-6a1ae5e3c60551eab5e38831e943bd5740d23cc1.tar.gz | |
Upgrading Xfce to 4.6.1.
This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.
The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0
Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)
93 files changed, 1070 insertions, 870 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile index e327c1e9932..f683afc02b1 100644 --- a/audio/xfce4-mixer/Makefile +++ b/audio/xfce4-mixer/Makefile @@ -1,18 +1,25 @@ -# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:04 sno Exp $ +# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:33 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-mixer-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= audio COMMENT= Xfce mixer plugin -MAKE_JOBS_SAFE= no +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins +BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.14 + +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST index 9ce8baf1e3a..97d28860b6d 100644 --- a/audio/xfce4-mixer/PLIST +++ b/audio/xfce4-mixer/PLIST @@ -1,61 +1,77 @@ -@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:10:29 joerg Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:33 reed Exp $ bin/xfce4-mixer -lib/xfce4/mcs-plugins/sound_settings.la -lib/xfce4/modules/libxfce4mixer.la libexec/xfce4/panel-plugins/xfce4-mixer-plugin -share/applications/xfce-mixer-settings.desktop -share/icons/hicolor/48x48/apps/xfce4-mixer.png +share/applications/xfce4-mixer.desktop share/locale/am/LC_MESSAGES/xfce4-mixer.mo share/locale/ar/LC_MESSAGES/xfce4-mixer.mo -share/locale/az/LC_MESSAGES/xfce4-mixer.mo -share/locale/be/LC_MESSAGES/xfce4-mixer.mo -share/locale/bg/LC_MESSAGES/xfce4-mixer.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo share/locale/ca/LC_MESSAGES/xfce4-mixer.mo share/locale/cs/LC_MESSAGES/xfce4-mixer.mo share/locale/da/LC_MESSAGES/xfce4-mixer.mo share/locale/de/LC_MESSAGES/xfce4-mixer.mo -share/locale/dz/LC_MESSAGES/xfce4-mixer.mo -share/locale/el/LC_MESSAGES/xfce4-mixer.mo -share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo share/locale/es/LC_MESSAGES/xfce4-mixer.mo -share/locale/es_MX/LC_MESSAGES/xfce4-mixer.mo -share/locale/et/LC_MESSAGES/xfce4-mixer.mo share/locale/eu/LC_MESSAGES/xfce4-mixer.mo -share/locale/fa/LC_MESSAGES/xfce4-mixer.mo share/locale/fi/LC_MESSAGES/xfce4-mixer.mo share/locale/fr/LC_MESSAGES/xfce4-mixer.mo share/locale/gl/LC_MESSAGES/xfce4-mixer.mo -share/locale/gu/LC_MESSAGES/xfce4-mixer.mo -share/locale/he/LC_MESSAGES/xfce4-mixer.mo -share/locale/hi/LC_MESSAGES/xfce4-mixer.mo share/locale/hu/LC_MESSAGES/xfce4-mixer.mo -share/locale/hy/LC_MESSAGES/xfce4-mixer.mo share/locale/id/LC_MESSAGES/xfce4-mixer.mo share/locale/it/LC_MESSAGES/xfce4-mixer.mo share/locale/ja/LC_MESSAGES/xfce4-mixer.mo -share/locale/ka/LC_MESSAGES/xfce4-mixer.mo -share/locale/ko/LC_MESSAGES/xfce4-mixer.mo -share/locale/lt/LC_MESSAGES/xfce4-mixer.mo -share/locale/lv/LC_MESSAGES/xfce4-mixer.mo -share/locale/mk/LC_MESSAGES/xfce4-mixer.mo -share/locale/mr/LC_MESSAGES/xfce4-mixer.mo -share/locale/ms/LC_MESSAGES/xfce4-mixer.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo +share/locale/nb/LC_MESSAGES/xfce4-mixer.mo share/locale/nl/LC_MESSAGES/xfce4-mixer.mo -share/locale/pa/LC_MESSAGES/xfce4-mixer.mo share/locale/pl/LC_MESSAGES/xfce4-mixer.mo +share/locale/pt/LC_MESSAGES/xfce4-mixer.mo share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo -share/locale/ro/LC_MESSAGES/xfce4-mixer.mo share/locale/ru/LC_MESSAGES/xfce4-mixer.mo share/locale/si/LC_MESSAGES/xfce4-mixer.mo -share/locale/sk/LC_MESSAGES/xfce4-mixer.mo share/locale/sv/LC_MESSAGES/xfce4-mixer.mo -share/locale/ta/LC_MESSAGES/xfce4-mixer.mo share/locale/tr/LC_MESSAGES/xfce4-mixer.mo share/locale/uk/LC_MESSAGES/xfce4-mixer.mo -share/locale/vi/LC_MESSAGES/xfce4-mixer.mo share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo -share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo -share/xfce4/panel-plugins/xfce4-mixer.desktop +share/pixmaps/xfce4-mixer/chain-broken.png +share/pixmaps/xfce4-mixer/chain.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-muted.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-muted.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-record.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-record.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-high.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low-medium.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-medium.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-muted.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-ultra-low.png +share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-very-high.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-muted.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-muted.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-record.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-record.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-high.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low-medium.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-medium.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-muted.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-ultra-low.png +share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-very-high.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-muted.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-muted.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-record.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-record.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-high.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low-medium.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-medium.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-muted.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-ultra-low.png +share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-very-high.png +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-muted.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-muted.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-record.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-record.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-high.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low-medium.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-medium.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-muted.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-ultra-low.svg +share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-very-high.svg +share/xfce4/panel-plugins/xfce4-mixer-plugin.desktop diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk index 93a70a9df03..05985e5971a 100644 --- a/audio/xfce4-mixer/buildlink3.mk +++ b/audio/xfce4-mixer/buildlink3.mk @@ -1,19 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:04 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:33 reed Exp $ BUILDLINK_TREE+= xfce4-mixer .if !defined(XFCE4_MIXER_BUILDLINK3_MK) XFCE4_MIXER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-mixer?= xfce4-mixer>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_MIXER_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-mixer diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo index 8686fdc6b32..7b5830076b0 100644 --- a/audio/xfce4-mixer/distinfo +++ b/audio/xfce4-mixer/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.17 2008/12/17 12:50:02 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/09/16 01:15:33 reed Exp $ -SHA1 (xfce4-mixer-4.4.3.tar.bz2) = 33549a5adae984e36f77a50be0d4d67df3fc82bb -RMD160 (xfce4-mixer-4.4.3.tar.bz2) = 004d3bc6f74e9bc6ed3c1f8b9555972e55dfb8e2 -Size (xfce4-mixer-4.4.3.tar.bz2) = 483417 bytes +SHA1 (xfce4-mixer-4.6.1.tar.bz2) = e86163782fc4fc31671c7cb212d23d34106ad3af +RMD160 (xfce4-mixer-4.6.1.tar.bz2) = 1fd6c450967a87c28082f960de3659633b876efe +Size (xfce4-mixer-4.6.1.tar.bz2) = 412483 bytes diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile index 587082838a4..502c3080cfc 100644 --- a/devel/xfce4-dev-tools/Makefile +++ b/devel/xfce4-dev-tools/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:12 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2009/09/16 01:15:33 reed Exp $ -DISTNAME= xfce4-dev-tools-4.4.0.1 -CATEGORIES= devel -MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.2/src/ -EXTRACT_SUFX= .tar.bz2 +.include "../../meta-pkgs/xfce4/Makefile.common" -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.xfce.org/ +XFCE4_VERSION= 4.6.0 +DISTNAME= xfce4-dev-tools-${XFCE4_VERSION} +CATEGORIES= devel COMMENT= Xfce development tools LICENSE= gnu-gpl-v2 @@ -14,4 +12,9 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes +USE_TOOLS+= bash:run +REPLACE_BASH+= scripts/xdt-commit + +MAKE_DIRS+= ${PREFIX}/share/xfce4 + .include "../../mk/bsd.pkg.mk" diff --git a/devel/xfce4-dev-tools/PLIST b/devel/xfce4-dev-tools/PLIST index 701546cb552..f8b345c95b5 100644 --- a/devel/xfce4-dev-tools/PLIST +++ b/devel/xfce4-dev-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:48:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:33 reed Exp $ bin/xdt-autogen bin/xdt-commit share/xfce4/dev-tools/m4macros/xdt-depends.m4 diff --git a/devel/xfce4-dev-tools/buildlink3.mk b/devel/xfce4-dev-tools/buildlink3.mk index a7241acf173..6be5da8b275 100644 --- a/devel/xfce4-dev-tools/buildlink3.mk +++ b/devel/xfce4-dev-tools/buildlink3.mk @@ -1,14 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ - -BUILDLINK_DEPMETHOD.xfce4-dev-tools?= build +# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:15:33 reed Exp $ BUILDLINK_TREE+= xfce4-dev-tools .if !defined(XFCE4_DEV_TOOLS_BUILDLINK3_MK) XFCE4_DEV_TOOLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-dev-tools+= xfce4-dev-tools>=4.4.0.1 +BUILDLINK_API_DEPENDS.xfce4-dev-tools+= xfce4-dev-tools>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-dev-tools?= ../../devel/xfce4-dev-tools +BUILDLINK_DEPMETHOD.xfce4-dev-tools?= build .endif # XFCE4_DEV_TOOLS_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-dev-tools diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo index 762c2878832..a065be854dc 100644 --- a/devel/xfce4-dev-tools/distinfo +++ b/devel/xfce4-dev-tools/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/12/07 19:43:20 martti Exp $ +$NetBSD: distinfo,v 1.3 2009/09/16 01:15:33 reed Exp $ -SHA1 (xfce4-dev-tools-4.4.0.1.tar.bz2) = 4577d204087f7fe58228fc2f4140001d9b97b493 -RMD160 (xfce4-dev-tools-4.4.0.1.tar.bz2) = df02905cb59ad3c11d7ad4b6d55e73241c81b2dc -Size (xfce4-dev-tools-4.4.0.1.tar.bz2) = 60477 bytes +SHA1 (xfce4-dev-tools-4.6.0.tar.bz2) = a5a5cbc9e5f84f4939e53e3327c51f4b749c38a2 +RMD160 (xfce4-dev-tools-4.6.0.tar.bz2) = ff2a5e9c7bd637efdc76b126f8854b934d4862ba +Size (xfce4-dev-tools-4.6.0.tar.bz2) = 61934 bytes diff --git a/editors/xfce4-mousepad/Makefile b/editors/xfce4-mousepad/Makefile index 87964677906..be919900d00 100644 --- a/editors/xfce4-mousepad/Makefile +++ b/editors/xfce4-mousepad/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: Makefile,v 1.8 2009/09/16 01:15:33 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.2.14 +XFCE4_VERSION= 0.2.16 DISTNAME= mousepad-${XFCE4_VERSION} PKGNAME= xfce4-mousepad-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= editors COMMENT= Xfce text editor +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xfce4-mousepad/PLIST b/editors/xfce4-mousepad/PLIST index 9f1f87b9fe1..70c814434de 100644 --- a/editors/xfce4-mousepad/PLIST +++ b/editors/xfce4-mousepad/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/12/18 14:18:14 hira Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/09/16 01:15:33 reed Exp $ bin/mousepad share/applications/mousepad.desktop share/locale/am/LC_MESSAGES/mousepad.mo @@ -7,6 +7,7 @@ share/locale/be/LC_MESSAGES/mousepad.mo share/locale/ca/LC_MESSAGES/mousepad.mo share/locale/cs/LC_MESSAGES/mousepad.mo share/locale/cy/LC_MESSAGES/mousepad.mo +share/locale/da/LC_MESSAGES/mousepad.mo share/locale/de/LC_MESSAGES/mousepad.mo share/locale/dz/LC_MESSAGES/mousepad.mo share/locale/el/LC_MESSAGES/mousepad.mo @@ -30,13 +31,12 @@ share/locale/ku/LC_MESSAGES/mousepad.mo share/locale/lt/LC_MESSAGES/mousepad.mo share/locale/lv/LC_MESSAGES/mousepad.mo share/locale/mk/LC_MESSAGES/mousepad.mo -share/locale/nb_NO/LC_MESSAGES/mousepad.mo +share/locale/nb/LC_MESSAGES/mousepad.mo share/locale/nl/LC_MESSAGES/mousepad.mo share/locale/pa/LC_MESSAGES/mousepad.mo share/locale/pl/LC_MESSAGES/mousepad.mo share/locale/pt_BR/LC_MESSAGES/mousepad.mo share/locale/pt_PT/LC_MESSAGES/mousepad.mo -share/locale/ro/LC_MESSAGES/mousepad.mo share/locale/ru/LC_MESSAGES/mousepad.mo share/locale/si/LC_MESSAGES/mousepad.mo share/locale/sk/LC_MESSAGES/mousepad.mo @@ -44,7 +44,6 @@ share/locale/sl/LC_MESSAGES/mousepad.mo share/locale/sq/LC_MESSAGES/mousepad.mo share/locale/sv/LC_MESSAGES/mousepad.mo share/locale/ta/LC_MESSAGES/mousepad.mo -share/locale/th/LC_MESSAGES/mousepad.mo share/locale/tr/LC_MESSAGES/mousepad.mo share/locale/uk/LC_MESSAGES/mousepad.mo share/locale/ur/LC_MESSAGES/mousepad.mo diff --git a/editors/xfce4-mousepad/buildlink3.mk b/editors/xfce4-mousepad/buildlink3.mk index 2df78137f55..698ebce6519 100644 --- a/editors/xfce4-mousepad/buildlink3.mk +++ b/editors/xfce4-mousepad/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:33 reed Exp $ BUILDLINK_TREE+= xfce4-mousepad .if !defined(XFCE4_MOUSEPAD_BUILDLINK3_MK) XFCE4_MOUSEPAD_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-mousepad+= xfce4-mousepad>=0.2.14nb1 -BUILDLINK_ABI_DEPENDS.xfce4-mousepad?= xfce4-mousepad>=0.2.14nb2 +BUILDLINK_API_DEPENDS.xfce4-mousepad+= xfce4-mousepad>=0.2.16 BUILDLINK_PKGSRCDIR.xfce4-mousepad?= ../../editors/xfce4-mousepad -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_MOUSEPAD_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-mousepad diff --git a/editors/xfce4-mousepad/distinfo b/editors/xfce4-mousepad/distinfo index d6ca4b5dc3e..53ccddcc885 100644 --- a/editors/xfce4-mousepad/distinfo +++ b/editors/xfce4-mousepad/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.4 2009/09/16 01:15:33 reed Exp $ -SHA1 (mousepad-0.2.14.tar.bz2) = 0b9f0fbd8f85eb31ec89f897265b60589779a356 -RMD160 (mousepad-0.2.14.tar.bz2) = 9f5168bcdff163e27cd113418da4673a29ec9947 -Size (mousepad-0.2.14.tar.bz2) = 352485 bytes +SHA1 (mousepad-0.2.16.tar.bz2) = 4e63033e0a71578f3ec9a0d2e6a505efd0424ef9 +RMD160 (mousepad-0.2.16.tar.bz2) = 673a52a38dfa60388db11322cd08189c1b2c10e3 +Size (mousepad-0.2.16.tar.bz2) = 332253 bytes diff --git a/graphics/xfce4-icon-theme/Makefile b/graphics/xfce4-icon-theme/Makefile index d0e339fd93d..e484a3d44cd 100644 --- a/graphics/xfce4-icon-theme/Makefile +++ b/graphics/xfce4-icon-theme/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.9 2009/08/26 20:19:17 sno Exp $ +# $NetBSD: Makefile,v 1.10 2009/09/16 01:15:33 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" +XFCE4_VERSION= 4.4.3 + DISTNAME= xfce4-icon-theme-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= graphics COMMENT= Xfce icon themes diff --git a/graphics/xfce4-icon-theme/PLIST b/graphics/xfce4-icon-theme/PLIST index f1a50826218..3c512122465 100644 --- a/graphics/xfce4-icon-theme/PLIST +++ b/graphics/xfce4-icon-theme/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:05:44 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:33 reed Exp $ lib/pkgconfig/xfce4-icon-theme-1.0.pc share/icons/Rodent/48x48/apps/applets-screenshooter.png share/icons/Rodent/48x48/apps/bluefish-icon.png @@ -1610,3 +1610,5 @@ share/icons/Rodent/scalable/stock/volume-min.svg share/icons/Rodent/scalable/stock/volume-mute.svg share/icons/Rodent/scalable/stock/volume-zero.svg share/xfce4/mime/Rodent.mime.xml +@unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE} diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk index d2a98f00c55..cbafd7ee4ac 100644 --- a/graphics/xfce4-icon-theme/buildlink3.mk +++ b/graphics/xfce4-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:15:33 reed Exp $ BUILDLINK_TREE+= xfce4-icon-theme @@ -6,11 +6,9 @@ BUILDLINK_TREE+= xfce4-icon-theme XFCE4_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3 -BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?= xfce4-icon-theme>=4.4.3nb1 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile index 9a812d37474..28721366fda 100644 --- a/meta-pkgs/xfce4/Makefile +++ b/meta-pkgs/xfce4/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.37 2009/08/26 19:56:53 sno Exp $ +# $NetBSD: Makefile,v 1.38 2009/09/16 01:15:33 reed Exp $ META_PACKAGE= yes .include "Makefile.common" DISTNAME= xfce4-${XFCE4_VERSION} -PKGREVISION= 4 CATEGORIES= meta-pkgs COMMENT= Xfce .include "../../audio/xfce4-mixer/buildlink3.mk" .include "../../editors/xfce4-mousepad/buildlink3.mk" +.include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/xfce4-icon-theme/buildlink3.mk" .include "../../print/xfce4-print/buildlink3.mk" .include "../../sysutils/xfce4-appfinder/buildlink3.mk" @@ -22,6 +22,7 @@ COMMENT= Xfce .include "../../x11/xfce4-gtk2-engine/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../x11/xfce4-session/buildlink3.mk" +.include "../../x11/xfce4-settings/buildlink3.mk" .include "../../x11/xfce4-terminal/buildlink3.mk" .include "../../x11/xfce4-utils/buildlink3.mk" diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index e0be07c36c8..5dd1a240675 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,13 +1,36 @@ -# $NetBSD: Makefile.common,v 1.41 2009/05/19 08:59:23 wiz Exp $ - -MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.3/src/ +# $NetBSD: Makefile.common,v 1.42 2009/09/16 01:15:33 reed Exp $ + +# used by audio/xfce4-mixer/Makefile +# used by devel/xfce4-dev-tools/Makefile +# used by devel/xfconf/Makefile +# used by editors/xfce4-mousepad/Makefile +# used by graphics/xfce4-icon-theme/Makefile +# used by print/xfce4-print/Makefile +# used by sysutils/xfce4-appfinder/Makefile +# used by sysutils/xfce4-thunar/Makefile +# used by time/xfce4-orage/Makefile +# used by wm/xfce4-wm-themes/Makefile +# used by wm/xfce4-wm/Makefile +# used by x11/xfce4-desktop/Makefile +# used by x11/xfce4-exo/Makefile +# used by x11/xfce4-gtk2-engine/Makefile +# used by x11/xfce4-panel/Makefile +# used by x11/libxfce4gui/Makefile +# used by x11/libxfce4menu/Makefile +# used by x11/libxfce4util/Makefile +# used by x11/xfce4-session/Makefile +# used by x11/xfce4-settings/Makefile +# used by x11/xfce4-terminal/Makefile +# used by x11/xfce4-utils/Makefile + +MASTER_SITES= http://www.xfce.org/archive/xfce-4.6.1/src/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= dieter.NetBSD@pandora.be HOMEPAGE= http://www.xfce.org/ LICENSE= gnu-gpl-v2 -XFCE4_VERSION= 4.4.3 +XFCE4_VERSION= 4.6.1 # Do NOT put a PKGREVISION statement in this file! @@ -22,10 +45,9 @@ GCC_REQD+= 3.0 XFCE4_EGBASE= ${PREFIX}/share/examples/xfce4 -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" ## # Use the latest GNU tar when the native tar is buggy ## .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk index 98ed6221002..bf77abe100d 100644 --- a/meta-pkgs/xfce4/buildlink3.mk +++ b/meta-pkgs/xfce4/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.22 2009/08/26 19:56:53 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/09/16 01:15:33 reed Exp $ BUILDLINK_TREE+= xfce4 .if !defined(XFCE4_BUILDLINK3_MK) XFCE4_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.4.1 -BUILDLINK_ABI_DEPENDS.xfce4?= xfce4>=4.4.3nb4 +BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.6.0 +BUILDLINK_ABI_DEPENDS.xfce4+= xfce4>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 .include "../../audio/xfce4-mixer/buildlink3.mk" @@ -24,7 +24,6 @@ BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 .include "../../x11/xfce4-session/buildlink3.mk" .include "../../x11/xfce4-terminal/buildlink3.mk" .include "../../x11/xfce4-utils/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 809f6d0d5d4..47d9267aeee 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2009/08/26 19:56:52 sno Exp $ +# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,14 +6,18 @@ PKG_DESTDIR_SUPPORT= user-destdir PKGNAME= xfce4-print-${XFCE4_VERSION} DISTNAME= xfprint-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= print COMMENT= Xfce print dialog -HOMEPAGE= http://www.xfce.org/projects/xfprint/ -CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc +PKGCONFIG_OVERRIDE+= libxfprint/xfprint-1.0.pc.in + CONFIGURE_ARGS+= --with-printcap=/etc/printcap +MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images + .include "options.mk" PLIST_VARS+= bsdlpr @@ -21,7 +25,10 @@ PLIST_VARS+= bsdlpr PLIST.bsdlpr= yes .endif +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../print/a2ps/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST index 3d9f1f40cbd..56a091d8dc0 100644 --- a/print/xfce4-print/PLIST +++ b/print/xfce4-print/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:12:03 joerg Exp $ -${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la +@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:34 reed Exp $ +bin/xfprint-settings bin/xfprint4 bin/xfprint4-manager include/xfce4/libxfprint/common.h @@ -11,26 +11,26 @@ include/xfce4/libxfprint/printer.h include/xfce4/libxfprint/printing-system.h lib/libxfprint.la lib/pkgconfig/xfprint-1.0.pc -lib/xfce4/mcs-plugins/xfprint_plugin.la +${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la ${PLIST.cups}lib/xfce4/xfprint-plugins/cups_plugin.la -share/applications/xfce-xfprint-settings.desktop share/applications/xfprint-manager.desktop +share/applications/xfprint-settings.desktop share/applications/xfprint.desktop -share/doc/libxfprint/PrinterListWindow.html -share/doc/libxfprint/PrinterQueueWindow.html -share/doc/libxfprint/PrintingSystem.html -share/doc/libxfprint/ch01.html -share/doc/libxfprint/home.png -share/doc/libxfprint/index.html -share/doc/libxfprint/index.sgml -share/doc/libxfprint/left.png -share/doc/libxfprint/libxfprint-Job.html -share/doc/libxfprint/libxfprint-Printer.html -share/doc/libxfprint/libxfprint.devhelp -share/doc/libxfprint/libxfprint.devhelp2 -share/doc/libxfprint/right.png -share/doc/libxfprint/style.css -share/doc/libxfprint/up.png +share/gtk-doc/html/libxfprint/PrinterListWindow.html +share/gtk-doc/html/libxfprint/PrinterQueueWindow.html +share/gtk-doc/html/libxfprint/PrintingSystem.html +share/gtk-doc/html/libxfprint/ch01.html +share/gtk-doc/html/libxfprint/home.png +share/gtk-doc/html/libxfprint/index.html +share/gtk-doc/html/libxfprint/index.sgml +share/gtk-doc/html/libxfprint/left.png +share/gtk-doc/html/libxfprint/libxfprint-Job.html +share/gtk-doc/html/libxfprint/libxfprint-Printer.html +share/gtk-doc/html/libxfprint/libxfprint.devhelp +share/gtk-doc/html/libxfprint/libxfprint.devhelp2 +share/gtk-doc/html/libxfprint/right.png +share/gtk-doc/html/libxfprint/style.css +share/gtk-doc/html/libxfprint/up.png share/icons/hicolor/24x24/devices/printer.png share/icons/hicolor/48x48/devices/printer.png share/icons/hicolor/scalable/devices/printer.svg @@ -70,16 +70,16 @@ share/locale/lv/LC_MESSAGES/xfprint.mo share/locale/mk/LC_MESSAGES/xfprint.mo share/locale/mr/LC_MESSAGES/xfprint.mo share/locale/ms/LC_MESSAGES/xfprint.mo -share/locale/nb_NO/LC_MESSAGES/xfprint.mo share/locale/nl/LC_MESSAGES/xfprint.mo share/locale/pa/LC_MESSAGES/xfprint.mo share/locale/pl/LC_MESSAGES/xfprint.mo +share/locale/pt/LC_MESSAGES/xfprint.mo share/locale/pt_BR/LC_MESSAGES/xfprint.mo -share/locale/pt_PT/LC_MESSAGES/xfprint.mo share/locale/ro/LC_MESSAGES/xfprint.mo share/locale/ru/LC_MESSAGES/xfprint.mo share/locale/si/LC_MESSAGES/xfprint.mo share/locale/sk/LC_MESSAGES/xfprint.mo +share/locale/sq/LC_MESSAGES/xfprint.mo share/locale/sv/LC_MESSAGES/xfprint.mo share/locale/ta/LC_MESSAGES/xfprint.mo share/locale/tr/LC_MESSAGES/xfprint.mo diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk index 4c48e51f9ea..7a0eadc86d4 100644 --- a/print/xfce4-print/buildlink3.mk +++ b/print/xfce4-print/buildlink3.mk @@ -1,19 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:56:52 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-print .if !defined(XFCE4_PRINT_BUILDLINK3_MK) XFCE4_PRINT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-print?= xfce4-print>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.6.0 +BUILDLINK_ABI_DEPENDS.xfce4-print+= xfce4-print>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../print/a2ps/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" pkgbase := xfce4-print .include "../../mk/pkg-build-options.mk" diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo index c0468e83c54..39fc652534f 100644 --- a/print/xfce4-print/distinfo +++ b/print/xfce4-print/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $ -SHA1 (xfprint-4.4.3.tar.bz2) = a1670dd247a04dcd3ba897cc32977f0828926900 -RMD160 (xfprint-4.4.3.tar.bz2) = 3acdb7442da91df9c715193b6ba83f10d1db4e64 -Size (xfprint-4.4.3.tar.bz2) = 842716 bytes -SHA1 (patch-aa) = 2d165843610510198a23773e0b93351edc24c6b6 -SHA1 (patch-ab) = d17b4373fe318f371a9ba8064546a6b6d3383379 +SHA1 (xfprint-4.6.1.tar.bz2) = 4ce98c49d49b2d4c1a8fb5d76597b8e9ab9a51e8 +RMD160 (xfprint-4.6.1.tar.bz2) = 8df81375cbc72eabd95911997210c8fa864bcf0b +Size (xfprint-4.6.1.tar.bz2) = 842675 bytes +SHA1 (patch-aa) = 825cc96436a358b94883c9c5ef232fd8c12ceb4f +SHA1 (patch-ab) = 8cdda358cff094ace2f8acd06b85ebd66c817478 diff --git a/print/xfce4-print/patches/patch-aa b/print/xfce4-print/patches/patch-aa index 042d661180a..af34f51546d 100644 --- a/print/xfce4-print/patches/patch-aa +++ b/print/xfce4-print/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:22 martti Exp $ +$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:34 reed Exp $ ---- xfprint/Makefile.in.orig 2007-11-17 19:55:13.000000000 +0000 -+++ xfprint/Makefile.in 2007-12-04 09:52:06.000000000 +0000 -@@ -314,7 +314,8 @@ +--- xfprint/Makefile.in.orig 2009-02-25 06:37:08.000000000 +0000 ++++ xfprint/Makefile.in +@@ -310,7 +310,8 @@ xfprint4_LDFLAGS = \ xfprint4_LDADD = \ $(top_builddir)/libxfprint/libxfprint.la \ - @LIBXFCE4MCS_CLIENT_LIBS@ \ + @XFCONF_LIBS@ \ - @LIBXFCEGUI4_LIBS@ + @LIBXFCEGUI4_LIBS@ \ + @GMODULE_LIBS@ diff --git a/print/xfce4-print/patches/patch-ab b/print/xfce4-print/patches/patch-ab index f4c578dcc98..6798fddbd15 100644 --- a/print/xfce4-print/patches/patch-ab +++ b/print/xfce4-print/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.3 2007/12/07 19:43:22 martti Exp $ +$NetBSD: patch-ab,v 1.4 2009/09/16 01:15:34 reed Exp $ ---- xfprint-manager/Makefile.in.orig 2007-11-17 19:55:13.000000000 +0000 -+++ xfprint-manager/Makefile.in 2007-12-04 09:52:10.000000000 +0000 -@@ -294,7 +294,8 @@ +--- xfprint-manager/Makefile.in.orig 2009-02-25 06:37:04.000000000 +0000 ++++ xfprint-manager/Makefile.in +@@ -290,7 +290,8 @@ xfprint4_manager_LDFLAGS = \ xfprint4_manager_LDADD = \ $(top_builddir)/libxfprint/libxfprint.la \ - @LIBXFCE4MCS_CLIENT_LIBS@ \ + @XFCONF_LIBS@ \ - @LIBXFCEGUI4_LIBS@ -+ @LIBXFCEGUI4_LIBS@ \ -+ @GMODULE_LIBS@ ++ @LIBXFCEGUI4_LIBS@ \ ++ @GMODULE_LIBS@ appsdir = $(datadir)/applications apps_in_files = xfprint-manager.desktop.in diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile index 4bdb6f14ad1..2c9d6b76689 100644 --- a/sysutils/xfce4-appfinder/Makefile +++ b/sysutils/xfce4-appfinder/Makefile @@ -1,14 +1,18 @@ -# $NetBSD: Makefile,v 1.11 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: Makefile,v 1.12 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-appfinder-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= sysutils COMMENT= Xfce application finder +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4menu/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-appfinder/PLIST b/sysutils/xfce4-appfinder/PLIST index 774c0c720f5..a0d90415d8f 100644 --- a/sysutils/xfce4-appfinder/PLIST +++ b/sysutils/xfce4-appfinder/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.10 2008/12/18 14:23:52 hira Exp $ +@comment $NetBSD: PLIST,v 1.11 2009/09/16 01:15:34 reed Exp $ bin/xfce4-appfinder share/applications/xfce4-appfinder.desktop share/icons/hicolor/48x48/apps/xfce4-appfinder.png share/locale/am/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo share/locale/be/LC_MESSAGES/xfce4-appfinder.mo share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo @@ -30,31 +31,25 @@ share/locale/it/LC_MESSAGES/xfce4-appfinder.mo share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-appfinder.mo +share/locale/nb/LC_MESSAGES/xfce4-appfinder.mo share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo +share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo share/locale/pt_BR/LC_MESSAGES/xfce4-appfinder.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-appfinder.mo share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo share/locale/si/LC_MESSAGES/xfce4-appfinder.mo share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo +share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo share/locale/ur/LC_MESSAGES/xfce4-appfinder.mo share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo -share/xfce4/doc/C/images/appfinder-handle-popup.png -share/xfce4/doc/C/images/appfinder-item-popup.png -share/xfce4/doc/C/images/default_appfinder.png -share/xfce4/doc/C/xfce4-appfinder.html -share/xfce4/doc/fr/images/appfinder-handle-popup.png -share/xfce4/doc/fr/images/appfinder-item-popup.png -share/xfce4/doc/fr/images/default_appfinder.png -share/xfce4/doc/fr/xfce4-appfinder.html diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk index 57b83a91441..5bfe9fd5633 100644 --- a/sysutils/xfce4-appfinder/buildlink3.mk +++ b/sysutils/xfce4-appfinder/buildlink3.mk @@ -1,18 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.19 2009/08/26 19:57:06 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-appfinder .if !defined(XFCE4_APPFINDER_BUILDLINK3_MK) XFCE4_APPFINDER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-appfinder?= xfce4-appfinder>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_APPFINDER_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-appfinder diff --git a/sysutils/xfce4-appfinder/distinfo b/sysutils/xfce4-appfinder/distinfo index 15763e4b35d..cfdbbfb8040 100644 --- a/sysutils/xfce4-appfinder/distinfo +++ b/sysutils/xfce4-appfinder/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.10 2009/09/16 01:15:34 reed Exp $ -SHA1 (xfce4-appfinder-4.4.3.tar.bz2) = 62d74a006dabcdadf9d6b7130907e3c4dd1b9697 -RMD160 (xfce4-appfinder-4.4.3.tar.bz2) = f73e1a4dd2c705808199a23f2bcc4e97463cc553 -Size (xfce4-appfinder-4.4.3.tar.bz2) = 338253 bytes +SHA1 (xfce4-appfinder-4.6.1.tar.bz2) = ecc1f2c6afec8cfb79464a34d23f94c6ed7d017e +RMD160 (xfce4-appfinder-4.6.1.tar.bz2) = 00487ac1c963b0c7085d7725e05a0928412c8295 +Size (xfce4-appfinder-4.6.1.tar.bz2) = 314040 bytes diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile index 98ad2243d33..755429ab4fd 100644 --- a/sysutils/xfce4-thunar/Makefile +++ b/sysutils/xfce4-thunar/Makefile @@ -1,26 +1,27 @@ -# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.9.3 +XFCE4_VERSION= 1.0.1 DISTNAME= Thunar-${XFCE4_VERSION} PKGNAME= xfce4-thunar-${XFCE4_VERSION} -PKGREVISION= 3 CATEGORIES= sysutils COMMENT= Xfce file manager -#DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser - - PKGCONFIG_OVERRIDE+= thunar-vfs/thunar-vfs-1.pc.in PKGCONFIG_OVERRIDE+= thunarx/thunarx-1.pc.in -PKG_SYSCONFSUBDIR= xdg/Thunar -EGDIR= ${PREFIX}/share/examples/Thunar -CONF_FILES= ${EGDIR:Q}/uca.xml ${PKG_SYSCONFDIR:Q}/uca.xml +PKG_SYSCONFSUBDIR= xdg/Thunar +EGDIR= ${XFCE4_EGBASE}/Thunar + +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins +MAKE_DIRS+= ${XFCE4_EGBASE} ${PREFIX}/share/xfce4 +MAKE_DIRS+= ${PREFIX}/share/xfce4/panel-plugins + +CONF_FILES= ${EGDIR}/uca.xml ${PKG_SYSCONFDIR}/uca.xml .include "options.mk" @@ -29,11 +30,14 @@ CONF_FILES= ${EGDIR:Q}/uca.xml ${PKG_SYSCONFDIR:Q}/uca.xml .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-thunar/PLIST b/sysutils/xfce4-thunar/PLIST index 96eb87d3797..b40619ee979 100644 --- a/sysutils/xfce4-thunar/PLIST +++ b/sysutils/xfce4-thunar/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:22 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $ bin/Thunar bin/thunar +bin/thunar-settings include/thunar-vfs-1/thunar-vfs/thunar-vfs-config.h include/thunar-vfs-1/thunar-vfs/thunar-vfs-enum-types.h include/thunar-vfs-1/thunar-vfs/thunar-vfs-info.h @@ -37,6 +38,7 @@ lib/pkgconfig/thunarx-1.pc lib/thunarx-1/thunar-apr.la lib/thunarx-1/thunar-sbr.la lib/thunarx-1/thunar-uca.la +lib/thunarx-1/thunar-wallpaper-plugin.la libexec/ThunarBulkRename libexec/ThunarHelp libexec/thunar-sendto-email @@ -50,6 +52,7 @@ share/Thunar/sendto/thunar-sendto-email.desktop share/applications/Thunar-bulk-rename.desktop share/applications/Thunar-folder-handler.desktop share/applications/Thunar.desktop +share/applications/thunar-settings.desktop share/dbus-1/services/org.xfce.FileManager.service share/dbus-1/services/org.xfce.Thunar.service share/doc/Thunar/README.gtkrc @@ -77,6 +80,27 @@ share/doc/Thunar/html/C/support.html share/doc/Thunar/html/C/the-file-manager-window.html share/doc/Thunar/html/C/using-removable-media.html share/doc/Thunar/html/C/working-with-files-and-folders.html +share/doc/Thunar/html/da/advanced-topics.html +share/doc/Thunar/html/da/copyright.html +share/doc/Thunar/html/da/customizing-thunar.html +share/doc/Thunar/html/da/faq.html +share/doc/Thunar/html/da/images/bulk-rename.png +share/doc/Thunar/html/da/images/file-manager-window.png +share/doc/Thunar/html/da/images/file-properties.png +share/doc/Thunar/html/da/images/preferences-advanced.png +share/doc/Thunar/html/da/images/preferences-behavior.png +share/doc/Thunar/html/da/images/preferences-side-pane.png +share/doc/Thunar/html/da/images/preferences-views.png +share/doc/Thunar/html/da/images/removable-drives-and-media.png +share/doc/Thunar/html/da/images/removable-media-unmount.png +share/doc/Thunar/html/da/images/sendto-menu.png +share/doc/Thunar/html/da/images/visible-columns.png +share/doc/Thunar/html/da/index.html +share/doc/Thunar/html/da/preferences.html +share/doc/Thunar/html/da/support.html +share/doc/Thunar/html/da/the-file-manager-window.html +share/doc/Thunar/html/da/using-removable-media.html +share/doc/Thunar/html/da/working-with-files-and-folders.html share/doc/Thunar/html/es/advanced-topics.html share/doc/Thunar/html/es/copyright.html share/doc/Thunar/html/es/customizing-thunar.html @@ -140,6 +164,37 @@ share/doc/Thunar/html/fr/support.html share/doc/Thunar/html/fr/the-file-manager-window.html share/doc/Thunar/html/fr/using-removable-media.html share/doc/Thunar/html/fr/working-with-files-and-folders.html +share/doc/Thunar/html/gl/advanced-topics.html +share/doc/Thunar/html/gl/copyright.html +share/doc/Thunar/html/gl/customizing-thunar.html +share/doc/Thunar/html/gl/faq.html +share/doc/Thunar/html/gl/index.html +share/doc/Thunar/html/gl/preferences.html +share/doc/Thunar/html/gl/support.html +share/doc/Thunar/html/gl/the-file-manager-window.html +share/doc/Thunar/html/gl/using-removable-media.html +share/doc/Thunar/html/gl/working-with-files-and-folders.html +share/doc/Thunar/html/it/advanced-topics.html +share/doc/Thunar/html/it/copyright.html +share/doc/Thunar/html/it/customizing-thunar.html +share/doc/Thunar/html/it/faq.html +share/doc/Thunar/html/it/images/bulk-rename.png +share/doc/Thunar/html/it/images/file-manager-window.png +share/doc/Thunar/html/it/images/file-properties.png +share/doc/Thunar/html/it/images/preferences-advanced.png +share/doc/Thunar/html/it/images/preferences-behavior.png +share/doc/Thunar/html/it/images/preferences-side-pane.png +share/doc/Thunar/html/it/images/preferences-views.png +share/doc/Thunar/html/it/images/removable-drives-and-media.png +share/doc/Thunar/html/it/images/removable-media-unmount.png +share/doc/Thunar/html/it/images/sendto-menu.png +share/doc/Thunar/html/it/images/visible-columns.png +share/doc/Thunar/html/it/index.html +share/doc/Thunar/html/it/preferences.html +share/doc/Thunar/html/it/support.html +share/doc/Thunar/html/it/the-file-manager-window.html +share/doc/Thunar/html/it/using-removable-media.html +share/doc/Thunar/html/it/working-with-files-and-folders.html share/doc/Thunar/html/ja/advanced-topics.html share/doc/Thunar/html/ja/copyright.html share/doc/Thunar/html/ja/customizing-thunar.html @@ -225,6 +280,27 @@ share/doc/Thunar/html/ru/the-file-manager-window.html share/doc/Thunar/html/ru/using-removable-media.html share/doc/Thunar/html/ru/working-with-files-and-folders.html share/doc/Thunar/html/thunar.css +share/doc/Thunar/html/tr/advanced-topics.html +share/doc/Thunar/html/tr/copyright.html +share/doc/Thunar/html/tr/customizing-thunar.html +share/doc/Thunar/html/tr/faq.html +share/doc/Thunar/html/tr/images/bulk-rename.png +share/doc/Thunar/html/tr/images/file-manager-window.png +share/doc/Thunar/html/tr/images/file-properties.png +share/doc/Thunar/html/tr/images/preferences-advanced.png +share/doc/Thunar/html/tr/images/preferences-behavior.png +share/doc/Thunar/html/tr/images/preferences-side-pane.png +share/doc/Thunar/html/tr/images/preferences-views.png +share/doc/Thunar/html/tr/images/removable-drives-and-media.png +share/doc/Thunar/html/tr/images/removable-media-unmount.png +share/doc/Thunar/html/tr/images/sendto-menu.png +share/doc/Thunar/html/tr/images/visible-columns.png +share/doc/Thunar/html/tr/index.html +share/doc/Thunar/html/tr/preferences.html +share/doc/Thunar/html/tr/support.html +share/doc/Thunar/html/tr/the-file-manager-window.html +share/doc/Thunar/html/tr/using-removable-media.html +share/doc/Thunar/html/tr/working-with-files-and-folders.html share/doc/Thunar/html/zh_TW/advanced-topics.html share/doc/Thunar/html/zh_TW/copyright.html share/doc/Thunar/html/zh_TW/customizing-thunar.html @@ -246,7 +322,7 @@ share/doc/Thunar/html/zh_TW/support.html share/doc/Thunar/html/zh_TW/the-file-manager-window.html share/doc/Thunar/html/zh_TW/using-removable-media.html share/doc/Thunar/html/zh_TW/working-with-files-and-folders.html -share/examples/Thunar/uca.xml +share/examples/xfce4/Thunar/uca.xml share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html @@ -347,13 +423,13 @@ share/locale/ku/LC_MESSAGES/Thunar.mo share/locale/lt/LC_MESSAGES/Thunar.mo share/locale/lv/LC_MESSAGES/Thunar.mo share/locale/mk/LC_MESSAGES/Thunar.mo -share/locale/nb_NO/LC_MESSAGES/Thunar.mo +share/locale/nb/LC_MESSAGES/Thunar.mo share/locale/nl/LC_MESSAGES/Thunar.mo -share/locale/nn_NO/LC_MESSAGES/Thunar.mo +share/locale/nn/LC_MESSAGES/Thunar.mo share/locale/pa/LC_MESSAGES/Thunar.mo share/locale/pl/LC_MESSAGES/Thunar.mo +share/locale/pt/LC_MESSAGES/Thunar.mo share/locale/pt_BR/LC_MESSAGES/Thunar.mo -share/locale/pt_PT/LC_MESSAGES/Thunar.mo share/locale/ro/LC_MESSAGES/Thunar.mo share/locale/ru/LC_MESSAGES/Thunar.mo share/locale/sk/LC_MESSAGES/Thunar.mo diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk index 31872d19c4c..4e164ec81b0 100644 --- a/sysutils/xfce4-thunar/buildlink3.mk +++ b/sysutils/xfce4-thunar/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-thunar .if !defined(XFCE4_THUNAR_BUILDLINK3_MK) XFCE4_THUNAR_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=0.9.3nb2 -BUILDLINK_ABI_DEPENDS.xfce4-thunar?= xfce4-thunar>=0.9.3nb3 +BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.0.0 BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar pkgbase := xfce4-thunar @@ -18,15 +17,14 @@ pkgbase := xfce4-thunar .include "../../devel/GConf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" .endif # XFCE4_THUNAR_BUILDLINK3_MK diff --git a/sysutils/xfce4-thunar/distinfo b/sysutils/xfce4-thunar/distinfo index c5711a85870..9e9910e6788 100644 --- a/sysutils/xfce4-thunar/distinfo +++ b/sysutils/xfce4-thunar/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.6 2009/09/16 01:15:34 reed Exp $ -SHA1 (Thunar-0.9.3.tar.bz2) = bb43fbe5ac3af1204517ed88da1cc3e87c5ec688 -RMD160 (Thunar-0.9.3.tar.bz2) = cc5c17a2841d5778e4832cc21e620ac351c9c57b -Size (Thunar-0.9.3.tar.bz2) = 6502363 bytes +SHA1 (Thunar-1.0.1.tar.bz2) = 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 +RMD160 (Thunar-1.0.1.tar.bz2) = 203690b9eb05ca8e5248bb026f98b8e3e6881f2c +Size (Thunar-1.0.1.tar.bz2) = 8802672 bytes SHA1 (patch-aa) = c9d9dfb4c177aab2e8a43e46998652cc72daefa5 -SHA1 (patch-ab) = 432284c67bf01960805c2cb2d8458156fd286633 -SHA1 (patch-ac) = 05e9ca2a39923255e84bdc28a082170381b77e17 +SHA1 (patch-ab) = e5c3f1e853bf59f69047c7160a3e29df54298879 +SHA1 (patch-ac) = 745f240ff44b0b21eb727b0a9887c9d8f1ee8a47 diff --git a/sysutils/xfce4-thunar/patches/patch-ab b/sysutils/xfce4-thunar/patches/patch-ab index c8485ce333e..dbaa69a9dd1 100644 --- a/sysutils/xfce4-thunar/patches/patch-ab +++ b/sysutils/xfce4-thunar/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.3 2008/12/17 12:50:03 hira Exp $ +$NetBSD: patch-ab,v 1.4 2009/09/16 01:15:34 reed Exp $ ---- configure.orig 2008-10-27 07:58:27.000000000 +0900 -+++ configure 2008-11-28 05:13:19.000000000 +0900 -@@ -30650,7 +30650,7 @@ - { $as_echo "$as_me:$LINENO: checking for operating system support" >&5 - $as_echo_n "checking for operating system support... " >&6; } +--- configure.orig 2009-02-24 21:09:38.000000000 +0000 ++++ configure +@@ -21169,7 +21169,7 @@ fi + { echo "$as_me:$LINENO: checking for operating system support" >&5 + echo $ECHO_N "checking for operating system support... $ECHO_C" >&6; } case "$target_os" in - dragonfly*|freebsd*|netbsd*|openbsd*|darwin*) + freebsd*|netbsd*|openbsd*|darwin*) diff --git a/sysutils/xfce4-thunar/patches/patch-ac b/sysutils/xfce4-thunar/patches/patch-ac index 42391068ce8..585cf91f0c0 100644 --- a/sysutils/xfce4-thunar/patches/patch-ac +++ b/sysutils/xfce4-thunar/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2008/12/17 12:50:03 hira Exp $ +$NetBSD: patch-ac,v 1.2 2009/09/16 01:15:34 reed Exp $ --- plugins/thunar-uca/Makefile.in.orig 2008-11-29 17:25:52.000000000 +0900 +++ plugins/thunar-uca/Makefile.in 2008-11-29 17:27:26.000000000 +0900 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2008/12/17 12:50:03 hira Exp $ $(PLATFORM_LDFLAGS) -defaultsdir = $(sysconfdir)/xdg/Thunar -+defaultsdir = $(datadir)/examples/Thunar ++defaultsdir = $(datadir)/examples/xfce4/Thunar defaults_in_files = uca.xml.in defaults_DATA = $(defaults_in_files:.xml.in=.xml) EXTRA_DIST = \ diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile index 2ed970610a4..2fdfc55523f 100644 --- a/time/xfce4-orage/Makefile +++ b/time/xfce4-orage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:05 sno Exp $ +# $NetBSD: Makefile,v 1.5 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,11 +6,19 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= orage-${XFCE4_VERSION} PKGNAME= xfce4-orage-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= time COMMENT= Xfce time managing application +CONFIGURE_ARGS+= --disable-libxfce4mcs + +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/xfce4-orage/PLIST b/time/xfce4-orage/PLIST index 2efae587493..6580699f293 100644 --- a/time/xfce4-orage/PLIST +++ b/time/xfce4-orage/PLIST @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:38:08 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $ +bin/globaltime bin/orage -lib/xfce4/mcs-plugins/orage_plugin.la libexec/xfce4/panel-plugins/orageclock +man/man1/globaltime.1 +man/man1/orage.1 share/applications/xfcalendar.desktop share/applications/xfce-xfcalendar-settings.desktop +share/dbus-1/services/org.xfce.calendar.service +share/dbus-1/services/org.xfce.orage.service share/icons/hicolor/48x48/apps/xfcalendar.png share/icons/hicolor/scalable/apps/xfcalendar.svg share/locale/am/LC_MESSAGES/orage.mo @@ -38,20 +42,22 @@ share/locale/it/LC_MESSAGES/orage.mo share/locale/ja/LC_MESSAGES/orage.mo share/locale/ka/LC_MESSAGES/orage.mo share/locale/ko/LC_MESSAGES/orage.mo +share/locale/ku/LC_MESSAGES/orage.mo share/locale/lt/LC_MESSAGES/orage.mo share/locale/lv/LC_MESSAGES/orage.mo share/locale/mk/LC_MESSAGES/orage.mo share/locale/mr/LC_MESSAGES/orage.mo share/locale/ms/LC_MESSAGES/orage.mo -share/locale/nb_NO/LC_MESSAGES/orage.mo +share/locale/nb/LC_MESSAGES/orage.mo share/locale/nl/LC_MESSAGES/orage.mo share/locale/pa/LC_MESSAGES/orage.mo share/locale/pl/LC_MESSAGES/orage.mo +share/locale/pt/LC_MESSAGES/orage.mo share/locale/pt_BR/LC_MESSAGES/orage.mo -share/locale/pt_PT/LC_MESSAGES/orage.mo share/locale/ro/LC_MESSAGES/orage.mo share/locale/ru/LC_MESSAGES/orage.mo share/locale/sk/LC_MESSAGES/orage.mo +share/locale/sq/LC_MESSAGES/orage.mo share/locale/sv/LC_MESSAGES/orage.mo share/locale/ta/LC_MESSAGES/orage.mo share/locale/tr/LC_MESSAGES/orage.mo @@ -68,12 +74,15 @@ share/orage/doc/C/images/orage_calendar_edit_menu.png share/orage/doc/C/images/orage_calendar_file_menu.png share/orage/doc/C/images/orage_calendar_help_menu.png share/orage/doc/C/images/orage_calendar_view_menu.png +share/orage/doc/C/images/orage_daylist.png share/orage/doc/C/images/orage_desktop_menuitem.png share/orage/doc/C/images/orage_eventlist.png -share/orage/doc/C/images/orage_preferences_archives.png +share/orage/doc/C/images/orage_exchange_foreign.png +share/orage/doc/C/images/orage_exchange_impexp.png +share/orage/doc/C/images/orage_exchange_oragefiles.png share/orage/doc/C/images/orage_preferences_display.png -share/orage/doc/C/images/orage_preferences_sound.png -share/orage/doc/C/images/orage_preferences_timezone.png +share/orage/doc/C/images/orage_preferences_extra.png +share/orage/doc/C/images/orage_preferences_main.png share/orage/doc/C/orage.html share/orage/sounds/Boiling.wav share/orage/sounds/KDE_Beep_Digital_1.ogg @@ -140,6 +149,11 @@ share/orage/zoneinfo/America/Anchorage.ics share/orage/zoneinfo/America/Anguilla.ics share/orage/zoneinfo/America/Antigua.ics share/orage/zoneinfo/America/Araguaina.ics +share/orage/zoneinfo/America/Argentina/Buenos_Aires.ics +share/orage/zoneinfo/America/Argentina/Catamarca.ics +share/orage/zoneinfo/America/Argentina/Cordoba.ics +share/orage/zoneinfo/America/Argentina/Jujuy.ics +share/orage/zoneinfo/America/Argentina/Mendoza.ics share/orage/zoneinfo/America/Aruba.ics share/orage/zoneinfo/America/Asuncion.ics share/orage/zoneinfo/America/Barbados.ics diff --git a/time/xfce4-orage/buildlink3.mk b/time/xfce4-orage/buildlink3.mk index df7e0b6b01c..fa37d1ddec0 100644 --- a/time/xfce4-orage/buildlink3.mk +++ b/time/xfce4-orage/buildlink3.mk @@ -1,18 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:05 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-orage .if !defined(XFCE4_ORAGE_BUILDLINK3_MK) XFCE4_ORAGE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-orage+= xfce4-orage>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-orage?= xfce4-orage>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-orage+= xfce4-orage>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-orage?= ../../time/xfce4-orage -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_ORAGE_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-orage diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo index bd988a6e830..6379138d03f 100644 --- a/time/xfce4-orage/distinfo +++ b/time/xfce4-orage/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.4 2009/09/16 01:15:34 reed Exp $ -SHA1 (orage-4.4.3.tar.bz2) = 716cbe76e992a787c6acb2c6320293e0455b41d2 -RMD160 (orage-4.4.3.tar.bz2) = ebe9377fd961ef83bf20ab2de82ff791fac3d1a2 -Size (orage-4.4.3.tar.bz2) = 1579582 bytes +SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df +RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b +Size (orage-4.6.1.tar.bz2) = 1937593 bytes diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile index aee4ee90049..fe2d664655a 100644 --- a/wm/xfce4-wm-themes/Makefile +++ b/wm/xfce4-wm-themes/Makefile @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.21 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" +XFCE4_VERSION= 4.6.0 DISTNAME= xfwm4-themes-${XFCE4_VERSION} PKGNAME= xfce4-wm-themes-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= wm COMMENT= Xfce window manager themes +USE_LANGUAGES= #empty + +MAKE_DIRS+= ${PREFIX}/share/themes/Xfce -.include "../../wm/xfce4-wm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/xfce4-wm-themes/PLIST b/wm/xfce4-wm-themes/PLIST index 071c2b09de4..9fddd894b97 100644 --- a/wm/xfce4-wm-themes/PLIST +++ b/wm/xfce4-wm-themes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:40:05 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/09/16 01:15:34 reed Exp $ share/themes/Adept/xfwm4/README share/themes/Adept/xfwm4/bottom-active.xpm share/themes/Adept/xfwm4/bottom-inactive.xpm diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk index 40bdd82166f..f03caf3b8f0 100644 --- a/wm/xfce4-wm-themes/buildlink3.mk +++ b/wm/xfce4-wm-themes/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-wm-themes .if !defined(XFCE4_WM_THEMES_BUILDLINK3_MK) XFCE4_WM_THEMES_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-wm-themes?= xfce4-wm-themes>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes -.include "../../wm/xfce4-wm/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_WM_THEMES_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-wm-themes diff --git a/wm/xfce4-wm-themes/distinfo b/wm/xfce4-wm-themes/distinfo index 6ae1b9b44fb..1a525b8eeb9 100644 --- a/wm/xfce4-wm-themes/distinfo +++ b/wm/xfce4-wm-themes/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.16 2009/09/16 01:15:34 reed Exp $ -SHA1 (xfwm4-themes-4.4.3.tar.bz2) = 1fa20a6cc7060b2ff31bc00b1783ddc2d41e5add -RMD160 (xfwm4-themes-4.4.3.tar.bz2) = 3b34b6b59c5e4bbf4d1fd9faef9177c2be32df0c -Size (xfwm4-themes-4.4.3.tar.bz2) = 492360 bytes +SHA1 (xfwm4-themes-4.6.0.tar.bz2) = 7e81d00b2b0a7a2b91071b8c3767171bce738af2 +RMD160 (xfwm4-themes-4.6.0.tar.bz2) = 1f6230cdb7626b48671c170234aa97c28ba2eaf9 +Size (xfwm4-themes-4.6.0.tar.bz2) = 508403 bytes diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile index f90cf091c23..21e79c3a3cc 100644 --- a/wm/xfce4-wm/Makefile +++ b/wm/xfce4-wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: Makefile,v 1.30 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,15 +6,28 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= xfwm4-${XFCE4_VERSION} PKGNAME= xfce4-wm-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= wm COMMENT= Xfce window manager +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${PREFIX}/share/themes/Default +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/it ${PREFIX}/share/xfce4/doc/it/images +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXdamage/buildlink3.mk" +.include "../../x11/libXfixes/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST index 3e0e2fa42d3..9b49177b17d 100644 --- a/wm/xfce4-wm/PLIST +++ b/wm/xfce4-wm/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:40:05 joerg Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:34 reed Exp $ bin/xfwm4 -lib/xfce4/mcs-plugins/wmtweaks_plugin.la -lib/xfce4/mcs-plugins/workspaces_plugin.la -lib/xfce4/mcs-plugins/xfwm4_plugin.la +bin/xfwm4-settings +bin/xfwm4-tweaks-settings +bin/xfwm4-workspace-settings +libexec/xfce4/xfwm4/helper-dialog share/applications/xfce-wm-settings.desktop share/applications/xfce-wmtweaks-settings.desktop share/applications/xfce-workspaces-settings.desktop @@ -48,15 +49,16 @@ share/locale/lv/LC_MESSAGES/xfwm4.mo share/locale/mk/LC_MESSAGES/xfwm4.mo share/locale/mr/LC_MESSAGES/xfwm4.mo share/locale/ms/LC_MESSAGES/xfwm4.mo -share/locale/nb_NO/LC_MESSAGES/xfwm4.mo +share/locale/nb/LC_MESSAGES/xfwm4.mo share/locale/nl/LC_MESSAGES/xfwm4.mo share/locale/pa/LC_MESSAGES/xfwm4.mo share/locale/pl/LC_MESSAGES/xfwm4.mo +share/locale/pt/LC_MESSAGES/xfwm4.mo share/locale/pt_BR/LC_MESSAGES/xfwm4.mo -share/locale/pt_PT/LC_MESSAGES/xfwm4.mo share/locale/ro/LC_MESSAGES/xfwm4.mo share/locale/ru/LC_MESSAGES/xfwm4.mo share/locale/sk/LC_MESSAGES/xfwm4.mo +share/locale/sq/LC_MESSAGES/xfwm4.mo share/locale/sv/LC_MESSAGES/xfwm4.mo share/locale/ta/LC_MESSAGES/xfwm4.mo share/locale/tr/LC_MESSAGES/xfwm4.mo @@ -82,12 +84,16 @@ share/themes/Daloa/xfwm4/close-active.png share/themes/Daloa/xfwm4/close-active.xpm share/themes/Daloa/xfwm4/close-inactive.png share/themes/Daloa/xfwm4/close-inactive.xpm +share/themes/Daloa/xfwm4/close-prelight.png +share/themes/Daloa/xfwm4/close-prelight.xpm share/themes/Daloa/xfwm4/close-pressed.png share/themes/Daloa/xfwm4/close-pressed.xpm share/themes/Daloa/xfwm4/hide-active.png share/themes/Daloa/xfwm4/hide-active.xpm share/themes/Daloa/xfwm4/hide-inactive.png share/themes/Daloa/xfwm4/hide-inactive.xpm +share/themes/Daloa/xfwm4/hide-prelight.png +share/themes/Daloa/xfwm4/hide-prelight.xpm share/themes/Daloa/xfwm4/hide-pressed.png share/themes/Daloa/xfwm4/hide-pressed.xpm share/themes/Daloa/xfwm4/left-active.png @@ -98,18 +104,24 @@ share/themes/Daloa/xfwm4/maximize-active.png share/themes/Daloa/xfwm4/maximize-active.xpm share/themes/Daloa/xfwm4/maximize-inactive.png share/themes/Daloa/xfwm4/maximize-inactive.xpm +share/themes/Daloa/xfwm4/maximize-prelight.png +share/themes/Daloa/xfwm4/maximize-prelight.xpm share/themes/Daloa/xfwm4/maximize-pressed.png share/themes/Daloa/xfwm4/maximize-pressed.xpm share/themes/Daloa/xfwm4/maximize-toggled-active.png share/themes/Daloa/xfwm4/maximize-toggled-active.xpm share/themes/Daloa/xfwm4/maximize-toggled-inactive.png share/themes/Daloa/xfwm4/maximize-toggled-inactive.xpm +share/themes/Daloa/xfwm4/maximize-toggled-prelight.png +share/themes/Daloa/xfwm4/maximize-toggled-prelight.xpm share/themes/Daloa/xfwm4/maximize-toggled-pressed.png share/themes/Daloa/xfwm4/maximize-toggled-pressed.xpm share/themes/Daloa/xfwm4/menu-active.png share/themes/Daloa/xfwm4/menu-active.xpm share/themes/Daloa/xfwm4/menu-inactive.png share/themes/Daloa/xfwm4/menu-inactive.xpm +share/themes/Daloa/xfwm4/menu-prelight.png +share/themes/Daloa/xfwm4/menu-prelight.xpm share/themes/Daloa/xfwm4/menu-pressed.png share/themes/Daloa/xfwm4/menu-pressed.xpm share/themes/Daloa/xfwm4/right-active.png @@ -120,24 +132,32 @@ share/themes/Daloa/xfwm4/shade-active.png share/themes/Daloa/xfwm4/shade-active.xpm share/themes/Daloa/xfwm4/shade-inactive.png share/themes/Daloa/xfwm4/shade-inactive.xpm +share/themes/Daloa/xfwm4/shade-prelight.png +share/themes/Daloa/xfwm4/shade-prelight.xpm share/themes/Daloa/xfwm4/shade-pressed.png share/themes/Daloa/xfwm4/shade-pressed.xpm share/themes/Daloa/xfwm4/shade-toggled-active.png share/themes/Daloa/xfwm4/shade-toggled-active.xpm share/themes/Daloa/xfwm4/shade-toggled-inactive.png share/themes/Daloa/xfwm4/shade-toggled-inactive.xpm +share/themes/Daloa/xfwm4/shade-toggled-prelight.png +share/themes/Daloa/xfwm4/shade-toggled-prelight.xpm share/themes/Daloa/xfwm4/shade-toggled-pressed.png share/themes/Daloa/xfwm4/shade-toggled-pressed.xpm share/themes/Daloa/xfwm4/stick-active.png share/themes/Daloa/xfwm4/stick-active.xpm share/themes/Daloa/xfwm4/stick-inactive.png share/themes/Daloa/xfwm4/stick-inactive.xpm +share/themes/Daloa/xfwm4/stick-prelight.png +share/themes/Daloa/xfwm4/stick-prelight.xpm share/themes/Daloa/xfwm4/stick-pressed.png share/themes/Daloa/xfwm4/stick-pressed.xpm share/themes/Daloa/xfwm4/stick-toggled-active.png share/themes/Daloa/xfwm4/stick-toggled-active.xpm share/themes/Daloa/xfwm4/stick-toggled-inactive.png share/themes/Daloa/xfwm4/stick-toggled-inactive.xpm +share/themes/Daloa/xfwm4/stick-toggled-prelight.png +share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm share/themes/Daloa/xfwm4/stick-toggled-pressed.png share/themes/Daloa/xfwm4/stick-toggled-pressed.xpm share/themes/Daloa/xfwm4/themerc @@ -308,6 +328,110 @@ share/themes/Default-4.2/xfwm4/top-right-active.png share/themes/Default-4.2/xfwm4/top-right-active.xpm share/themes/Default-4.2/xfwm4/top-right-inactive.png share/themes/Default-4.2/xfwm4/top-right-inactive.xpm +share/themes/Default-4.4/xfwm4/README +share/themes/Default-4.4/xfwm4/bottom-active.png +share/themes/Default-4.4/xfwm4/bottom-active.xpm +share/themes/Default-4.4/xfwm4/bottom-inactive.png +share/themes/Default-4.4/xfwm4/bottom-inactive.xpm +share/themes/Default-4.4/xfwm4/bottom-left-active.png +share/themes/Default-4.4/xfwm4/bottom-left-active.xpm +share/themes/Default-4.4/xfwm4/bottom-left-inactive.png +share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm +share/themes/Default-4.4/xfwm4/bottom-right-active.png +share/themes/Default-4.4/xfwm4/bottom-right-active.xpm +share/themes/Default-4.4/xfwm4/bottom-right-inactive.png +share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm +share/themes/Default-4.4/xfwm4/close-active.png +share/themes/Default-4.4/xfwm4/close-active.xpm +share/themes/Default-4.4/xfwm4/close-inactive.png +share/themes/Default-4.4/xfwm4/close-inactive.xpm +share/themes/Default-4.4/xfwm4/close-pressed.png +share/themes/Default-4.4/xfwm4/close-pressed.xpm +share/themes/Default-4.4/xfwm4/hide-active.png +share/themes/Default-4.4/xfwm4/hide-active.xpm +share/themes/Default-4.4/xfwm4/hide-inactive.png +share/themes/Default-4.4/xfwm4/hide-inactive.xpm +share/themes/Default-4.4/xfwm4/hide-pressed.png +share/themes/Default-4.4/xfwm4/hide-pressed.xpm +share/themes/Default-4.4/xfwm4/left-active.png +share/themes/Default-4.4/xfwm4/left-active.xpm +share/themes/Default-4.4/xfwm4/left-inactive.png +share/themes/Default-4.4/xfwm4/left-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-active.png +share/themes/Default-4.4/xfwm4/maximize-active.xpm +share/themes/Default-4.4/xfwm4/maximize-inactive.png +share/themes/Default-4.4/xfwm4/maximize-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-pressed.png +share/themes/Default-4.4/xfwm4/maximize-pressed.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-active.png +share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.png +share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.png +share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/menu-active.png +share/themes/Default-4.4/xfwm4/menu-active.xpm +share/themes/Default-4.4/xfwm4/menu-inactive.png +share/themes/Default-4.4/xfwm4/menu-inactive.xpm +share/themes/Default-4.4/xfwm4/menu-pressed.png +share/themes/Default-4.4/xfwm4/menu-pressed.xpm +share/themes/Default-4.4/xfwm4/right-active.png +share/themes/Default-4.4/xfwm4/right-active.xpm +share/themes/Default-4.4/xfwm4/right-inactive.png +share/themes/Default-4.4/xfwm4/right-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-active.png +share/themes/Default-4.4/xfwm4/shade-active.xpm +share/themes/Default-4.4/xfwm4/shade-inactive.png +share/themes/Default-4.4/xfwm4/shade-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-pressed.png +share/themes/Default-4.4/xfwm4/shade-pressed.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-active.png +share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-inactive.png +share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-pressed.png +share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/stick-active.png +share/themes/Default-4.4/xfwm4/stick-active.xpm +share/themes/Default-4.4/xfwm4/stick-inactive.png +share/themes/Default-4.4/xfwm4/stick-inactive.xpm +share/themes/Default-4.4/xfwm4/stick-pressed.png +share/themes/Default-4.4/xfwm4/stick-pressed.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-active.png +share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-inactive.png +share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-pressed.png +share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/themerc +share/themes/Default-4.4/xfwm4/title-1-active.png +share/themes/Default-4.4/xfwm4/title-1-active.xpm +share/themes/Default-4.4/xfwm4/title-1-inactive.png +share/themes/Default-4.4/xfwm4/title-1-inactive.xpm +share/themes/Default-4.4/xfwm4/title-2-active.png +share/themes/Default-4.4/xfwm4/title-2-active.xpm +share/themes/Default-4.4/xfwm4/title-2-inactive.png +share/themes/Default-4.4/xfwm4/title-2-inactive.xpm +share/themes/Default-4.4/xfwm4/title-3-active.png +share/themes/Default-4.4/xfwm4/title-3-active.xpm +share/themes/Default-4.4/xfwm4/title-3-inactive.png +share/themes/Default-4.4/xfwm4/title-3-inactive.xpm +share/themes/Default-4.4/xfwm4/title-4-active.png +share/themes/Default-4.4/xfwm4/title-4-active.xpm +share/themes/Default-4.4/xfwm4/title-4-inactive.png +share/themes/Default-4.4/xfwm4/title-4-inactive.xpm +share/themes/Default-4.4/xfwm4/title-5-active.png +share/themes/Default-4.4/xfwm4/title-5-active.xpm +share/themes/Default-4.4/xfwm4/title-5-inactive.png +share/themes/Default-4.4/xfwm4/title-5-inactive.xpm +share/themes/Default-4.4/xfwm4/top-left-active.png +share/themes/Default-4.4/xfwm4/top-left-active.xpm +share/themes/Default-4.4/xfwm4/top-left-inactive.png +share/themes/Default-4.4/xfwm4/top-left-inactive.xpm +share/themes/Default-4.4/xfwm4/top-right-active.png +share/themes/Default-4.4/xfwm4/top-right-active.xpm +share/themes/Default-4.4/xfwm4/top-right-inactive.png +share/themes/Default-4.4/xfwm4/top-right-inactive.xpm share/themes/Default/xfwm4/README share/themes/Default/xfwm4/bottom-active.png share/themes/Default/xfwm4/bottom-active.xpm @@ -325,15 +449,18 @@ share/themes/Default/xfwm4/close-active.png share/themes/Default/xfwm4/close-active.xpm share/themes/Default/xfwm4/close-inactive.png share/themes/Default/xfwm4/close-inactive.xpm +share/themes/Default/xfwm4/close-prelight.png +share/themes/Default/xfwm4/close-prelight.xpm share/themes/Default/xfwm4/close-pressed.png share/themes/Default/xfwm4/close-pressed.xpm share/themes/Default/xfwm4/hide-active.png share/themes/Default/xfwm4/hide-active.xpm share/themes/Default/xfwm4/hide-inactive.png share/themes/Default/xfwm4/hide-inactive.xpm +share/themes/Default/xfwm4/hide-prelight.png +share/themes/Default/xfwm4/hide-prelight.xpm share/themes/Default/xfwm4/hide-pressed.png share/themes/Default/xfwm4/hide-pressed.xpm -share/themes/Default/xfwm4/keythemerc share/themes/Default/xfwm4/left-active.png share/themes/Default/xfwm4/left-active.xpm share/themes/Default/xfwm4/left-inactive.png @@ -342,18 +469,24 @@ share/themes/Default/xfwm4/maximize-active.png share/themes/Default/xfwm4/maximize-active.xpm share/themes/Default/xfwm4/maximize-inactive.png share/themes/Default/xfwm4/maximize-inactive.xpm +share/themes/Default/xfwm4/maximize-prelight.png +share/themes/Default/xfwm4/maximize-prelight.xpm share/themes/Default/xfwm4/maximize-pressed.png share/themes/Default/xfwm4/maximize-pressed.xpm share/themes/Default/xfwm4/maximize-toggled-active.png share/themes/Default/xfwm4/maximize-toggled-active.xpm share/themes/Default/xfwm4/maximize-toggled-inactive.png share/themes/Default/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default/xfwm4/maximize-toggled-prelight.png +share/themes/Default/xfwm4/maximize-toggled-prelight.xpm share/themes/Default/xfwm4/maximize-toggled-pressed.png share/themes/Default/xfwm4/maximize-toggled-pressed.xpm share/themes/Default/xfwm4/menu-active.png share/themes/Default/xfwm4/menu-active.xpm share/themes/Default/xfwm4/menu-inactive.png share/themes/Default/xfwm4/menu-inactive.xpm +share/themes/Default/xfwm4/menu-prelight.png +share/themes/Default/xfwm4/menu-prelight.xpm share/themes/Default/xfwm4/menu-pressed.png share/themes/Default/xfwm4/menu-pressed.xpm share/themes/Default/xfwm4/right-active.png @@ -364,24 +497,32 @@ share/themes/Default/xfwm4/shade-active.png share/themes/Default/xfwm4/shade-active.xpm share/themes/Default/xfwm4/shade-inactive.png share/themes/Default/xfwm4/shade-inactive.xpm +share/themes/Default/xfwm4/shade-prelight.png +share/themes/Default/xfwm4/shade-prelight.xpm share/themes/Default/xfwm4/shade-pressed.png share/themes/Default/xfwm4/shade-pressed.xpm share/themes/Default/xfwm4/shade-toggled-active.png share/themes/Default/xfwm4/shade-toggled-active.xpm share/themes/Default/xfwm4/shade-toggled-inactive.png share/themes/Default/xfwm4/shade-toggled-inactive.xpm +share/themes/Default/xfwm4/shade-toggled-prelight.png +share/themes/Default/xfwm4/shade-toggled-prelight.xpm share/themes/Default/xfwm4/shade-toggled-pressed.png share/themes/Default/xfwm4/shade-toggled-pressed.xpm share/themes/Default/xfwm4/stick-active.png share/themes/Default/xfwm4/stick-active.xpm share/themes/Default/xfwm4/stick-inactive.png share/themes/Default/xfwm4/stick-inactive.xpm +share/themes/Default/xfwm4/stick-prelight.png +share/themes/Default/xfwm4/stick-prelight.xpm share/themes/Default/xfwm4/stick-pressed.png share/themes/Default/xfwm4/stick-pressed.xpm share/themes/Default/xfwm4/stick-toggled-active.png share/themes/Default/xfwm4/stick-toggled-active.xpm share/themes/Default/xfwm4/stick-toggled-inactive.png share/themes/Default/xfwm4/stick-toggled-inactive.xpm +share/themes/Default/xfwm4/stick-toggled-prelight.png +share/themes/Default/xfwm4/stick-toggled-prelight.xpm share/themes/Default/xfwm4/stick-toggled-pressed.png share/themes/Default/xfwm4/stick-toggled-pressed.xpm share/themes/Default/xfwm4/themerc @@ -413,110 +554,6 @@ share/themes/Default/xfwm4/top-right-active.png share/themes/Default/xfwm4/top-right-active.xpm share/themes/Default/xfwm4/top-right-inactive.png share/themes/Default/xfwm4/top-right-inactive.xpm -share/themes/Katiola/xfwm4/README -share/themes/Katiola/xfwm4/bottom-active.png -share/themes/Katiola/xfwm4/bottom-active.xpm -share/themes/Katiola/xfwm4/bottom-inactive.png -share/themes/Katiola/xfwm4/bottom-inactive.xpm -share/themes/Katiola/xfwm4/bottom-left-active.png -share/themes/Katiola/xfwm4/bottom-left-active.xpm -share/themes/Katiola/xfwm4/bottom-left-inactive.png -share/themes/Katiola/xfwm4/bottom-left-inactive.xpm -share/themes/Katiola/xfwm4/bottom-right-active.png -share/themes/Katiola/xfwm4/bottom-right-active.xpm -share/themes/Katiola/xfwm4/bottom-right-inactive.png -share/themes/Katiola/xfwm4/bottom-right-inactive.xpm -share/themes/Katiola/xfwm4/close-active.png -share/themes/Katiola/xfwm4/close-active.xpm -share/themes/Katiola/xfwm4/close-inactive.png -share/themes/Katiola/xfwm4/close-inactive.xpm -share/themes/Katiola/xfwm4/close-pressed.png -share/themes/Katiola/xfwm4/close-pressed.xpm -share/themes/Katiola/xfwm4/hide-active.png -share/themes/Katiola/xfwm4/hide-active.xpm -share/themes/Katiola/xfwm4/hide-inactive.png -share/themes/Katiola/xfwm4/hide-inactive.xpm -share/themes/Katiola/xfwm4/hide-pressed.png -share/themes/Katiola/xfwm4/hide-pressed.xpm -share/themes/Katiola/xfwm4/left-active.png -share/themes/Katiola/xfwm4/left-active.xpm -share/themes/Katiola/xfwm4/left-inactive.png -share/themes/Katiola/xfwm4/left-inactive.xpm -share/themes/Katiola/xfwm4/maximize-active.png -share/themes/Katiola/xfwm4/maximize-active.xpm -share/themes/Katiola/xfwm4/maximize-inactive.png -share/themes/Katiola/xfwm4/maximize-inactive.xpm -share/themes/Katiola/xfwm4/maximize-pressed.png -share/themes/Katiola/xfwm4/maximize-pressed.xpm -share/themes/Katiola/xfwm4/maximize-toggled-active.png -share/themes/Katiola/xfwm4/maximize-toggled-active.xpm -share/themes/Katiola/xfwm4/maximize-toggled-inactive.png -share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm -share/themes/Katiola/xfwm4/maximize-toggled-pressed.png -share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm -share/themes/Katiola/xfwm4/menu-active.png -share/themes/Katiola/xfwm4/menu-active.xpm -share/themes/Katiola/xfwm4/menu-inactive.png -share/themes/Katiola/xfwm4/menu-inactive.xpm -share/themes/Katiola/xfwm4/menu-pressed.png -share/themes/Katiola/xfwm4/menu-pressed.xpm -share/themes/Katiola/xfwm4/right-active.png -share/themes/Katiola/xfwm4/right-active.xpm -share/themes/Katiola/xfwm4/right-inactive.png -share/themes/Katiola/xfwm4/right-inactive.xpm -share/themes/Katiola/xfwm4/shade-active.png -share/themes/Katiola/xfwm4/shade-active.xpm -share/themes/Katiola/xfwm4/shade-inactive.png -share/themes/Katiola/xfwm4/shade-inactive.xpm -share/themes/Katiola/xfwm4/shade-pressed.png -share/themes/Katiola/xfwm4/shade-pressed.xpm -share/themes/Katiola/xfwm4/shade-toggled-active.png -share/themes/Katiola/xfwm4/shade-toggled-active.xpm -share/themes/Katiola/xfwm4/shade-toggled-inactive.png -share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm -share/themes/Katiola/xfwm4/shade-toggled-pressed.png -share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm -share/themes/Katiola/xfwm4/stick-active.png -share/themes/Katiola/xfwm4/stick-active.xpm -share/themes/Katiola/xfwm4/stick-inactive.png -share/themes/Katiola/xfwm4/stick-inactive.xpm -share/themes/Katiola/xfwm4/stick-pressed.png -share/themes/Katiola/xfwm4/stick-pressed.xpm -share/themes/Katiola/xfwm4/stick-toggled-active.png -share/themes/Katiola/xfwm4/stick-toggled-active.xpm -share/themes/Katiola/xfwm4/stick-toggled-inactive.png -share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm -share/themes/Katiola/xfwm4/stick-toggled-pressed.png -share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm -share/themes/Katiola/xfwm4/themerc -share/themes/Katiola/xfwm4/title-1-active.png -share/themes/Katiola/xfwm4/title-1-active.xpm -share/themes/Katiola/xfwm4/title-1-inactive.png -share/themes/Katiola/xfwm4/title-1-inactive.xpm -share/themes/Katiola/xfwm4/title-2-active.png -share/themes/Katiola/xfwm4/title-2-active.xpm -share/themes/Katiola/xfwm4/title-2-inactive.png -share/themes/Katiola/xfwm4/title-2-inactive.xpm -share/themes/Katiola/xfwm4/title-3-active.png -share/themes/Katiola/xfwm4/title-3-active.xpm -share/themes/Katiola/xfwm4/title-3-inactive.png -share/themes/Katiola/xfwm4/title-3-inactive.xpm -share/themes/Katiola/xfwm4/title-4-active.png -share/themes/Katiola/xfwm4/title-4-active.xpm -share/themes/Katiola/xfwm4/title-4-inactive.png -share/themes/Katiola/xfwm4/title-4-inactive.xpm -share/themes/Katiola/xfwm4/title-5-active.png -share/themes/Katiola/xfwm4/title-5-active.xpm -share/themes/Katiola/xfwm4/title-5-inactive.png -share/themes/Katiola/xfwm4/title-5-inactive.xpm -share/themes/Katiola/xfwm4/top-left-active.png -share/themes/Katiola/xfwm4/top-left-active.xpm -share/themes/Katiola/xfwm4/top-left-inactive.png -share/themes/Katiola/xfwm4/top-left-inactive.xpm -share/themes/Katiola/xfwm4/top-right-active.png -share/themes/Katiola/xfwm4/top-right-active.xpm -share/themes/Katiola/xfwm4/top-right-inactive.png -share/themes/Katiola/xfwm4/top-right-inactive.xpm share/themes/Kokodi/xfwm4/README share/themes/Kokodi/xfwm4/bottom-active.png share/themes/Kokodi/xfwm4/bottom-active.xpm @@ -534,12 +571,16 @@ share/themes/Kokodi/xfwm4/close-active.png share/themes/Kokodi/xfwm4/close-active.xpm share/themes/Kokodi/xfwm4/close-inactive.png share/themes/Kokodi/xfwm4/close-inactive.xpm +share/themes/Kokodi/xfwm4/close-prelight.png +share/themes/Kokodi/xfwm4/close-prelight.xpm share/themes/Kokodi/xfwm4/close-pressed.png share/themes/Kokodi/xfwm4/close-pressed.xpm share/themes/Kokodi/xfwm4/hide-active.png share/themes/Kokodi/xfwm4/hide-active.xpm share/themes/Kokodi/xfwm4/hide-inactive.png share/themes/Kokodi/xfwm4/hide-inactive.xpm +share/themes/Kokodi/xfwm4/hide-prelight.png +share/themes/Kokodi/xfwm4/hide-prelight.xpm share/themes/Kokodi/xfwm4/hide-pressed.png share/themes/Kokodi/xfwm4/hide-pressed.xpm share/themes/Kokodi/xfwm4/left-active.png @@ -550,18 +591,24 @@ share/themes/Kokodi/xfwm4/maximize-active.png share/themes/Kokodi/xfwm4/maximize-active.xpm share/themes/Kokodi/xfwm4/maximize-inactive.png share/themes/Kokodi/xfwm4/maximize-inactive.xpm +share/themes/Kokodi/xfwm4/maximize-prelight.png +share/themes/Kokodi/xfwm4/maximize-prelight.xpm share/themes/Kokodi/xfwm4/maximize-pressed.png share/themes/Kokodi/xfwm4/maximize-pressed.xpm share/themes/Kokodi/xfwm4/maximize-toggled-active.png share/themes/Kokodi/xfwm4/maximize-toggled-active.xpm share/themes/Kokodi/xfwm4/maximize-toggled-inactive.png share/themes/Kokodi/xfwm4/maximize-toggled-inactive.xpm +share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png +share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm share/themes/Kokodi/xfwm4/maximize-toggled-pressed.png share/themes/Kokodi/xfwm4/maximize-toggled-pressed.xpm share/themes/Kokodi/xfwm4/menu-active.png share/themes/Kokodi/xfwm4/menu-active.xpm share/themes/Kokodi/xfwm4/menu-inactive.png share/themes/Kokodi/xfwm4/menu-inactive.xpm +share/themes/Kokodi/xfwm4/menu-prelight.png +share/themes/Kokodi/xfwm4/menu-prelight.xpm share/themes/Kokodi/xfwm4/menu-pressed.png share/themes/Kokodi/xfwm4/menu-pressed.xpm share/themes/Kokodi/xfwm4/right-active.png @@ -572,24 +619,32 @@ share/themes/Kokodi/xfwm4/shade-active.png share/themes/Kokodi/xfwm4/shade-active.xpm share/themes/Kokodi/xfwm4/shade-inactive.png share/themes/Kokodi/xfwm4/shade-inactive.xpm +share/themes/Kokodi/xfwm4/shade-prelight.png +share/themes/Kokodi/xfwm4/shade-prelight.xpm share/themes/Kokodi/xfwm4/shade-pressed.png share/themes/Kokodi/xfwm4/shade-pressed.xpm share/themes/Kokodi/xfwm4/shade-toggled-active.png share/themes/Kokodi/xfwm4/shade-toggled-active.xpm share/themes/Kokodi/xfwm4/shade-toggled-inactive.png share/themes/Kokodi/xfwm4/shade-toggled-inactive.xpm +share/themes/Kokodi/xfwm4/shade-toggled-prelight.png +share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm share/themes/Kokodi/xfwm4/shade-toggled-pressed.png share/themes/Kokodi/xfwm4/shade-toggled-pressed.xpm share/themes/Kokodi/xfwm4/stick-active.png share/themes/Kokodi/xfwm4/stick-active.xpm share/themes/Kokodi/xfwm4/stick-inactive.png share/themes/Kokodi/xfwm4/stick-inactive.xpm +share/themes/Kokodi/xfwm4/stick-prelight.png +share/themes/Kokodi/xfwm4/stick-prelight.xpm share/themes/Kokodi/xfwm4/stick-pressed.png share/themes/Kokodi/xfwm4/stick-pressed.xpm share/themes/Kokodi/xfwm4/stick-toggled-active.png share/themes/Kokodi/xfwm4/stick-toggled-active.xpm share/themes/Kokodi/xfwm4/stick-toggled-inactive.png share/themes/Kokodi/xfwm4/stick-toggled-inactive.xpm +share/themes/Kokodi/xfwm4/stick-toggled-prelight.png +share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm share/themes/Kokodi/xfwm4/stick-toggled-pressed.png share/themes/Kokodi/xfwm4/stick-toggled-pressed.xpm share/themes/Kokodi/xfwm4/themerc diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk index 2757d28b1eb..9eb1f07cd20 100644 --- a/wm/xfce4-wm/buildlink3.mk +++ b/wm/xfce4-wm/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= xfce4-wm .if !defined(XFCE4_WM_BUILDLINK3_MK) XFCE4_WM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-wm?= xfce4-wm>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_WM_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-wm diff --git a/wm/xfce4-wm/distinfo b/wm/xfce4-wm/distinfo index 2b76793829b..5625ad8cb74 100644 --- a/wm/xfce4-wm/distinfo +++ b/wm/xfce4-wm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:34 reed Exp $ -SHA1 (xfwm4-4.4.3.tar.bz2) = f8581f278d4496b03f4dc279dc7e2b9b68caf30e -RMD160 (xfwm4-4.4.3.tar.bz2) = 794c6ebbe35ae956b253363f38a2e90fbd3980a4 -Size (xfwm4-4.4.3.tar.bz2) = 1590866 bytes +SHA1 (xfwm4-4.6.1.tar.bz2) = 236622ffddd4618b94eaba8f402c0c48bdcef929 +RMD160 (xfwm4-4.6.1.tar.bz2) = facd0a6b6db036a066468747a757fd5f391a8f6f +Size (xfwm4-4.6.1.tar.bz2) = 1765862 bytes diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index 00786a1a09b..ab203188af0 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: Makefile,v 1.28 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,18 +6,29 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= libxfcegui4-${XFCE4_VERSION} PKGNAME= libxfce4gui-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce widget library -USE_TOOLS+= msgfmt -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc +PKGCONFIG_OVERRIDE= libxfce4kbd-private/libxfce4kbd-private-1.0.pc.in +PKGCONFIG_OVERRIDE+= libxfcegui4/libxfcegui4-1.0.pc.in -PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in +CONFIGURE_ARGS+= --disable-gladeui +EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml +PKG_SYSCONFSUBDIR= xdg +CONF_FILES= ${EGDIR}/xfce4-keyboard-shortcuts.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml + +MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/include/xfce4 +MAKE_DIRS+= ${XFCE4_EGBASE} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4 ${PKG_SYSCONFDIR}/xfce4/xfconf +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index f37a6696625..9d404a343f2 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:25:00 joerg Exp $ +@comment $NetBSD: PLIST,v 1.21 2009/09/16 01:15:34 reed Exp $ +include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts.h include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h @@ -10,7 +14,6 @@ include/xfce4/libxfcegui4/libxfcegui4.h include/xfce4/libxfcegui4/netk-application.h include/xfce4/libxfcegui4/netk-class-group.h include/xfce4/libxfcegui4/netk-enum-types.h -include/xfce4/libxfcegui4/netk-marshal.h include/xfce4/libxfcegui4/netk-pager.h include/xfce4/libxfcegui4/netk-screen.h include/xfce4/libxfcegui4/netk-tasklist.h @@ -39,40 +42,43 @@ include/xfce4/libxfcegui4/xfce_decorbutton.h include/xfce4/libxfcegui4/xfce_decortoggle.h include/xfce4/libxfcegui4/xfce_framebox.h include/xfce4/libxfcegui4/xfce_iconbutton.h -include/xfce4/libxfcegui4/xfce_marshal.h include/xfce4/libxfcegui4/xfce_menubutton.h include/xfce4/libxfcegui4/xfce_movehandler.h include/xfce4/libxfcegui4/xfce_scaled_image.h include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h +lib/libglade/2.0/libxfce4.la +lib/libxfce4kbd-private.la lib/libxfcegui4.la +lib/pkgconfig/libxfce4kbd-private-1.0.pc lib/pkgconfig/libxfcegui4-1.0.pc -share/doc/libxfcegui4/XfceAboutDialog.html -share/doc/libxfcegui4/XfceAppMenuItem.html -share/doc/libxfcegui4/XfceFramebox.html -share/doc/libxfcegui4/XfceHeading.html -share/doc/libxfcegui4/XfceIconTheme.html -share/doc/libxfcegui4/XfceTitledDialog.html -share/doc/libxfcegui4/home.png -share/doc/libxfcegui4/index.html -share/doc/libxfcegui4/index.sgml -share/doc/libxfcegui4/left.png -share/doc/libxfcegui4/libxfcegui4-Standard-Macros.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html -share/doc/libxfcegui4/libxfcegui4-XfceFileChooser.html -share/doc/libxfcegui4/libxfcegui4-core.html -share/doc/libxfcegui4/libxfcegui4-dialogs.html -share/doc/libxfcegui4/libxfcegui4-fundamentals.html -share/doc/libxfcegui4/libxfcegui4-netk.html -share/doc/libxfcegui4/libxfcegui4-xfce-exec.html -share/doc/libxfcegui4/libxfcegui4.devhelp -share/doc/libxfcegui4/libxfcegui4.devhelp2 -share/doc/libxfcegui4/reference.html -share/doc/libxfcegui4/right.png -share/doc/libxfcegui4/style.css -share/doc/libxfcegui4/up.png +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html +share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html +share/gtk-doc/html/libxfcegui4/XfceFramebox.html +share/gtk-doc/html/libxfcegui4/XfceHeading.html +share/gtk-doc/html/libxfcegui4/XfceIconTheme.html +share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html +share/gtk-doc/html/libxfcegui4/home.png +share/gtk-doc/html/libxfcegui4/index.html +share/gtk-doc/html/libxfcegui4/index.sgml +share/gtk-doc/html/libxfcegui4/left.png +share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2 +share/gtk-doc/html/libxfcegui4/reference.html +share/gtk-doc/html/libxfcegui4/right.png +share/gtk-doc/html/libxfcegui4/style.css +share/gtk-doc/html/libxfcegui4/up.png share/icons/hicolor/48x48/apps/xfce-edit.png share/icons/hicolor/48x48/apps/xfce-filemanager.png share/icons/hicolor/48x48/apps/xfce-games.png @@ -121,12 +127,12 @@ share/locale/lt/LC_MESSAGES/libxfcegui4.mo share/locale/lv/LC_MESSAGES/libxfcegui4.mo share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo -share/locale/nb_NO/LC_MESSAGES/libxfcegui4.mo +share/locale/nb/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo share/locale/pl/LC_MESSAGES/libxfcegui4.mo +share/locale/pt/LC_MESSAGES/libxfcegui4.mo share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo -share/locale/pt_PT/LC_MESSAGES/libxfcegui4.mo share/locale/ro/LC_MESSAGES/libxfcegui4.mo share/locale/ru/LC_MESSAGES/libxfcegui4.mo share/locale/si/LC_MESSAGES/libxfcegui4.mo @@ -134,7 +140,6 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo share/locale/sq/LC_MESSAGES/libxfcegui4.mo share/locale/sv/LC_MESSAGES/libxfcegui4.mo share/locale/ta/LC_MESSAGES/libxfcegui4.mo -share/locale/th/LC_MESSAGES/libxfcegui4.mo share/locale/tr/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/ur/LC_MESSAGES/libxfcegui4.mo diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 3d1c51d41c7..7f7d2b6c3c5 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,21 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= libxfce4gui .if !defined(LIBXFCE4GUI_BUILDLINK3_MK) LIBXFCE4GUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.libxfce4gui?= libxfce4gui>=4.4.3nb2 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.0 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui -.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # LIBXFCE4GUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxfce4gui diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index 19f208f0b71..fa98d38db15 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $ -SHA1 (libxfcegui4-4.4.3.tar.bz2) = 4f1ab2fb035b0aaeb01cbef15d7378726037bcc9 -RMD160 (libxfcegui4-4.4.3.tar.bz2) = c0155a89e35d88d3c2e25fc2f38630309d50e916 -Size (libxfcegui4-4.4.3.tar.bz2) = 621245 bytes +SHA1 (libxfcegui4-4.6.1.tar.bz2) = 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 +RMD160 (libxfcegui4-4.6.1.tar.bz2) = 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 +Size (libxfcegui4-4.6.1.tar.bz2) = 650666 bytes +SHA1 (patch-aa) = c054345fcb2aa5c516009d0740ac0abc3ba15706 diff --git a/x11/libxfce4gui/patches/patch-aa b/x11/libxfce4gui/patches/patch-aa new file mode 100644 index 00000000000..2531cce5a9e --- /dev/null +++ b/x11/libxfce4gui/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2009/09/16 01:15:33 reed Exp $ + +--- libxfce4kbd-private/Makefile.in.orig 2009-03-08 20:41:51.000000000 +0000 ++++ libxfce4kbd-private/Makefile.in +@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) + +-@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-1.0.pc diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 60856aae585..0727cd919b1 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.16 2008/12/18 13:45:58 hira Exp $ +# $NetBSD: Makefile,v 1.17 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= libxfce4util-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce basic library -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc - PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in +MAKE_DIRS+= ${PREFIX}/include/xfce4 + .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index ce53d18b47f..7deda984b84 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:25:00 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2009/09/16 01:15:35 reed Exp $ include/xfce4/libxfce4util/debug.h include/xfce4/libxfce4util/i18n.h include/xfce4/libxfce4util/libxfce4util-config.h @@ -13,45 +13,49 @@ 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-posix-signal-handler.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/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/gtk-doc/html/libxfce4util/home.png +share/gtk-doc/html/libxfce4util/index.html +share/gtk-doc/html/libxfce4util/index.sgml +share/gtk-doc/html/libxfce4util/left.png +share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html +share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html +share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html +share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html +share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html +share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html +share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html +share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-core.html +share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html +share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html +share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util.devhelp +share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2 +share/gtk-doc/html/libxfce4util/reference.html +share/gtk-doc/html/libxfce4util/right.png +share/gtk-doc/html/libxfce4util/style.css +share/gtk-doc/html/libxfce4util/up.png share/locale/am/LC_MESSAGES/libxfce4util.mo 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/da/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/es/LC_MESSAGES/libxfce4util.mo share/locale/et/LC_MESSAGES/libxfce4util.mo share/locale/eu/LC_MESSAGES/libxfce4util.mo share/locale/fi/LC_MESSAGES/libxfce4util.mo @@ -59,23 +63,23 @@ share/locale/fr/LC_MESSAGES/libxfce4util.mo share/locale/gl/LC_MESSAGES/libxfce4util.mo share/locale/he/LC_MESSAGES/libxfce4util.mo share/locale/id/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/lv/LC_MESSAGES/libxfce4util.mo share/locale/mk/LC_MESSAGES/libxfce4util.mo -share/locale/nb_NO/LC_MESSAGES/libxfce4util.mo +share/locale/nb/LC_MESSAGES/libxfce4util.mo share/locale/nl/LC_MESSAGES/libxfce4util.mo share/locale/pl/LC_MESSAGES/libxfce4util.mo +share/locale/pt/LC_MESSAGES/libxfce4util.mo share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo -share/locale/pt_PT/LC_MESSAGES/libxfce4util.mo share/locale/ro/LC_MESSAGES/libxfce4util.mo share/locale/si/LC_MESSAGES/libxfce4util.mo -share/locale/sk/LC_MESSAGES/libxfce4util.mo +share/locale/sl/LC_MESSAGES/libxfce4util.mo share/locale/sq/LC_MESSAGES/libxfce4util.mo -share/locale/th/LC_MESSAGES/libxfce4util.mo +share/locale/sv/LC_MESSAGES/libxfce4util.mo share/locale/tr/LC_MESSAGES/libxfce4util.mo share/locale/uk/LC_MESSAGES/libxfce4util.mo share/locale/ur/LC_MESSAGES/libxfce4util.mo +share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index e8ea79b240d..0cbd23a79fe 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= libxfce4util .if !defined(LIBXFCE4UTIL_BUILDLINK3_MK) LIBXFCE4UTIL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.libxfce4util?= libxfce4util>=4.4.3nb1 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.6.0 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .endif # LIBXFCE4UTIL_BUILDLINK3_MK diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 5074289231c..b8fc9f050ef 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ -SHA1 (libxfce4util-4.4.3.tar.bz2) = 08e9d64e4c66ea2420a9a0ab678cf5a064585b37 -RMD160 (libxfce4util-4.4.3.tar.bz2) = 256f4e759562113be2dc82265752a218340deeda -Size (libxfce4util-4.4.3.tar.bz2) = 390566 bytes +SHA1 (libxfce4util-4.6.1.tar.bz2) = 6d14099aa095b2f5d9b6a4348968b741b9ad661d +RMD160 (libxfce4util-4.6.1.tar.bz2) = e54d6c7291bbd7e658bc612b52b1c8d02c47d5ae +Size (libxfce4util-4.6.1.tar.bz2) = 405327 bytes diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index a15028494ae..9e258078dcb 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,33 +6,39 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce desktop background manager -PKG_SYSCONFSUBDIR= xdg/xfce4/desktop -EGDIR= ${XFCE4_EGBASE}/desktop -CONF_FILES= ${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml -.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR pt_PT ro ru sk \ - sv uk vi zh_TW -CONF_FILES+= ${EGDIR:Q}/menu.xml.${l:Q} \ - ${PKG_SYSCONFDIR:Q}/menu.xml.${l:Q} -.endfor -CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml \ - ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml -.for l in ca cs de el es eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW -CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \ - ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l:Q} -.endfor - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} - -REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q} -BUILD_DEFS+= PKG_SYSCONFBASE +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +BUILD_DEFS+= PKG_SYSCONFBASE + +PKG_SYSCONFSUBDIR= xdg/menus + +OWN_DIRS+= ${PKG_SYSCONFDIR} +MAKE_DIRS+= ${PREFIX}/lib/xfce4 ${PREFIX}/libexec/xfce4 +MAKE_DIRS+= ${PREFIX}/libexec/panel-plugins ${XFCE4_EGBASE:Q} +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/da +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/ja ${PREFIX}/share/xfce4/doc/ja/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/panel-plugins + +CONF_FILES= ${XFCE4_EGBASE:Q}/menus/xfce-applications.menu \ + ${PKG_SYSCONFDIR}/xfce-applications.menu + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4menu/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST index b38df50f021..51ea08f43b5 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,68 +1,31 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:42 joerg Exp $ -bin/xfce4-menueditor +@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $ bin/xfce4-popup-menu bin/xfdesktop -lib/xfce4/mcs-plugins/backdrop_settings.la +bin/xfdesktop-settings lib/xfce4/modules/xfce4_desktop_menu.la libexec/xfce4/panel-plugins/xfce4-menu-plugin man/man1/xfdesktop.1 share/applications/xfce-backdrop-settings.desktop -share/applications/xfce-menueditor.desktop -share/examples/xfce4/desktop/menu.xml -share/examples/xfce4/desktop/menu.xml.be -share/examples/xfce4/desktop/menu.xml.ca -share/examples/xfce4/desktop/menu.xml.cs -share/examples/xfce4/desktop/menu.xml.da -share/examples/xfce4/desktop/menu.xml.de -share/examples/xfce4/desktop/menu.xml.el -share/examples/xfce4/desktop/menu.xml.es -share/examples/xfce4/desktop/menu.xml.et -share/examples/xfce4/desktop/menu.xml.eu -share/examples/xfce4/desktop/menu.xml.fi -share/examples/xfce4/desktop/menu.xml.fr -share/examples/xfce4/desktop/menu.xml.he -share/examples/xfce4/desktop/menu.xml.hu -share/examples/xfce4/desktop/menu.xml.it -share/examples/xfce4/desktop/menu.xml.ja -share/examples/xfce4/desktop/menu.xml.ko -share/examples/xfce4/desktop/menu.xml.nb_NO -share/examples/xfce4/desktop/menu.xml.nl -share/examples/xfce4/desktop/menu.xml.pa -share/examples/xfce4/desktop/menu.xml.pl -share/examples/xfce4/desktop/menu.xml.pt_BR -share/examples/xfce4/desktop/menu.xml.pt_PT -share/examples/xfce4/desktop/menu.xml.ro -share/examples/xfce4/desktop/menu.xml.ru -share/examples/xfce4/desktop/menu.xml.sk -share/examples/xfce4/desktop/menu.xml.sv -share/examples/xfce4/desktop/menu.xml.tr -share/examples/xfce4/desktop/menu.xml.uk -share/examples/xfce4/desktop/menu.xml.vi -share/examples/xfce4/desktop/menu.xml.zh_TW -share/examples/xfce4/desktop/xfce-registered-categories.xml -share/examples/xfce4/desktop/xfce-registered-categories.xml.ca -share/examples/xfce4/desktop/xfce-registered-categories.xml.cs -share/examples/xfce4/desktop/xfce-registered-categories.xml.de -share/examples/xfce4/desktop/xfce-registered-categories.xml.el -share/examples/xfce4/desktop/xfce-registered-categories.xml.es -share/examples/xfce4/desktop/xfce-registered-categories.xml.eu -share/examples/xfce4/desktop/xfce-registered-categories.xml.fi -share/examples/xfce4/desktop/xfce-registered-categories.xml.fr -share/examples/xfce4/desktop/xfce-registered-categories.xml.he -share/examples/xfce4/desktop/xfce-registered-categories.xml.hu -share/examples/xfce4/desktop/xfce-registered-categories.xml.it -share/examples/xfce4/desktop/xfce-registered-categories.xml.ja -share/examples/xfce4/desktop/xfce-registered-categories.xml.nb_NO -share/examples/xfce4/desktop/xfce-registered-categories.xml.nl -share/examples/xfce4/desktop/xfce-registered-categories.xml.pl -share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR -share/examples/xfce4/desktop/xfce-registered-categories.xml.ro -share/examples/xfce4/desktop/xfce-registered-categories.xml.ru -share/examples/xfce4/desktop/xfce-registered-categories.xml.sk -share/examples/xfce4/desktop/xfce-registered-categories.xml.sv -share/examples/xfce4/desktop/xfce-registered-categories.xml.tr -share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN -share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW +share/applications/xfce4-about-xfce.desktop +share/applications/xfce4-file-manager.desktop +share/applications/xfce4-help.desktop +share/applications/xfce4-logout.desktop +share/applications/xfce4-run-program.desktop +share/applications/xfce4-terminal.desktop +share/applications/xfce4-web-browser.desktop +share/desktop-directories/xfce-accessories.directory +share/desktop-directories/xfce-development.directory +share/desktop-directories/xfce-education.directory +share/desktop-directories/xfce-games.directory +share/desktop-directories/xfce-graphics.directory +share/desktop-directories/xfce-multimedia.directory +share/desktop-directories/xfce-network.directory +share/desktop-directories/xfce-office.directory +share/desktop-directories/xfce-other.directory +share/desktop-directories/xfce-screensavers.directory +share/desktop-directories/xfce-settings.directory +share/desktop-directories/xfce-system.directory +share/examples/xfce4/menus/xfce-applications.menu share/icons/hicolor/32x32/apps/xfce4-backdrop.png share/icons/hicolor/32x32/apps/xfce4-menueditor.png share/icons/hicolor/48x48/apps/xfce4-backdrop.png @@ -106,15 +69,16 @@ share/locale/lv/LC_MESSAGES/xfdesktop.mo share/locale/mk/LC_MESSAGES/xfdesktop.mo share/locale/mr/LC_MESSAGES/xfdesktop.mo share/locale/ms/LC_MESSAGES/xfdesktop.mo -share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo +share/locale/nb/LC_MESSAGES/xfdesktop.mo share/locale/nl/LC_MESSAGES/xfdesktop.mo share/locale/pa/LC_MESSAGES/xfdesktop.mo share/locale/pl/LC_MESSAGES/xfdesktop.mo +share/locale/pt/LC_MESSAGES/xfdesktop.mo share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo -share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo share/locale/ro/LC_MESSAGES/xfdesktop.mo share/locale/ru/LC_MESSAGES/xfdesktop.mo share/locale/sk/LC_MESSAGES/xfdesktop.mo +share/locale/sq/LC_MESSAGES/xfdesktop.mo share/locale/sv/LC_MESSAGES/xfdesktop.mo share/locale/ta/LC_MESSAGES/xfdesktop.mo share/locale/tr/LC_MESSAGES/xfdesktop.mo @@ -130,7 +94,6 @@ share/pixmaps/xfce4_xicon2.png share/pixmaps/xfce4_xicon3.png share/pixmaps/xfce4_xicon4.png share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png -share/xfce4-menueditor/xfce4-menueditor.ui share/xfce4/backdrops/flower.png share/xfce4/backdrops/xfce-in-a-grid.png share/xfce4/backdrops/xfce-in-the-moon.png @@ -148,6 +111,7 @@ share/xfce4/doc/C/images/xfdesktop-behavior-tab.png share/xfce4/doc/C/images/xfdesktop-editor.png share/xfce4/doc/C/images/xfdesktop-list.png share/xfce4/doc/C/xfdesktop.html +share/xfce4/doc/da/xfdesktop.html share/xfce4/doc/fr/images/root_menu.png share/xfce4/doc/fr/images/root_menu2.png share/xfce4/doc/fr/images/select_bg_color.png @@ -156,4 +120,11 @@ share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png share/xfce4/doc/fr/images/xfdesktop-editor.png share/xfce4/doc/fr/images/xfdesktop-list.png share/xfce4/doc/fr/xfdesktop.html +share/xfce4/doc/ja/images/root_menu.png +share/xfce4/doc/ja/images/root_menu2.png +share/xfce4/doc/ja/images/select_bg_color.png +share/xfce4/doc/ja/images/xfdesktop-background-tab.png +share/xfce4/doc/ja/images/xfdesktop-icons-tab.png +share/xfce4/doc/ja/images/xfdesktop-menus-tab.png +share/xfce4/doc/ja/xfdesktop.html share/xfce4/panel-plugins/xfce4-menu.desktop diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 8d0dbf38e2e..13d3ac8824b 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.25 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-desktop .if !defined(XFCE4_DESKTOP_BUILDLINK3_MK) XFCE4_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-desktop?= xfce4-desktop>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_DESKTOP_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-desktop diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index b1b24d0f544..2a50f17c981 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ -SHA1 (xfdesktop-4.4.3.tar.bz2) = 6ba60fd7f8f57104195e3e17551315d0c3c2381e -RMD160 (xfdesktop-4.4.3.tar.bz2) = 490749cc579a30ea3689ab65c099d284ecffff56 -Size (xfdesktop-4.4.3.tar.bz2) = 3095897 bytes -SHA1 (patch-aa) = 72eb8d6810d0a680f49fa03f45a73fe4f124d02d -SHA1 (patch-ab) = 0816049644f48d4057b20d32f88629552216f5fc +SHA1 (xfdesktop-4.6.1.tar.bz2) = c2c1b54acaae924077caa3cdffe449e3bb34b2bd +RMD160 (xfdesktop-4.6.1.tar.bz2) = 86785f706a65e443c5521179b68309b9aca0cb32 +Size (xfdesktop-4.6.1.tar.bz2) = 3671378 bytes +SHA1 (patch-ac) = 1d63ec32443690ac989a88704079999894a67ad5 diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa deleted file mode 100644 index 214c2bd2498..00000000000 --- a/x11/xfce4-desktop/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2007/12/07 19:43:27 martti Exp $ - ---- Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 -+++ Makefile.in 2007-12-04 13:28:52.000000000 +0000 -@@ -314,7 +314,7 @@ - modules \ - pixmaps - --confdir = $(sysconfdir)/xdg/xfce4/desktop -+confdir = $(datadir)/examples/xfce4/desktop - conf_DATA = \ - menu.xml \ - menu.xml.be \ diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab deleted file mode 100644 index 9ef1c37f9b2..00000000000 --- a/x11/xfce4-desktop/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2007/12/07 19:43:27 martti Exp $ - ---- modules/menu/Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 -+++ modules/menu/Makefile.in 2007-12-04 13:29:15.000000000 +0000 -@@ -337,7 +337,7 @@ - $(LIBX11_LIBS) \ - $(LIBXFCEGUI4_LIBS) - --xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop -+xfceconfdir = $(datadir)/examples/xfce4/desktop - xfceconf_DATA = \ - xfce-registered-categories.xml \ - xfce-registered-categories.xml.ca \ diff --git a/x11/xfce4-desktop/patches/patch-ac b/x11/xfce4-desktop/patches/patch-ac new file mode 100644 index 00000000000..637db20cc5e --- /dev/null +++ b/x11/xfce4-desktop/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.5 2009/09/16 01:15:33 reed Exp $ + +--- modules/menu/menu-data/Makefile.in.orig 2009-03-09 11:13:35.000000000 +0000 ++++ modules/menu/menu-data/Makefile.in +@@ -291,7 +291,7 @@ desktop_in_files = \ + xfce4-web-browser.desktop.in + + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +-menudir = $(sysconfdir)/xdg/menus ++menudir = $(datadir)/examples/xfce4/menus + menu_DATA = xfce-applications.menu + EXTRA_DIST = $(desktop_in_files) $(menu_DATA) + DISTCLEANFILES = $(desktop_DATA) diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile index 576a42b2f93..face0e7026d 100644 --- a/x11/xfce4-exo/Makefile +++ b/x11/xfce4-exo/Makefile @@ -1,28 +1,45 @@ -# $NetBSD: Makefile,v 1.8 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: Makefile,v 1.9 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.3.4 +XFCE4_VERSION= 0.3.101 DISTNAME= exo-${XFCE4_VERSION} PKGNAME= xfce4-exo-${XFCE4_VERSION} -PKGREVISION= 5 CATEGORIES= x11 COMMENT= Xfce extension library DEPENDS+= p5-URI>=0:../../www/p5-URI +PKGCONFIG_OVERRIDE+= exo/exo-0.3.pc.in exo-hal/exo-hal-0.3.pc.in + PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} -CONF_FILES= ${EGDIR:Q}/helpers.rc ${PKG_SYSCONFDIR:Q}/helpers.rc + +MAKE_DIRS+= ${SYSCONFDIR} +MAKE_DIRS+= ${EGDIR} ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +.for f in C es fr id ja pt_BR tr +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f} +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f}/images +.endfor + +CONF_FILES= ${EGDIR}/helpers.rc ${PKG_SYSCONFDIR}/helpers.rc OWN_DIRS+= ${EGDIR} +PY_PATCHPLIST= yes + .include "options.mk" +BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.4.0 + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/py-gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST index db4bc57019a..0adab725211 100644 --- a/x11/xfce4-exo/PLIST +++ b/x11/xfce4-exo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:35 reed Exp $ bin/exo-csource bin/exo-desktop-item-edit bin/exo-eject @@ -38,15 +38,22 @@ lib/libexo-0.3.la lib/libexo-hal-0.3.la lib/pkgconfig/exo-0.3.pc lib/pkgconfig/exo-hal-0.3.pc -lib/xfce4/mcs-plugins/exo-preferred-applications-settings.la +${PYSITELIB}/exo-0.3/_exo.la +${PYSITELIB}/exo-0.3/exo/__init__.py +${PYSITELIB}/exo-0.3/exo/__init__.pyc +${PYSITELIB}/exo-0.3/exo/__init__.pyo +${PYSITELIB}/pyexo.py +${PYSITELIB}/pyexo.pyc +${PYSITELIB}/pyexo.pyo libexec/exo-compose-mail-0.3 libexec/exo-helper-0.3 +libexec/exo-mount-notify-0.3 man/man1/exo-csource.1 man/man1/exo-open.1 share/applications/exo-preferred-applications.desktop share/examples/xfce4/helpers.rc -share/gtk-doc/html/exo/ExoCellRendererIcon.html share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html +share/gtk-doc/html/exo/ExoCellRendererIcon.html share/gtk-doc/html/exo/ExoEllipsizedLabel.html share/gtk-doc/html/exo/ExoIconBar.html share/gtk-doc/html/exo/ExoIconChooserDialog.html @@ -106,6 +113,7 @@ share/locale/be/LC_MESSAGES/libexo-0.3.mo share/locale/ca/LC_MESSAGES/libexo-0.3.mo share/locale/cs/LC_MESSAGES/libexo-0.3.mo share/locale/cy/LC_MESSAGES/libexo-0.3.mo +share/locale/da/LC_MESSAGES/libexo-0.3.mo share/locale/de/LC_MESSAGES/libexo-0.3.mo share/locale/dz/LC_MESSAGES/libexo-0.3.mo share/locale/el/LC_MESSAGES/libexo-0.3.mo @@ -118,40 +126,66 @@ share/locale/fr/LC_MESSAGES/libexo-0.3.mo share/locale/gl/LC_MESSAGES/libexo-0.3.mo share/locale/he/LC_MESSAGES/libexo-0.3.mo share/locale/hu/LC_MESSAGES/libexo-0.3.mo +share/locale/id/LC_MESSAGES/libexo-0.3.mo share/locale/it/LC_MESSAGES/libexo-0.3.mo share/locale/ja/LC_MESSAGES/libexo-0.3.mo share/locale/ka/LC_MESSAGES/libexo-0.3.mo +share/locale/ku/LC_MESSAGES/libexo-0.3.mo share/locale/lt/LC_MESSAGES/libexo-0.3.mo share/locale/lv/LC_MESSAGES/libexo-0.3.mo share/locale/mk/LC_MESSAGES/libexo-0.3.mo -share/locale/nb_NO/LC_MESSAGES/libexo-0.3.mo +share/locale/nb/LC_MESSAGES/libexo-0.3.mo share/locale/nl/LC_MESSAGES/libexo-0.3.mo share/locale/pa/LC_MESSAGES/libexo-0.3.mo share/locale/pl/LC_MESSAGES/libexo-0.3.mo +share/locale/pt/LC_MESSAGES/libexo-0.3.mo share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo -share/locale/pt_PT/LC_MESSAGES/libexo-0.3.mo share/locale/ro/LC_MESSAGES/libexo-0.3.mo share/locale/ru/LC_MESSAGES/libexo-0.3.mo share/locale/sq/LC_MESSAGES/libexo-0.3.mo share/locale/sv/LC_MESSAGES/libexo-0.3.mo +share/locale/tr/LC_MESSAGES/libexo-0.3.mo +share/locale/uk/LC_MESSAGES/libexo-0.3.mo share/locale/ur/LC_MESSAGES/libexo-0.3.mo +share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo share/pixmaps/exo-0.3/exo-thumbnail-frame.png +share/pygtk/2.0/defs/exo-0.3/exo.defs share/xfce4/doc/C/exo-preferred-applications.html share/xfce4/doc/C/images/exo-preferred-applications-internet.png share/xfce4/doc/C/images/exo-preferred-applications-utilities.png share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/es/exo-preferred-applications.html +share/xfce4/doc/es/images/exo-preferred-applications-internet.png +share/xfce4/doc/es/images/exo-preferred-applications-utilities.png +share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/fr/exo-preferred-applications.html share/xfce4/doc/fr/images/exo-preferred-applications-internet.png share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/id/exo-preferred-applications.html +share/xfce4/doc/id/images/exo-preferred-applications-internet.png +share/xfce4/doc/id/images/exo-preferred-applications-utilities.png +share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/ja/exo-preferred-applications.html share/xfce4/doc/ja/images/exo-preferred-applications-internet.png share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/pt_BR/exo-preferred-applications.html +share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/tr/exo-preferred-applications.html +share/xfce4/doc/tr/images/exo-preferred-applications-internet.png +share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png +share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/helpers/Terminal.desktop share/xfce4/helpers/aterm.desktop share/xfce4/helpers/balsa.desktop @@ -168,6 +202,7 @@ share/xfce4/helpers/kmail.desktop share/xfce4/helpers/konqueror.desktop share/xfce4/helpers/links.desktop share/xfce4/helpers/lynx.desktop +share/xfce4/helpers/midori.desktop share/xfce4/helpers/mozilla-browser.desktop share/xfce4/helpers/mozilla-mailer.desktop share/xfce4/helpers/mutt.desktop diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk index acc30e0e3fe..78327c2545d 100644 --- a/x11/xfce4-exo/buildlink3.mk +++ b/x11/xfce4-exo/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-exo .if !defined(XFCE4_EXO_BUILDLINK3_MK) XFCE4_EXO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.4 -BUILDLINK_ABI_DEPENDS.xfce4-exo?= xfce4-exo>=0.3.4nb5 +BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.100 BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo pkgbase := xfce4-exo @@ -16,10 +15,9 @@ pkgbase := xfce4-exo .include "../../sysutils/hal/buildlink3.mk" .endif -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .endif # XFCE4_EXO_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-exo diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo index 0235dfe0b45..dc6bb8ab69f 100644 --- a/x11/xfce4-exo/distinfo +++ b/x11/xfce4-exo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2008/12/18 16:38:08 hira Exp $ +$NetBSD: distinfo,v 1.7 2009/09/16 01:15:35 reed Exp $ -SHA1 (exo-0.3.4.tar.bz2) = 4f7a3f46592fd0311be1f011f17431f211cc1fcb -RMD160 (exo-0.3.4.tar.bz2) = e021f030a624c522c819ec0f3a8682a1007ae748 -Size (exo-0.3.4.tar.bz2) = 1300127 bytes +SHA1 (exo-0.3.101.tar.bz2) = 74194f58278a2b9d963264806f142e5d6d05336c +RMD160 (exo-0.3.101.tar.bz2) = 92dfc1e8f0bfa8ca74f151a2283f6988ce703649 +Size (exo-0.3.101.tar.bz2) = 1793815 bytes SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9 SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb -SHA1 (patch-af) = 3ee9049c676a03eadaaa92c69f5480e625a9cc9f +SHA1 (patch-af) = 86aee9fdf075c2de36deeebbb7594193e92cde95 diff --git a/x11/xfce4-exo/patches/patch-af b/x11/xfce4-exo/patches/patch-af index 232926af987..53eea103146 100644 --- a/x11/xfce4-exo/patches/patch-af +++ b/x11/xfce4-exo/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2008/12/18 16:38:08 hira Exp $ +$NetBSD: patch-af,v 1.2 2009/09/16 01:15:35 reed Exp $ ---- exo-helper/helpers/Makefile.in.orig 2008-11-29 17:14:28.000000000 +0900 -+++ exo-helper/helpers/Makefile.in 2008-11-29 17:15:31.000000000 +0900 -@@ -276,7 +276,7 @@ +--- exo-helper/helpers/Makefile.in.orig 2009-02-24 20:56:34.000000000 +0000 ++++ exo-helper/helpers/Makefile.in +@@ -273,7 +273,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile index a05ee824da5..627b1d3d758 100644 --- a/x11/xfce4-gtk2-engine/Makefile +++ b/x11/xfce4-gtk2-engine/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.12 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.4.3 +XFCE4_VERSION= 2.6.0 DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce GTK2 themes +MAKE_DIRS+= ${PREFIX}/share/themes/Xfce .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-gtk2-engine/PLIST b/x11/xfce4-gtk2-engine/PLIST index 00f419e3ee9..9b432672e9d 100644 --- a/x11/xfce4-gtk2-engine/PLIST +++ b/x11/xfce4-gtk2-engine/PLIST @@ -1,56 +1,21 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:35 reed Exp $ lib/gtk-2.0/2.10.0/engines/libxfce.la -share/themes/Xfce-4.0/ICON.png -share/themes/Xfce-4.0/README.html share/themes/Xfce-4.0/gtk-2.0/gtkrc -share/themes/Xfce-4.2/ICON.png -share/themes/Xfce-4.2/README.html share/themes/Xfce-4.2/gtk-2.0/gtkrc -share/themes/Xfce-b5/ICON.png -share/themes/Xfce-b5/README.html +share/themes/Xfce-4.4/gtk-2.0/gtkrc share/themes/Xfce-b5/gtk-2.0/gtkrc -share/themes/Xfce-basic/ICON.png -share/themes/Xfce-basic/README.html share/themes/Xfce-basic/gtk-2.0/gtkrc -share/themes/Xfce-cadmium/ICON.png -share/themes/Xfce-cadmium/README.html share/themes/Xfce-cadmium/gtk-2.0/gtkrc -share/themes/Xfce-curve/ICON.png -share/themes/Xfce-curve/README.html share/themes/Xfce-curve/gtk-2.0/gtkrc -share/themes/Xfce-dawn/ICON.png -share/themes/Xfce-dawn/README.html share/themes/Xfce-dawn/gtk-2.0/gtkrc -share/themes/Xfce-dusk/ICON.png -share/themes/Xfce-dusk/README.html share/themes/Xfce-dusk/gtk-2.0/gtkrc -share/themes/Xfce-kde2/ICON.png -share/themes/Xfce-kde2/README.html share/themes/Xfce-kde2/gtk-2.0/gtkrc -share/themes/Xfce-kolors/ICON.png -share/themes/Xfce-kolors/README.html share/themes/Xfce-kolors/gtk-2.0/gtkrc -share/themes/Xfce-light/ICON.png -share/themes/Xfce-light/README.html share/themes/Xfce-light/gtk-2.0/gtkrc -share/themes/Xfce-orange/ICON.png -share/themes/Xfce-orange/README.html share/themes/Xfce-orange/gtk-2.0/gtkrc -share/themes/Xfce-redmondxp/ICON.png -share/themes/Xfce-redmondxp/README.html share/themes/Xfce-redmondxp/gtk-2.0/gtkrc -share/themes/Xfce-saltlake/ICON.png -share/themes/Xfce-saltlake/README.html share/themes/Xfce-saltlake/gtk-2.0/gtkrc -share/themes/Xfce-smooth/ICON.png -share/themes/Xfce-smooth/README.html share/themes/Xfce-smooth/gtk-2.0/gtkrc -share/themes/Xfce-stellar/ICON.png -share/themes/Xfce-stellar/README.html share/themes/Xfce-stellar/gtk-2.0/gtkrc -share/themes/Xfce-winter/ICON.png -share/themes/Xfce-winter/README.html share/themes/Xfce-winter/gtk-2.0/gtkrc -share/themes/Xfce/ICON.png -share/themes/Xfce/README.html share/themes/Xfce/gtk-2.0/gtkrc diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index dc3a32daba5..d2ede2bb486 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-gtk2-engine .if !defined(XFCE4_GTK2_ENGINE_BUILDLINK3_MK) XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.3 -BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?= xfce4-gtk2-engine>=2.4.3nb1 +BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.6.0 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-gtk2-engine diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo index 104d2578456..692d0c49ad9 100644 --- a/x11/xfce4-gtk2-engine/distinfo +++ b/x11/xfce4-gtk2-engine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.6 2009/09/16 01:15:35 reed Exp $ -SHA1 (gtk-xfce-engine-2.4.3.tar.bz2) = 17794b7742691330f643ea207341dbd502b016f5 -RMD160 (gtk-xfce-engine-2.4.3.tar.bz2) = ef9960987e9356030efc6696725f504458b7f510 -Size (gtk-xfce-engine-2.4.3.tar.bz2) = 310286 bytes +SHA1 (gtk-xfce-engine-2.6.0.tar.bz2) = a7be2f330833d150c5fb37f68a4c2138348b5446 +RMD160 (gtk-xfce-engine-2.6.0.tar.bz2) = 07f4ff278056f7714e99da8420268dd950b15a91 +Size (gtk-xfce-engine-2.6.0.tar.bz2) = 280627 bytes diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 28598309d72..e5a04ada149 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,45 +1,42 @@ -# $NetBSD: Makefile,v 1.34 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: Makefile,v 1.35 2009/09/16 01:15:35 reed Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -.include "../../mk/compiler.mk" DISTNAME= xfce4-panel-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce panel -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc - -PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in +PKGCONFIG_OVERRIDE= libxfce4panel/libxfce4panel-1.0.pc.in PTHREAD_AUTO_VARS= yes -OWN_DIRS+= xdg/xfce4 -OWN_DIRS+= xdg/xfce4/panel PKG_SYSCONFSUBDIR= xdg/xfce4/panel EGDIR= ${XFCE4_EGBASE}/panel + +MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 +MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${PREFIX}/share/xfce4 +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc ${PREFIX}/share/xfce4/doc/C +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C/images +OWN_DIRS+= ${PKG_SYSCONFDIR} +OWN_DIRS+= ${PREFIX}/libexec/xfce4/panel-plugins +# The following are not used in this pkg, but here is a good place to rmdir them +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 +OWN_DIRS+= ${PREFIX}/share/xfce4/panel-plugins + .for f in clock-14.rc launcher-10.rc launcher-7.rc launcher-8.rc launcher-9.rc \ panels.xml systray-4.rc xfce4-menu-5.rc -CONF_FILES+= ${EGDIR:Q}/$f ${PKG_SYSCONFDIR:Q}/$f +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -# If using gcc-4, compile the panel launcher without GCC optimization. See -# http://bugzilla.xfce.org/show_bug.cgi?id=2262 - -.if (!empty(CC_VERSION:Mgcc-4.*)) -SUBST_CLASSES+= launcher -SUBST_STAGE.launcher= post-configure -SUBST_FILES.launcher= plugins/launcher/Makefile -SUBST_SED.launcher= -e 's|-O |-O0 |g' -SUBST_SED.launcher+= -e 's|-O[123s] |-O0 |g' -.endif - -post-install: - @${ECHO} "Removing the dummy files" - rm -f ${PREFIX}/bin/xfce4-iconbox ${PREFIX}/bin/xftaskbar4 - +.include "../../devel/libwnck/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST index 12b2483cf7c..48381de7592 100644 --- a/x11/xfce4-panel/PLIST +++ b/x11/xfce4-panel/PLIST @@ -1,11 +1,12 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $ bin/xfce4-panel bin/xfce4-popup-windowlist +include/xfce4/libxfce4panel/libxfce4panel-enum-types.h +include/xfce4/libxfce4panel/libxfce4panel.h include/xfce4/libxfce4panel/xfce-arrow-button.h include/xfce4/libxfce4panel/xfce-hvbox.h include/xfce4/libxfce4panel/xfce-itembar.h include/xfce4/libxfce4panel/xfce-panel-convenience.h -include/xfce4/libxfce4panel/xfce-panel-enum-types.h include/xfce4/libxfce4panel/xfce-panel-enums.h include/xfce4/libxfce4panel/xfce-panel-external-plugin.h include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h @@ -15,7 +16,6 @@ include/xfce4/libxfce4panel/xfce-panel-plugin.h include/xfce4/libxfce4panel/xfce-panel-window.h lib/libxfce4panel.la lib/pkgconfig/libxfce4panel-1.0.pc -lib/xfce4/mcs-plugins/libxfce4settings.la lib/xfce4/panel-plugins/libactions.la lib/xfce4/panel-plugins/libclock.la lib/xfce4/panel-plugins/libiconbox.la @@ -35,34 +35,43 @@ share/examples/xfce4/panel/launcher-9.rc share/examples/xfce4/panel/panels.xml share/examples/xfce4/panel/systray-4.rc share/examples/xfce4/panel/xfce4-menu-5.rc -share/doc/libxfce4panel/XfceArrowButton.html -share/doc/libxfce4panel/XfceExternalPanelPlugin.html -share/doc/libxfce4panel/XfceHVBox.html -share/doc/libxfce4panel/XfceInternalPanelPlugin.html -share/doc/libxfce4panel/XfceItembar.html -share/doc/libxfce4panel/XfcePanelPlugin.html -share/doc/libxfce4panel/XfcePanelWindow.html -share/doc/libxfce4panel/ch01.html -share/doc/libxfce4panel/home.png -share/doc/libxfce4panel/index.html -share/doc/libxfce4panel/index.sgml -share/doc/libxfce4panel/left.png -share/doc/libxfce4panel/libxfce4panel-Convenience-Functions.html -share/doc/libxfce4panel/libxfce4panel-Standard-Enumerations.html -share/doc/libxfce4panel/libxfce4panel-Writing-Plugins.html -share/doc/libxfce4panel/libxfce4panel.devhelp -share/doc/libxfce4panel/libxfce4panel.devhelp2 -share/doc/libxfce4panel/right.png -share/doc/libxfce4panel/style.css -share/doc/libxfce4panel/up.png +share/gtk-doc/html/libxfce4panel/XfceArrowButton.html +share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfceHVBox.html +share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfceItembar.html +share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html +share/gtk-doc/html/libxfce4panel/home.png +share/gtk-doc/html/libxfce4panel/index.html +share/gtk-doc/html/libxfce4panel/index.sgml +share/gtk-doc/html/libxfce4panel/ix01.html +share/gtk-doc/html/libxfce4panel/ix02.html +share/gtk-doc/html/libxfce4panel/left.png +share/gtk-doc/html/libxfce4panel/libxfce4panel-Common-macros.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Widgets.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Register-Plugins.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-fundamentals.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-panel.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-widgets.html +share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp +share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2 +share/gtk-doc/html/libxfce4panel/right.png +share/gtk-doc/html/libxfce4panel/style.css +share/gtk-doc/html/libxfce4panel/up.png share/icons/hicolor/16x16/apps/xfce-system-exit.png -share/icons/hicolor/16x16/apps/xfce-system-info.png share/icons/hicolor/16x16/apps/xfce-system-lock.png -share/icons/hicolor/16x16/apps/xfce-system-settings.png -share/icons/hicolor/48x48/apps/xfce-mail.png +share/icons/hicolor/16x16/apps/xfce4-panel.png +share/icons/hicolor/22x22/apps/xfce4-panel.png +share/icons/hicolor/24x24/apps/xfce4-panel.png +share/icons/hicolor/32x32/apps/xfce4-panel.png share/icons/hicolor/48x48/apps/xfce-mouse.png +share/icons/hicolor/48x48/apps/xfce4-clock.png share/icons/hicolor/48x48/apps/xfce4-iconbox.png share/icons/hicolor/48x48/apps/xfce4-panel.png +share/icons/hicolor/48x48/apps/xfce4-separator.png +share/icons/hicolor/48x48/apps/xfce4-systray.png share/icons/hicolor/48x48/apps/xfce4-taskbar.png share/locale/am/LC_MESSAGES/xfce4-panel.mo share/locale/ar/LC_MESSAGES/xfce4-panel.mo @@ -96,21 +105,23 @@ share/locale/it/LC_MESSAGES/xfce4-panel.mo share/locale/ja/LC_MESSAGES/xfce4-panel.mo share/locale/ka/LC_MESSAGES/xfce4-panel.mo share/locale/ko/LC_MESSAGES/xfce4-panel.mo +share/locale/ku/LC_MESSAGES/xfce4-panel.mo share/locale/lt/LC_MESSAGES/xfce4-panel.mo share/locale/lv/LC_MESSAGES/xfce4-panel.mo share/locale/mk/LC_MESSAGES/xfce4-panel.mo share/locale/mr/LC_MESSAGES/xfce4-panel.mo share/locale/ms/LC_MESSAGES/xfce4-panel.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo +share/locale/nb/LC_MESSAGES/xfce4-panel.mo share/locale/nl/LC_MESSAGES/xfce4-panel.mo share/locale/pa/LC_MESSAGES/xfce4-panel.mo share/locale/pl/LC_MESSAGES/xfce4-panel.mo +share/locale/pt/LC_MESSAGES/xfce4-panel.mo share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo share/locale/ro/LC_MESSAGES/xfce4-panel.mo share/locale/ru/LC_MESSAGES/xfce4-panel.mo share/locale/si/LC_MESSAGES/xfce4-panel.mo share/locale/sk/LC_MESSAGES/xfce4-panel.mo +share/locale/sq/LC_MESSAGES/xfce4-panel.mo share/locale/sv/LC_MESSAGES/xfce4-panel.mo share/locale/ta/LC_MESSAGES/xfce4-panel.mo share/locale/tr/LC_MESSAGES/xfce4-panel.mo diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index d13d7c784a8..5d06fc723ef 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,20 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-panel .if !defined(XFCE4_PANEL_BUILDLINK3_MK) XFCE4_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-panel?= xfce4-panel>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .endif # XFCE4_PANEL_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-panel diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo index f2e0414337a..1b454ad660a 100644 --- a/x11/xfce4-panel/distinfo +++ b/x11/xfce4-panel/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.18 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.19 2009/09/16 01:15:35 reed Exp $ -SHA1 (xfce4-panel-4.4.3.tar.bz2) = 6af98ffef4906220c5ffdda17a77409adc7ed353 -RMD160 (xfce4-panel-4.4.3.tar.bz2) = 39c05602e82d3bdeaa152b3820e2f084df6c3759 -Size (xfce4-panel-4.4.3.tar.bz2) = 777979 bytes -SHA1 (patch-aa) = 0d44c64af2ab3cc5605dfb08baa75d78843af28f -SHA1 (patch-ab) = c5b1ccf61528bb11aebf63805586621dad4649d1 +SHA1 (xfce4-panel-4.6.1.tar.bz2) = 613c66f6402feba7983a7effb008f091182350d2 +RMD160 (xfce4-panel-4.6.1.tar.bz2) = 47ce1703306e7427d300bb3675e2e8dcd13c459e +Size (xfce4-panel-4.6.1.tar.bz2) = 868225 bytes +SHA1 (patch-ab) = 977b38f4e58620b96d28ef2b9992a03169eb7814 diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa deleted file mode 100644 index 57cf0252154..00000000000 --- a/x11/xfce4-panel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/03/25 16:13:52 macallan Exp $ - ---- panel/panel-properties.c.orig 2008-03-25 11:45:01.000000000 -0400 -+++ panel/panel-properties.c -@@ -623,7 +623,7 @@ _set_transparent (Panel *panel, - gboolean transparent) - { - PanelPrivate *priv; -- guint opacity; -+ gulong opacity; - - if (!GTK_WIDGET (panel)->window) - return; diff --git a/x11/xfce4-panel/patches/patch-ab b/x11/xfce4-panel/patches/patch-ab index ef586d510e5..1f810b9bd5a 100644 --- a/x11/xfce4-panel/patches/patch-ab +++ b/x11/xfce4-panel/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2008/12/17 12:50:03 hira Exp $ +$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:32 reed Exp $ ---- config/Makefile.in.orig 2008-11-29 18:20:58.000000000 +0900 -+++ config/Makefile.in 2008-11-29 18:21:29.000000000 +0900 -@@ -254,7 +254,7 @@ - launcher-10.rc.in +--- config/Makefile.in.orig 2009-02-24 21:39:18.000000000 +0000 ++++ config/Makefile.in +@@ -263,7 +263,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + confdir = \ +- $(sysconfdir)/xdg/xfce4/panel ++ $(datadir)/examples/xfce4/panel - conf_files = $(conf_in_files:.rc.in=.rc) --confdir = $(sysconfdir)/xdg/xfce4/panel -+confdir = $(datadir)/examples/xfce4/panel - conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files) - EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files) - all: all-am + conf_in_files = \ + launcher-7.rc.in \ diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index b994d1786f9..cb3af8daa3a 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,32 +1,46 @@ -# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce session manager -EGDIR= ${XFCE4_EGBASE}/session -CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ - ${PKG_SYSCONFDIR:Q}/xdg/xfce4-session/xfce4-session.rc -CONF_FILES+= ${PREFIX}/share/xdg/autostart/xfce4-tips-autostart.desktop \ - ${PKG_SYSCONFDIR:Q}/xdg/autostart/xfce4-tips-autostart.desktop +PKGCONFIG_OVERRIDE+= libxfsm/xfce4-session-2.0.pc.in -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q} - -REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} ${PREFIX}/share/xdg/autostart BUILD_DEFS+= PKG_SYSCONFBASE -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/xfce4-session -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth} USE_TOOLS+= iceauth:run +EGDIR= ${XFCE4_EGBASE} +PKG_SYSCONFSUBDIR= xdg + +MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/autostart +MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 +MAKE_DIRS+= ${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf +MAKE_DIRS+= ${EGDIR}/xfconf/xfce-perchannel-xml +MAKE_DIRS+= ${EGDIR}/share/themes/Default +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images + +CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +CONF_FILES+= ${EGDIR}/autostart/xfce4-tips-autostart.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfce4-tips-autostart.desktop + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index 3090da2ad99..4e087e769d8 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,14 +1,12 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 22:06:43 joerg Exp $ -bin/xfce4-autostart-editor +@comment $NetBSD: PLIST,v 1.15 2009/09/16 01:15:36 reed Exp $ bin/xfce4-session bin/xfce4-session-logout +bin/xfce4-session-settings bin/xfce4-tips -include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h -include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h -lib/libxfsm-4.2.la -lib/pkgconfig/xfce4-session-1.0.pc -lib/xfce4/mcs-plugins/session_settings.la -lib/xfce4/mcs-plugins/splash_settings.la +include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h +include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h +lib/libxfsm-4.6.la +lib/pkgconfig/xfce4-session-2.0.pc lib/xfce4/splash/engines/libbalou.la lib/xfce4/splash/engines/libmice.la lib/xfce4/splash/engines/libsimple.la @@ -18,16 +16,17 @@ libexec/xfsm-shutdown-helper man/man1/xfce4-session-logout.1 man/man1/xfce4-session.1 share/applications/xfce-session-settings.desktop -share/applications/xfce-splash-settings.desktop -share/applications/xfce4-autostart-editor.desktop -share/examples/xfce4/session/xfce4-session.rc +share/examples/xfce4/autostart/xfce4-tips-autostart.desktop +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml share/icons/hicolor/128x128/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png +share/icons/hicolor/48x48/apps/xfsm-hibernate.png share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png +share/icons/hicolor/48x48/apps/xfsm-suspend.png share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png share/icons/hicolor/72x72/apps/xfsm-trash-normal.png @@ -63,22 +62,22 @@ share/locale/it/LC_MESSAGES/xfce4-session.mo share/locale/ja/LC_MESSAGES/xfce4-session.mo share/locale/ka/LC_MESSAGES/xfce4-session.mo share/locale/ko/LC_MESSAGES/xfce4-session.mo -share/locale/ku/LC_MESSAGES/xfce4-session.mo share/locale/lt/LC_MESSAGES/xfce4-session.mo share/locale/lv/LC_MESSAGES/xfce4-session.mo share/locale/mk/LC_MESSAGES/xfce4-session.mo share/locale/mr/LC_MESSAGES/xfce4-session.mo share/locale/ms/LC_MESSAGES/xfce4-session.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo +share/locale/nb/LC_MESSAGES/xfce4-session.mo share/locale/nl/LC_MESSAGES/xfce4-session.mo share/locale/pa/LC_MESSAGES/xfce4-session.mo share/locale/pl/LC_MESSAGES/xfce4-session.mo +share/locale/pt/LC_MESSAGES/xfce4-session.mo share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo share/locale/ro/LC_MESSAGES/xfce4-session.mo share/locale/ru/LC_MESSAGES/xfce4-session.mo share/locale/si/LC_MESSAGES/xfce4-session.mo share/locale/sk/LC_MESSAGES/xfce4-session.mo +share/locale/sq/LC_MESSAGES/xfce4-session.mo share/locale/sv/LC_MESSAGES/xfce4-session.mo share/locale/ta/LC_MESSAGES/xfce4-session.mo share/locale/tr/LC_MESSAGES/xfce4-session.mo @@ -89,7 +88,6 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc -share/xdg/autostart/xfce4-tips-autostart.desktop share/xfce4/doc/C/images/xfsm-advanced.png share/xfce4/doc/C/images/xfsm-general.png share/xfce4/doc/C/images/xfsm-splash.png diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index 7e1cb8f8fe9..3ffbd0c7986 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,18 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-session .if !defined(XFCE4_SESSION_BUILDLINK3_MK) XFCE4_SESSION_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb2 -BUILDLINK_ABI_DEPENDS.xfce4-session?= xfce4-session>=4.4.3nb3 +BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" .endif # XFCE4_SESSION_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-session diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 2b50170454f..bf378ebe382 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2008/12/19 23:58:18 hira Exp $ +$NetBSD: distinfo,v 1.12 2009/09/16 01:15:36 reed Exp $ -SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d -RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922 -Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes -SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 -SHA1 (patch-ab) = d87076b003dd7e7ee74251199d4a1af0a5c5a355 +SHA1 (xfce4-session-4.6.1.tar.bz2) = 760e05bf73783521b3ce34e91aa187c74018ab8c +RMD160 (xfce4-session-4.6.1.tar.bz2) = 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 +Size (xfce4-session-4.6.1.tar.bz2) = 1365247 bytes +SHA1 (patch-ab) = f1c7a041a91f91a56ac7c8cf64e74a203be905f5 +SHA1 (patch-ac) = 549dccc70ae31f14291d3bf2c191ad8379139c63 diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa deleted file mode 100644 index af69a182f1d..00000000000 --- a/x11/xfce4-session/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $ - ---- Makefile.in.orig 2006-07-10 12:12:02.000000000 +0000 -+++ Makefile.in 2006-07-14 09:28:20.000000000 +0000 -@@ -278,7 +278,7 @@ - xfce4-tips \ - xfsm-shutdown-helper - --configdir = $(sysconfdir)/xdg/xfce4-session -+configdir = $(datadir)/examples/xfce4/session - config_DATA = xfce4-session.rc - EXTRA_DIST = \ - BUGS \ diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab index 0b11449f41d..59043a5e889 100644 --- a/x11/xfce4-session/patches/patch-ab +++ b/x11/xfce4-session/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2008/12/19 23:58:18 hira Exp $ +$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:33 reed Exp $ ---- xfce4-tips/Makefile.in.orig 2008-12-20 08:38:59.000000000 +0900 -+++ xfce4-tips/Makefile.in 2008-12-20 08:39:31.000000000 +0900 -@@ -299,7 +299,7 @@ +--- xfce4-tips/Makefile.in.orig 2009-02-25 20:29:50.000000000 +0000 ++++ xfce4-tips/Makefile.in +@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \ xfce4_tips_LDADD = \ @LIBXFCEGUI4_LIBS@ -desktopdir = $(sysconfdir)/xdg/autostart -+desktopdir = $(datadir)/xdg/autostart ++desktopdir = $(datadir)/examples/xfce4/autostart desktop_in_files = xfce4-tips-autostart.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac new file mode 100644 index 00000000000..019de5feb4d --- /dev/null +++ b/x11/xfce4-session/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2009/09/16 01:15:33 reed Exp $ + +--- settings/Makefile.in.orig 2009-02-25 20:29:49.000000000 +0000 ++++ settings/Makefile.in +@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \ + xfce4_session_settings_DEPENDENCIES = \ + $(top_builddir)/libxfsm/libxfsm-4.6.la + +-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + settings_DATA = xfce4-session.xml + desktopdir = $(datadir)/applications + desktop_in_files = xfce-session-settings.desktop.in diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 999a8c8c72f..986f76370df 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,19 +1,22 @@ -# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.11 2009/09/16 01:15:36 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.2.8.3 +XFCE4_VERSION= 0.2.12 DISTNAME= Terminal-${XFCE4_VERSION} PKGNAME= xfce4-terminal-${XFCE4_VERSION} -PKGREVISION= 4 CATEGORIES= x11 COMMENT= Xfce terminal emulator .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST index b4f9f4e7698..01ab162a34c 100644 --- a/x11/xfce4-terminal/PLIST +++ b/x11/xfce4-terminal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:36 reed Exp $ bin/Terminal bin/terminal libexec/TerminalHelp @@ -121,12 +121,12 @@ share/locale/ko/LC_MESSAGES/Terminal.mo share/locale/ku/LC_MESSAGES/Terminal.mo share/locale/lt/LC_MESSAGES/Terminal.mo share/locale/lv/LC_MESSAGES/Terminal.mo -share/locale/nb_NO/LC_MESSAGES/Terminal.mo +share/locale/nb/LC_MESSAGES/Terminal.mo share/locale/nl/LC_MESSAGES/Terminal.mo share/locale/pa/LC_MESSAGES/Terminal.mo share/locale/pl/LC_MESSAGES/Terminal.mo +share/locale/pt/LC_MESSAGES/Terminal.mo share/locale/pt_BR/LC_MESSAGES/Terminal.mo -share/locale/pt_PT/LC_MESSAGES/Terminal.mo share/locale/ro/LC_MESSAGES/Terminal.mo share/locale/ru/LC_MESSAGES/Terminal.mo share/locale/sk/LC_MESSAGES/Terminal.mo diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk index a68c915fc1c..6af90d16431 100644 --- a/x11/xfce4-terminal/buildlink3.mk +++ b/x11/xfce4-terminal/buildlink3.mk @@ -1,19 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-terminal .if !defined(XFCE4_TERMINAL_BUILDLINK3_MK) XFCE4_TERMINAL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.8.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-terminal?= xfce4-terminal>=0.2.8.3nb4 +BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.10 BUILDLINK_PKGSRCDIR.xfce4-terminal?= ../../x11/xfce4-terminal -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-exo/buildlink3.mk" -.include "../../x11/vte/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_TERMINAL_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-terminal diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo index be776013f34..f76b2bfe59d 100644 --- a/x11/xfce4-terminal/distinfo +++ b/x11/xfce4-terminal/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2008/12/17 12:50:04 hira Exp $ +$NetBSD: distinfo,v 1.5 2009/09/16 01:15:36 reed Exp $ -SHA1 (Terminal-0.2.8.3.tar.bz2) = 69add6a7435855ab8bccb82774cacb6a148e7693 -RMD160 (Terminal-0.2.8.3.tar.bz2) = ccb5d5484b2164cac673cd5029d8bbc8793d19d4 -Size (Terminal-0.2.8.3.tar.bz2) = 1860706 bytes +SHA1 (Terminal-0.2.12.tar.bz2) = f6d0fc380fff6ac6fba7842fd4cfc46e2e5c6e40 +RMD160 (Terminal-0.2.12.tar.bz2) = 0879cfbb69d33d63a1a816cf5a67b1c836a5bb65 +Size (Terminal-0.2.12.tar.bz2) = 2005311 bytes diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 4da26520472..6aef2a64997 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:36 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,23 +6,34 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= xfce-utils-${XFCE4_VERSION} PKGNAME= xfce4-utils-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce utilities -PKG_SYSCONFSUBDIR= xdg/xfce4 -EGDIR= ${XFCE4_EGBASE} -CONF_FILES= ${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc -USE_TOOLS+= xinit:run +DEPENDS+= p5-XML-Parser>=2.36:../../textproc/p5-XML-Parser -REQD_DIRS+= ${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --with-xsession-prefix=${PREFIX} BUILD_DEFS+= PKG_SYSCONFBASE +USE_TOOLS+= xinit:run + +PKG_SYSCONFSUBDIR= xdg +EGDIR= ${XFCE4_EGBASE} + +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${EGDIR} ${EGDIR}/autostart +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/it +MAKE_DIRS+= ${PREFIX}/share/xsessions -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} +CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xfce4/xinitrc +CONF_FILES+= ${EGDIR}/autostart/xfconf-migration-4.6.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfconf-migration-4.6.desktop .include "options.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST index ddad204f40a..2563d39250a 100644 --- a/x11/xfce4-utils/PLIST +++ b/x11/xfce4-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2008/12/18 14:09:26 hira Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:36 reed Exp $ bin/startxfce4 bin/xfbrowser4 bin/xfce4-about @@ -7,7 +7,10 @@ bin/xflock4 bin/xfmountdev4 bin/xfrun4 bin/xfterm4 +libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl +share/dbus-1/services/org.xfce.RunDialog.service share/examples/xfce4/Xft.xrdb +share/examples/xfce4/autostart/xfconf-migration-4.6.desktop share/examples/xfce4/xinitrc share/icons/hicolor/48x48/apps/xfce4-logo.png share/locale/af/LC_MESSAGES/xfce-utils.mo @@ -49,16 +52,17 @@ share/locale/lv/LC_MESSAGES/xfce-utils.mo share/locale/mk/LC_MESSAGES/xfce-utils.mo share/locale/mr/LC_MESSAGES/xfce-utils.mo share/locale/ms/LC_MESSAGES/xfce-utils.mo -share/locale/nb_NO/LC_MESSAGES/xfce-utils.mo +share/locale/nb/LC_MESSAGES/xfce-utils.mo share/locale/nl/LC_MESSAGES/xfce-utils.mo share/locale/pa/LC_MESSAGES/xfce-utils.mo share/locale/pl/LC_MESSAGES/xfce-utils.mo +share/locale/pt/LC_MESSAGES/xfce-utils.mo share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo -share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo share/locale/ro/LC_MESSAGES/xfce-utils.mo share/locale/ru/LC_MESSAGES/xfce-utils.mo share/locale/si/LC_MESSAGES/xfce-utils.mo share/locale/sk/LC_MESSAGES/xfce-utils.mo +share/locale/sq/LC_MESSAGES/xfce-utils.mo share/locale/sv/LC_MESSAGES/xfce-utils.mo share/locale/ta/LC_MESSAGES/xfce-utils.mo share/locale/tr/LC_MESSAGES/xfce-utils.mo @@ -73,6 +77,7 @@ share/xfce4/COPYING share/xfce4/GPL share/xfce4/INFO share/xfce4/INFO.ca +share/xfce4/INFO.de share/xfce4/INFO.es share/xfce4/INFO.fi share/xfce4/INFO.fr @@ -103,3 +108,4 @@ share/xfce4/doc/it/index.html share/xfce4/doc/xfce-chunk.css share/xfce4/doc/xfce-mouse.png share/xfce4/doc/xfce.css +share/xsessions/xfce.desktop diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index 4fe7ef7940e..52a0601f0c1 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,18 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.27 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-utils .if !defined(XFCE4_UTILS_BUILDLINK3_MK) XFCE4_UTILS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-utils?= xfce4-utils>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_UTILS_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-utils diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo index c977d2cce4c..dc319a11a57 100644 --- a/x11/xfce4-utils/distinfo +++ b/x11/xfce4-utils/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:04 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:36 reed Exp $ -SHA1 (xfce-utils-4.4.3.tar.bz2) = 71290af79f63bb2511d27b0313ec4cd7bc4a81b4 -RMD160 (xfce-utils-4.4.3.tar.bz2) = 62c337cdd40aebe58abca4689a444ab3b5b3e1e6 -Size (xfce-utils-4.4.3.tar.bz2) = 644408 bytes -SHA1 (patch-aa) = aff3c61c25944ae7e106cecc9e22a4f2f230741f +SHA1 (xfce-utils-4.6.1.tar.bz2) = 0bdb5b6e494f15372d8c0826ac93baca476c9f16 +RMD160 (xfce-utils-4.6.1.tar.bz2) = 4446c3882716e841c00e398df62b9d54046b9d26 +Size (xfce-utils-4.6.1.tar.bz2) = 614143 bytes +SHA1 (patch-aa) = 0bcfc2173ddb61d8ee04260fb99d57cd7f0704ba diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa index a9a1a87e175..221c9fa330d 100644 --- a/x11/xfce4-utils/patches/patch-aa +++ b/x11/xfce4-utils/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:32 martti Exp $ +$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:36 reed Exp $ ---- scripts/Makefile.in.orig 2007-12-04 10:55:10.000000000 +0000 -+++ scripts/Makefile.in 2007-12-04 10:55:21.000000000 +0000 -@@ -240,7 +240,7 @@ - -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \ - -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g' +--- scripts/Makefile.in.orig 2009-02-25 22:27:44.000000000 +0000 ++++ scripts/Makefile.in +@@ -268,7 +268,7 @@ edit = sed \ + -e "s,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g" \ + -e "s,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g" -conffilesdir = @sysconfdir@/xdg/xfce4 +conffilesdir = @datadir@/examples/xfce4 conffiles_DATA = \ xinitrc \ Xft.xrdb +@@ -276,7 +276,7 @@ conffiles_DATA = \ + @XFCONF_MIGRATION_TRUE@migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration + @XFCONF_MIGRATION_TRUE@migrationscript_in_files = xfconf-migration-4.6.pl.in + @XFCONF_MIGRATION_TRUE@migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl) +-@XFCONF_MIGRATION_TRUE@autostartdir = $(sysconfdir)/xdg/autostart ++@XFCONF_MIGRATION_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart + @XFCONF_MIGRATION_TRUE@autostart_in_files = xfconf-migration-4.6.desktop.in + @XFCONF_MIGRATION_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ |