diff options
| author | avilla <avilla@FreeBSD.org> | 2012-02-24 21:34:28 +0800 |
|---|---|---|
| committer | avilla <avilla@FreeBSD.org> | 2012-02-24 21:34:28 +0800 |
| commit | 12d2462c867211f423cf13748456f3aa7581521b (patch) | |
| tree | 75dd7f84706585ff348f38ee847256ac9a363ddb | |
| parent | 6e92c3022b6850929b06b6cca691f5063bb869e4 (diff) | |
| download | freebsd-ports-gnome-12d2462c867211f423cf13748456f3aa7581521b.tar.gz freebsd-ports-gnome-12d2462c867211f423cf13748456f3aa7581521b.tar.zst freebsd-ports-gnome-12d2462c867211f423cf13748456f3aa7581521b.zip | |
- Rollback to previous version, it appears to be not yet ready.
Reported by: portsnap buildbox via cperciva
| -rw-r--r-- | Mk/bsd.kde4.mk | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 54a90afe0c8a..4c534c069c14 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -86,17 +86,6 @@ _USE_KDE4_ALL= akonadi automoc4 baseapps kdebase kdehier kdelibs kdeprefix \ oxygen pimlibs pimruntime pykde4 pykdeuic4 runtime \ sharedmime workspace -# We need to set it here (and not at the bottom) because PREFIX and -# NO_MTREE have to be defined in pre-makefile section. -.if ${USE_KDE4:Mkdeprefix} != "" -. if ${.MAKEFLAGS:MPREFIX=*} == "" -PREFIX= ${KDE4_PREFIX} -. if ${KDE4_PREFIX} != ${LOCALBASE} -NO_MTREE= yes -. endif -. endif -.endif - akonadi_LIB_DEPENDS= akonadiprotocolinternals.1:${PORTSDIR}/databases/akonadi automoc4_BUILD_DEPENDS= ${LOCALBASE}/bin/automoc4:${PORTSDIR}/devel/automoc4 @@ -108,6 +97,8 @@ kdehier_RUN_DEPENDS= kdehier4>=1:${PORTSDIR}/misc/kdehier4 kdelibs_LIB_DEPENDS= kimproxy.5:${PORTSDIR}/x11/kdelibs4 +kdeprefix_PREFIX= ${KDE4_PREFIX} + oxygen_RUN_DEPENDS= ${KDE4_PREFIX}/share/icons/oxygen/index.theme:${PORTSDIR}/x11-themes/kde4-icons-oxygen pimlibs_LIB_DEPENDS= kpimutils.5:${PORTSDIR}/deskutils/kdepimlibs4 @@ -173,6 +164,14 @@ Kde_Post_Include= bsd.kde4.mk BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} LIB_DEPENDS+= ${${component}_LIB_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} +. if defined(${component}_PREFIX) +. if ${.MAKEFLAGS:MPREFIX=*}=="" +PREFIX= ${${component}_PREFIX} +. if ${KDE4_PREFIX} != ${LOCALBASE} +NO_MTREE= yes +. endif +. endif +. endif . else IGNORE= cannot install: Unknown component ${component} . endif |