Skip to content

Commit

Permalink
Upgrading Xfce to 4.6.1.
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
reed committed Sep 16, 2009
1 parent 950910e commit adc2062
Show file tree
Hide file tree
Showing 93 changed files with 1,070 additions and 870 deletions.
13 changes: 10 additions & 3 deletions audio/xfce4-mixer/Makefile
Original file line number Diff line number Diff line change
@@ -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"
86 changes: 51 additions & 35 deletions audio/xfce4-mixer/PLIST
Original file line number Diff line number Diff line change
@@ -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
10 changes: 2 additions & 8 deletions audio/xfce4-mixer/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions audio/xfce4-mixer/distinfo
Original file line number Diff line number Diff line change
@@ -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
17 changes: 10 additions & 7 deletions devel/xfce4-dev-tools/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
# $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

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"
2 changes: 1 addition & 1 deletion devel/xfce4-dev-tools/PLIST
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions devel/xfce4-dev-tools/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions devel/xfce4-dev-tools/distinfo
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions editors/xfce4-mousepad/Makefile
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 3 additions & 4 deletions editors/xfce4-mousepad/PLIST
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -30,21 +31,19 @@ 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
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
Expand Down
8 changes: 2 additions & 6 deletions editors/xfce4-mousepad/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions editors/xfce4-mousepad/distinfo
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions graphics/xfce4-icon-theme/Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 3 additions & 1 deletion graphics/xfce4-icon-theme/PLIST
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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}
4 changes: 1 addition & 3 deletions graphics/xfce4-icon-theme/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# $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

.if !defined(XFCE4_ICON_THEME_BUILDLINK3_MK)
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"
Expand Down
5 changes: 3 additions & 2 deletions meta-pkgs/xfce4/Makefile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"

Expand Down
Loading

0 comments on commit adc2062

Please sign in to comment.