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 | 381733f2969470face57649b98e3ab7a0fac5d0a (patch) | |
| tree | 0c5ff254424640857c1e834eb6a64837b8b09958 /x11/xfce4-panel/Makefile | |
| parent | 53c4d3afd4f2a6f5e4a7ca38bbc2cca4bfc4657f (diff) | |
| download | pkgsrc-381733f2969470face57649b98e3ab7a0fac5d0a.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-panel/Makefile')
| -rw-r--r-- | x11/xfce4-panel/Makefile | 47 |
1 files changed, 22 insertions, 25 deletions
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" |