Skip to content

Commit

Permalink
Framework: partially sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed May 10, 2016
1 parent 3cfcccf commit e842122
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 12 deletions.
1 change: 1 addition & 0 deletions GIDs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ agk:*:172:
polipo:*:173:
flowtools:*:174:
twms:*:175:
mlvpn:*:176:
gdnsd:*:179:
rt:*:180:
nagios:*:181:
Expand Down
1 change: 0 additions & 1 deletion LEGAL
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries
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
jpgraph-2.* graphics/jpgraph2 The free version cannot be used in a commercial context
jre-7*-i586.tar.gz java/linux-sun-jre17 License does not allow distribution with fee
jre-8*-i586.tar.gz java/linux-oracle-jre18 License does not allow distribution with fee
jta-*.zip java/jta See the license
komodo-* editors/komodo-edit Distribution not permitted
Expand Down
4 changes: 4 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -8310,3 +8310,7 @@ www/sogo-activesync|www/sogo2-activesync|2016-05-02|Renamed to www/sogo2-actives
textproc/rubygem-gherkin3|textproc/rubygem-gherkin|2016-05-03|Has expired: Use textproc/rubygem-gherkin instead
dns/odsclient||2016-05-03|Has expired: ODS shuts service down, so client is probably useless
games/Cockatrice|games/cockatrice|2016-05-05|Renamed to games/cockatrice
graphics/py-opengl|graphics/py-PyOpenGL|2016-05-09|Use correct upstream PyPI name
graphics/py-opengl-accelerate|graphics/py-PyOpenGL-accelerate|2016-05-09|Use correct upstream PyPI name
java/linux-sun-jre17||2016-05-09|Has expired: Unsupported and known for multiple security vulnerabilities
deskutils/gnustep-notebook||2016-05-09|Has expired: Does not fetch
23 changes: 13 additions & 10 deletions Mk/Scripts/qa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,19 @@ libperl() {
;;
*0)
has_some_libperl_so=1
case "${found}" in
*1?)
warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
;;
esac
case "${found}" in
1??)
warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
;;
esac
# Older Perl did not USE_LDCONFIG.
if [ ! -f ${LOCALBASE}/${LDCONFIG_DIR}/perl5 ]; then
case "${found}" in
*1?)
warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
;;
esac
case "${found}" in
1??)
warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
;;
esac
fi
;;
esac
# Use heredoc to avoid losing rc from find|while subshell
Expand Down
6 changes: 5 additions & 1 deletion Mk/Uses/perl5.mk
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ THIS_IS_OLD_PERL= yes
.include "${PORTSDIR}/lang/perl5.20/version.mk"
.elif ${PERL5_DEFAULT} == 5.22
.include "${PORTSDIR}/lang/perl5.22/version.mk"
.elif ${PERL5_DEFAULT} == 5.24
.include "${PORTSDIR}/lang/perl5.24/version.mk"
.elif ${PERL5_DEFAULT} == devel
.include "${PORTSDIR}/lang/perl5-devel/version.mk"
# Force PERL_PORT here in case two identical PERL_VERSION.
Expand Down Expand Up @@ -92,7 +94,9 @@ PERL_ARCH?= mach
# perl5_default file, or up there in the default versions selection.
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
.if ${PERL_LEVEL} >= 502200
.if ${PERL_LEVEL} >= 502400
PERL_PORT?= perl5.24
.elif ${PERL_LEVEL} >= 502200
PERL_PORT?= perl5.22
.elif ${PERL_LEVEL} >= 502000
PERL_PORT?= perl5.20
Expand Down
1 change: 1 addition & 0 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \
LOCALBASE=${LOCALBASE} \
"STRIP=${STRIP}" \
TMPPLIST=${TMPPLIST} \
LDCONFIG_DIR="${LDCONFIG_DIR}" \
PKGBASE=${PKGBASE}
.if !empty(USES:Mdesktop-file-utils)
QA_ENV+= USESDESKTOPFILEUTILS=yes
Expand Down
1 change: 1 addition & 0 deletions UIDs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ agk:*:172:172::0:0:AquaGateKeeper:/nonexistent:/nonexistent
polipo:*:173:173::0:0:polipo web cache:/nonexistent:/usr/sbin/nologin
flowtools:*:174:174::0:0:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin
twms:*:175:175::0:0:tWMS pseudo-user:/nonexistent:/usr/sbin/nologin
mlvpn:*:176:176::0:0:mlVPN pseudo-user:/var/run/mlvpn:/usr/sbin/nologin
gdnsd:*:179:179::0:0:gDNSd pseudo-user:/nonexistent:/usr/sbin/nologin
nagios:*:181:181::0:0:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin
noc:*:182:182::0:0:NOC pseudo-user:/usr/local/noc:/bin/sh
Expand Down
11 changes: 11 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ 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.

20160510:
AFFECTS: Users of biology/seqan
AUTHOR: [email protected]

The biology/seqan port has been split into biology/seqan (only the
library) and biology/seqan-apps for the programs based on SeqAn. Both
ports are based on version 2.1.1 of the SeqAn repository. There is a new
biology/seqan1 port with version 1.3 of SeqAn for backwards compatibility,
but this port will likely be deprecated in the next year so please update
your software to SeqAn2.

20160505:
AFFECTS: Users of www/node
AUTHOR: [email protected]
Expand Down

0 comments on commit e842122

Please sign in to comment.