diff options
| author | reed <reed@pkgsrc.org> | 2009-09-16 01:15:32 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2009-09-16 01:15:32 +0000 |
| commit | aab221b8a2ffe57848ed2c6cbd15e44fb5195fd7 (patch) | |
| tree | 0c5ff254424640857c1e834eb6a64837b8b09958 /x11/xfce4-session/Makefile | |
| parent | 7f8c2a89d7cc0135b818046c95f0021b71add4a9 (diff) | |
| download | pkgsrc-aab221b8a2ffe57848ed2c6cbd15e44fb5195fd7.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.)
Diffstat (limited to 'x11/xfce4-session/Makefile')
| -rw-r--r-- | x11/xfce4-session/Makefile | 44 |
1 files changed, 29 insertions, 15 deletions
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" |