diff options
author | nox <nox@FreeBSD.org> | 2009-07-04 04:58:54 +0800 |
---|---|---|
committer | nox <nox@FreeBSD.org> | 2009-07-04 04:58:54 +0800 |
commit | 1b94c42dc13225e5b7e79086d1a2032e9b33dd7c (patch) | |
tree | 5cb90a9551b36c2eeb6263eddd2420794b155f8e /Mk | |
parent | cbad2a89435e20564ebe18f56426b637a9857272 (diff) | |
download | freebsd-ports-gnome-1b94c42dc13225e5b7e79086d1a2032e9b33dd7c.tar.gz freebsd-ports-gnome-1b94c42dc13225e5b7e79086d1a2032e9b33dd7c.tar.zst freebsd-ports-gnome-1b94c42dc13225e5b7e79086d1a2032e9b33dd7c.zip |
- Add the new security/linux-f10-cyrus-sasl2 and net/linux-f10-openldap
infrastructure ports to Mk/bsd.linux-apps.mk and add missing
dependecies on these to the ftp/linux-f10-curl port. (They are
needed for www/linux-f10-flashplugin10 to be committed next.)
- Bump ftp/linux-f10-curl PORTREVISION
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.linux-apps.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk index 0df4d60332e0..7245e9ab7b8d 100644 --- a/Mk/bsd.linux-apps.mk +++ b/Mk/bsd.linux-apps.mk @@ -70,7 +70,8 @@ _LINUX_APPS_ALL= allegro alsalib arts aspell atk cairo curl dri esound expat fon _LINUX_APPS_ALL+= # 2.6.16 components -_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84 +_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \ + sqlite3 tcl84 tk84 _LINUX_APPS_ALL+= ${_LINUX_26_APPS} @@ -136,6 +137,14 @@ curl_f8_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.0 curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1 curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE} curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl +. if ${LINUX_DIST_SUFFIX} == "-f10" +curl_DEPENDS= cyrus-sasl2 openldap +. endif + +# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE +cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22 +cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2 dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1 dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1 @@ -307,6 +316,11 @@ mikmod_f10_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0 mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE} mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod +# no openldap_FILE, openldap_f8_FILE +openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0 +openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap + openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3 openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2 openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3 |