Framework: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2016-01-31 10:04:14 +01:00
parent 3a1f3c5c5a
commit a8bec35df7
4 changed files with 12 additions and 11 deletions

8
MOVED
View file

@ -5644,7 +5644,6 @@ print/abntex||2014-03-10|Has expired: No more public distfiles
sysutils/monkeytail||2014-03-10|Has expired: No more public distfiles
dns/dns_mre||2014-03-10|Has expired: No more public distfiles
japanese/libjcode||2014-03-10|Has expired: No more public distfiles
sysutils/jailutils||2014-03-10|Has expired: No more public distfiles
net/freeswitch-vanilla-devel||2014-03-10|Has expired: No more public distfiles
sysutils/hdup||2014-03-10|Has expired: No more public distfiles
x11/settitle||2014-03-10|Has expired: No more public distfiles
@ -8098,7 +8097,7 @@ devel/e_dbus||2016-01-15|Has expired: Not used anymore by x11-wm/enlightenment
www/xpi-locale-switcher||2016-01-15|Has expired: incompatible with Firefox 34 (and later presumably)
textproc/py-gettext|textproc/py-python-gettext|2016-01-16|Renamed to match upstream name
archivers/jzip.org||2016-01-24|Has expired: Abandoned, outdated (no updates since 2003)
devel/i386-linux-binutils||2026-01-26|Not any usage in the ports tree
devel/i386-linux-binutils||2016-01-26|Not any usage in the ports tree
databases/mywwwatcher||2016-01-25|Has expired: PHP 5.4 EOL reached
databases/php5-creole||2016-01-25|Has expired: PHP 5.4 EOL reached
databases/php5-propel||2016-01-25|Has expired: PHP 5.4 EOL reached
@ -8118,4 +8117,7 @@ www/fusionpbx||2016-01-25|Has expired: PHP 5.4 EOL reached
www/jawstats||2016-01-25|Has expired: PHP 5.4 EOL reached
www/ojs2||2016-01-25|Has expired: PHP 5.4 EOL reached
www/webcalendar||2016-01-25|Has expired: PHP 5.4 EOL reached
devel/py-msgpack|devel/py-msgpack-python|2015-01-28|Renamed to match upstream naming
devel/py-msgpack|devel/py-msgpack-python|2016-01-28|Renamed to match upstream naming
www/xpi-bookmarkdd||2016-01-30|Has expired, incompatible with Firefox 34+
databases/php5-redis||2016-01-30|Has expired: PHP 5.4 EOL reached, use databases/php55-redis or databases/php56-redis instead
audio/linux-c6-pulseaudio-libs-glib2||2016-01-31|Integrated into audio/linux-c6-pulseaudio-libs

View file

@ -321,6 +321,7 @@ libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-libogg
libpciaccess_c6_FILE= ${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1
libpciaccess_c6_64_FILE= ${LINUXBASE}/usr/lib64/libpciaccess.so.0.11.1
libpciaccess_DETECT= ${libpciaccess${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libpciaccess_PORT= ${PORTSDIR}/devel/linux${LINUX_BASEPORT_NAME}-libpciaccess
@ -387,8 +388,8 @@ naslibs_PORT= ${PORTSDIR}/audio/linux${LINUX_BASEPORT_NAME}-nas-libs
naslibs_DEPENDS= xorglibs
openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.10.2
openldap_c6_64_FILE= ${LINUXBASE}/lib64/libldap-2.4.so.2.10.2
openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.10.3
openldap_c6_64_FILE= ${LINUXBASE}/lib64/libldap-2.4.so.2.10.3
openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
openldap_PORT= ${PORTSDIR}/net/linux${LINUX_BASEPORT_NAME}-openldap

View file

@ -11,7 +11,7 @@
# Valid values for "fedora": all version numbers
# e.g. 10 for fedora 10
# Valid values for "centos": all version numbers
# e.g. 6.6 for centos 6.6
# e.g. 6.7 for centos 6.7
# This is used to set MASTER_SITE_{,SRC_}SUBDIR
# if it isn't already set.
# MASTER_SITE_SRC_SUBDIR
@ -63,7 +63,7 @@ LINUX_DIST= fedora
LINUX_DIST_VER= 10
.else # default to CentOS
LINUX_DIST= centos
LINUX_DIST_VER= 6.6
LINUX_DIST_VER= 6.7
.endif
.if defined(LINUX_DIST)
@ -162,7 +162,7 @@ PLIST?= ${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
_LINUX_BASE_SUFFIX= f10
. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes"
_LINUX_BASE_SUFFIX= c6
. elif ${USE_LINUX} == "c6_64
. elif ${USE_LINUX} == "c6_64"
_LINUX_BASE_SUFFIX= c6
. else
# other linux_base ports do not provide a pkg-plist file

View file

@ -1742,9 +1742,7 @@ STRIP_CMD= ${TRUE}
# Allow the user to specify another linux_base version.
. if defined(OVERRIDE_LINUX_BASE_PORT)
. if ${USE_LINUX:tl} == yes
USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT}
. elif ${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
. if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64")
USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT}
. endif
. endif