Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Apr 25, 2016
1 parent 4976c16 commit 06b959c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
1 change: 0 additions & 1 deletion LEGAL
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ javax_comm-*-solsparc.* comms/java-commapi No commercial use
jdk-6*-apidocs.zip java/jdk16-doc This documentation is under license and export control
jdk-7*-apidocs.zip java/jdk7-doc This documentation is under license and export control
jdk-8*-apidocs.zip java/jdk8-doc This documentation is under license and export control
jdk-7*-i586.tar.gz java/linux-sun-jdk17 Redistribution of repackaged binaries not permitted
jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries not permitted
jfbuild-* games/jfsw Must be distributed only through the Internet and free of charge
jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted
Expand Down
2 changes: 2 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -8302,3 +8302,5 @@ www/download-gemist||2016-04-23|Has expired: Broken for more than 6 months
databases/p5-qdbm||2016-04-23|Has expired: Broken for more than 6 months
comms/libfec||2016-04-23|Has expired: Broken for more than 6 months
deskutils/ladon||2016-04-23|Has expired: Broken for more than 6 months
java/linux-sun-jdk17||2016-04-24|Has expired: Unsupported and known for multiple security vulnerabilities
devel/compiler-rt-devel|devel/llvm-devel|2016-04-24|Folded back in to devel/llvm-devel
2 changes: 1 addition & 1 deletion Mk/Uses/pkgconfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.if !defined(_INCLUDE_USES_PKGCONFIG_MK)
_INCLUDE_USES_PKGCONFIG_MK= yes

_PKGCONFIG_DEPENDS= pkgconf:devel/pkgconf
_PKGCONFIG_DEPENDS= pkgconf>=0.9.10:devel/pkgconf

.if empty(pkgconfig_ARGS)
pkgconfig_ARGS= build
Expand Down
3 changes: 0 additions & 3 deletions Mk/bsd.java.mk
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/
VERSION=1.7.0 OS=native VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \
VERSION=1.8.0 OS=native VENDOR=openjdk
_JAVA_PORT_LINUX_SUN_JDK_1_7_INFO= PORT=java/linux-sun-jdk17 HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \
VERSION=1.7.0 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
VERSION=1.8.0 OS=linux VENDOR=oracle

Expand All @@ -190,7 +188,6 @@ _JAVA_OS_linux= Linux
__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \
JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
JAVA_PORT_LINUX_SUN_JDK_1_7 \
JAVA_PORT_LINUX_ORACLE_JDK_1_8
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
${__JAVA_PORTS_ALL}
Expand Down
11 changes: 10 additions & 1 deletion UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20160414:
AFFECTS: Users of net-mgmt/icinga2
AUTHOR: [email protected]

The creation of Icinga2 directories and files in /var is now controlled
by the /etc/rc.conf variable icinga2_mkvar. Earlier ports always
created the /var entries, but could slow startup significantly when /var
was a normal disk rather than a RAM disk. icinga2_mkvar defaults to
"NO".

20160415:
AFFECTS: users of audio/chromaprint
AUTHOR: [email protected]
Expand All @@ -31,7 +41,6 @@ you update your ports collection, before attempting any port upgrades.
ttrssd_local_db="NO"
in your /etc/rc.conf .


20160414:
AFFECTS: Users of graphics/kipi-plugin-googledrive and graphics/kipi-plugin-picasaweb
AUTHOR: [email protected]
Expand Down

0 comments on commit 06b959c

Please sign in to comment.