diff options
| author | makc <makc@FreeBSD.org> | 2010-05-24 15:01:57 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2010-05-24 15:01:57 +0800 |
| commit | d6ed4857e9a09ab002c27c3873c301ab92bc0a35 (patch) | |
| tree | 84174aa2dadff2f96e6be28b1f1b006614bbaed2 /x11 | |
| parent | 258ff89b3df6fa0749b55d5f94891b227177448a (diff) | |
| download | freebsd-ports-gnome-d6ed4857e9a09ab002c27c3873c301ab92bc0a35.tar.gz freebsd-ports-gnome-d6ed4857e9a09ab002c27c3873c301ab92bc0a35.tar.zst freebsd-ports-gnome-d6ed4857e9a09ab002c27c3873c301ab92bc0a35.zip | |
depend on fullpath to libssh to avoid interference with ssh.4 from compat7x
Reported by: Yuri Pankov <yuri.pankov at gmail.com> via kde@freebsd maillist
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde4-runtime/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase4-runtime/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index ff8cbd4a0b49..d04900015bc4 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 0 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -21,6 +20,8 @@ LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp \ attica.0:${PORTSDIR}/x11-toolkits/attica \ ssh.4:${PORTSDIR}/security/libssh +#explicitly depend on libssh to avoid interference with ssh.4 from compat7x +BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs KDE4_BUILDENV= yes diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index ff8cbd4a0b49..d04900015bc4 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 0 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -21,6 +20,8 @@ LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp \ attica.0:${PORTSDIR}/x11-toolkits/attica \ ssh.4:${PORTSDIR}/security/libssh +#explicitly depend on libssh to avoid interference with ssh.4 from compat7x +BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs KDE4_BUILDENV= yes |