diff options
161 files changed, 22 insertions, 5546 deletions
@@ -9209,3 +9209,25 @@ textproc/kibana50|textproc/kibana5|2017-04-05|Rename port to match the rest of t textproc/kibana50-x-pack|textproc/kibana5-x-pack|2017-04-05|Rename port to match the rest of the 5.X line of the elastic stack www/typo3|www/typo3-8|2017-04-08|Rename to coexist with TYPO3 7.x (was typo3-lts) since both versions are LTS now www/typo3-lts|www/typo3-7|2017-04-08|Rename to coexist with TYPO3 8.x (was typo3) since both versions are LTS now +sysutils/puppet38|sysutils/puppet4|2017-04-10|Has expired: Upstream support ended, see http://tinyurl.com/puppet3eol +editors/libreoffice4|editors/libreoffice|2017-04-10|Has expired: Deprecated by upstream +databases/rubygem-redis-actionpack4|databases/rubygem-redis-actionpack|2017-04-10|Has expired: Use databases/rubygem-redis-actionpack instead +devel/rubygem-nio4r1|devel/rubygem-nio4r|2017-04-10|Has expired: Use devel/rubygem-nio4r instead +devel/liborcus07|devel/liborcus|2017-04-10|Has expired: Deprecated by upstream, use devel/liborcus +devel/mdds0|devel/mdds|2017-04-10|Has expired: Deprecated by upstream, use devel/mdds +security/openvpn23-polarssl||2017-04-10|Has expired: Replaced by new upstream relesae 2.4.x +security/openvpn23|security/openvpn|2017-04-10|Has expired: Replaced by new upstream relesae 2.4.x +textproc/p5-XML-XSH||2017-04-10|Has expired: Deprecated by upstream +www/rubygem-jquery-atwho-rails-rails4|www/rubygem-jquery-atwho-rails|2017-04-10|Has expired: Use www/rubygem-jquery-atwho-rails instead +www/p5-Catalyst-Plugin-Singleton||2017-04-10|Has expired: Deprecated by upstream +x11/lumina-i18n||2017-04-10|Has expired: Obsolete, i18n files included in x11/lumina +sysutils/jail2||2017-04-10|Has expired: Starting with 10.0 functionality has been merged into base. +sysutils/iocage-devel||2017-04-10|Has expired: Outdated version. Please use sysutils/py-iocage instead +sysutils/iocage||2017-04-10|Has expired: Outdated version. Please use sysutils/py-iocage instead +databases/puppetdb||2017-04-10|Has expired: Depends on expired sysutils/puppet38, use puppetdb[34] instead +databases/puppetdb-terminus||2017-04-10|Has expired: Depends on expired sysutils/puppet38, use puppetdb-terminus[34] +databases/pglesslog||2017-04-10|Has expired: Does not build with recent PostgreSQL versions +textproc/go-text||2017-04-10|Has expired: Go libraries should not be packaged +devel/go-pretty||2017-04-10|Has expired: Go libraries should not be packaged +databases/godis||2017-04-10|Has expired: Go libraries should not be packaged +www/moodle29|www/moodle32|2017-04-10|Has expired: Upstream support EoL, please migrate to moodle32 diff --git a/databases/Makefile b/databases/Makefile index eecae21f32ee..90aca35b76c9 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -95,7 +95,6 @@ SUBDIR += glom SUBDIR += gnats4 SUBDIR += gnatsweb4 - SUBDIR += godis SUBDIR += gomdb SUBDIR += gosqlite3 SUBDIR += gqlplus @@ -572,7 +571,6 @@ SUBDIR += pgdbf SUBDIR += pgespresso SUBDIR += pgfouine - SUBDIR += pglesslog SUBDIR += pgloader SUBDIR += pglogical SUBDIR += pgmodeler @@ -708,8 +706,6 @@ SUBDIR += proftpd-mod_sql_postgres SUBDIR += proftpd-mod_sql_sqlite SUBDIR += proftpd-mod_sql_tds - SUBDIR += puppetdb - SUBDIR += puppetdb-terminus SUBDIR += puppetdb-terminus3 SUBDIR += puppetdb-terminus4 SUBDIR += puppetdb3 @@ -925,7 +921,6 @@ SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack - SUBDIR += rubygem-redis-actionpack4 SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 diff --git a/databases/godis/Makefile b/databases/godis/Makefile deleted file mode 100644 index fcb8161ec381..000000000000 --- a/databases/godis/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Grzegorz Blach <gblach@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= godis -PORTVERSION= 20120405 -PORTREVISION= 1 -CATEGORIES= databases -MASTER_SITES= LOCAL/jlaffaye - -MAINTAINER= ports@FreeBSD.org -COMMENT= Redis client library written in Go - -USES= go -GO_PKGNAME= github.com/simonz05/${PORTNAME} - -DEPRECATED= Go libraries should not be packaged -EXPIRATION_DATE= 2017-04-08 - -pre-install: - @${RM} ${WRKSRC}/fmt.sh - -.include <bsd.port.mk> diff --git a/databases/godis/distinfo b/databases/godis/distinfo deleted file mode 100644 index 3a16816c0db6..000000000000 --- a/databases/godis/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (godis-20120405.tar.gz) = 5be02502b07386085ac4ba6d92b749a7829fd694ad8bfee0d15b0960074b44b2 -SIZE (godis-20120405.tar.gz) = 17712 diff --git a/databases/godis/pkg-descr b/databases/godis/pkg-descr deleted file mode 100644 index b5396f24c623..000000000000 --- a/databases/godis/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Redis client for Go. It supports all Redis commands and common features such -as pipelines and pubsub. - -WWW: https://github.com/simonz05/godis diff --git a/databases/godis/pkg-plist b/databases/godis/pkg-plist deleted file mode 100644 index b24bde9c5087..000000000000 --- a/databases/godis/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -%%GO_LIBDIR%%/%%GO_PKGNAME%%.a -%%GO_SRCDIR%%/%%GO_PKGNAME%%/LICENSE -%%GO_SRCDIR%%/%%GO_PKGNAME%%/commands.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/commands_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/conn.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example/.gitignore -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example/Makefile -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example/list.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example/string.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example/transaction.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/godis.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/godis_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/pool_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/readme.md diff --git a/databases/pglesslog/Makefile b/databases/pglesslog/Makefile deleted file mode 100644 index 0d67fd208c1a..000000000000 --- a/databases/pglesslog/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $FreeBSD$ - -PORTNAME= pglesslog -PORTVERSION= 1.4.2 -CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/2718/ -DISTNAME= pg_lesslog_${PORTVERSION}_pg90_beta - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= Reduce size of PostgreSQL archive log files by replacing backup blocks - -USES= gmake pgsql:9.0 -WANT_PGSQL= server:build -WRKSRC= ${WRKDIR}/pg_lesslog_${PORTVERSION}_pg90 - -DEPRECATED= Does not build with recent PostgreSQL versions -EXPIRATION_DATE= 2017-04-08 - -PGSQL_PORT= databases/postgresql${PGSQL_VER:S,.,,} -PGSQL_SRCDIR= `cd ${PORTSDIR}/${PGSQL_PORT}-server; ${MAKE} -VWRKSRC` - -pre-build: - ${REINPLACE_CMD} "s|top_builddir = ../..|top_builddir = ${PGSQL_SRCDIR}|" ${WRKSRC}/Makefile.* - -post-build: - ${STRIP_CMD} ${WRKSRC}/pg_compresslog ${WRKSRC}/pg_decompresslog - -.include <bsd.port.mk> diff --git a/databases/pglesslog/distinfo b/databases/pglesslog/distinfo deleted file mode 100644 index 654e0bfd0457..000000000000 --- a/databases/pglesslog/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pg_lesslog_1.4.2_pg90_beta.tar.gz) = 6fa01dc73ad887964ccf1369713e0e300d3077f1a7273ee1d52e4c2351a184da -SIZE (pg_lesslog_1.4.2_pg90_beta.tar.gz) = 44509 diff --git a/databases/pglesslog/pkg-descr b/databases/pglesslog/pkg-descr deleted file mode 100644 index 839c093c69a1..000000000000 --- a/databases/pglesslog/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This project aims to reduce the size of archive log files by replacing -backup blocks (full page writes) marked as "removable" (introduced in -8.3) with corresponding incremental logs. - -WWW: http://pglesslog.projects.postgresql.org/ diff --git a/databases/pglesslog/pkg-plist b/databases/pglesslog/pkg-plist deleted file mode 100644 index 43b8a0007bd5..000000000000 --- a/databases/pglesslog/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/pg_compresslog -bin/pg_decompresslog -share/doc/postgresql/contrib/README.lesslog diff --git a/databases/puppetdb-terminus/Makefile b/databases/puppetdb-terminus/Makefile deleted file mode 100644 index 6bcab4f1cde0..000000000000 --- a/databases/puppetdb-terminus/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= puppetdb-terminus -PORTVERSION= 2.3.4 -PORTREVISION= 1 -CATEGORIES= databases ruby -MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ -DISTNAME= puppetdb-${PORTVERSION} - -MAINTAINER= freebsd@geoffgarside.co.uk -COMMENT= PuppetDB storeconfigs backend terminus module - -DEPRECATED= Depends on expired sysutils/puppet38, use puppetdb-terminus[34] -EXPIRATION_DATE=2017-04-05 - -LICENSE= APACHE20 - -BUILD_DEPENDS= puppet38>=0:sysutils/puppet38 - -CONFLICTS_INSTALL= puppetdb-terminus3-* puppetdb-terminus4-* -USE_RUBY= yes -NO_BUILD= yes - -do-install: - ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet - (cd ${WRKSRC}/ext/master/lib/puppet && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${RUBY_SITELIBDIR}/puppet) - -.include <bsd.port.mk> diff --git a/databases/puppetdb-terminus/distinfo b/databases/puppetdb-terminus/distinfo deleted file mode 100644 index 87821da7338c..000000000000 --- a/databases/puppetdb-terminus/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (puppetdb-2.3.4.tar.gz) = bb48d7b8b26a54f814a8d35019392fc1414375080592884af1734ad72a594630 -SIZE (puppetdb-2.3.4.tar.gz) = 23814293 diff --git a/databases/puppetdb-terminus/pkg-descr b/databases/puppetdb-terminus/pkg-descr deleted file mode 100644 index 82720763fd9c..000000000000 --- a/databases/puppetdb-terminus/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -The PuppetDB storeconfigs backend terminus module. - -WWW: https://docs.puppetlabs.com/puppetdb/latest/ diff --git a/databases/puppetdb-terminus/pkg-plist b/databases/puppetdb-terminus/pkg-plist deleted file mode 100644 index c27b6faa0821..000000000000 --- a/databases/puppetdb-terminus/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -%%RUBY_SITELIBDIR%%/puppet/application/storeconfigs.rb -%%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb -%%RUBY_SITELIBDIR%%/puppet/face/node/status.rb -%%RUBY_SITELIBDIR%%/puppet/face/storeconfigs.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/blacklist.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb diff --git a/databases/puppetdb/Makefile b/databases/puppetdb/Makefile deleted file mode 100644 index 765f5f360ca2..000000000000 --- a/databases/puppetdb/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# $FreeBSD$ - -PORTNAME= puppetdb -PORTVERSION= 2.3.8 -PORTREVISION= 2 -CATEGORIES= databases java -MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ - -MAINTAINER= freebsd@zleslie.info -COMMENT= PuppetDB storeconfigs backend - -DEPRECATED= Depends on expired sysutils/puppet38, use puppetdb[34] instead -EXPIRATION_DATE=2017-04-05 - -LICENSE= APACHE20 - -RUN_DEPENDS= bash:shells/bash \ - puppet:sysutils/puppet38 -BUILD_DEPENDS= rubygem-facter>=0:sysutils/rubygem-facter \ - rubygem-rake>=0:devel/rubygem-rake - -USE_RC_SUBR= puppetdb - -CONFLICTS_INSTALL= puppetdb3-* puppetdb4-* -USES= shebangfix -SHEBANG_FILES= ext/files/puppetdb \ - ext/files/puppetdb-anonymize \ - ext/files/puppetdb-export \ - ext/files/puppetdb-foreground \ - ext/files/puppetdb-import \ - ext/files/puppetdb-legacy \ - ext/files/puppetdb-ssl-setup -USE_JAVA= yes -NO_ARCH= yes -NO_BUILD= yes -JAVA_VERSION= 1.7+ - -USERS= puppetdb -GROUPS= puppetdb - -SUB_LIST= JAVA_HOME=${JAVA_HOME} -SUB_FILES= pkg-message - -PKGMESSAGE= ${WRKDIR}/pkg-message - -post-patch: -.for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \ - ext/files/puppetdb-import ext/files/puppetdb-anonymize \ - ext/files/database.ini ext/files/puppetdb-ssl-setup \ - ext/files/puppetdb-export ext/files/puppetdb-foreground Rakefile - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} -.endfor - -do-install: - @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install - -.include <bsd.port.mk> diff --git a/databases/puppetdb/distinfo b/databases/puppetdb/distinfo deleted file mode 100644 index e3a9bc549074..000000000000 --- a/databases/puppetdb/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (puppetdb-2.3.8.tar.gz) = d17c942a9bf6ffca65d8afa253741df98cc7d11195819daa980743543a69263d -SIZE (puppetdb-2.3.8.tar.gz) = 23815881 diff --git a/databases/puppetdb/files/patch-Rakefile b/databases/puppetdb/files/patch-Rakefile deleted file mode 100644 index cd259b4c24ba..000000000000 --- a/databases/puppetdb/files/patch-Rakefile +++ /dev/null @@ -1,49 +0,0 @@ ---- ./Rakefile.orig 2014-07-07 17:37:05.000000000 +0000 -+++ ./Rakefile 2014-09-01 19:12:56.379106833 +0000 -@@ -80,29 +80,29 @@ - @java_bin = "/opt/puppet/bin/java" - else - @install_dir = case @osfamily -- when /openbsd/ -- "/usr/local/share/puppetdb" -+ when /openbsd/, /freebsd/ -+ "%%PREFIX%%/share/puppetdb" - else - "/usr/share/puppetdb" - end -- @etc_dir = "/etc/puppetdb" -- @config_dir = "/etc/puppetdb/conf.d" -- @lib_dir = "/var/lib/puppetdb" -+ @etc_dir = "%%PREFIX%%/etc/puppetdb" -+ @config_dir = "%%PREFIX%%/etc/puppetdb/conf.d" -+ @lib_dir = "/var/db/puppetdb" - @libexec_dir = case @osfamily -- when /openbsd/ -+ when /openbsd/, /freebsd/ - "/usr/local/libexec/puppetdb" - when /redhat/, /suse/, /darwin/, /bsd/ - "/usr/libexec/puppetdb" - else - "/usr/lib/puppetdb" - end -- @link = "/usr/share/puppetdb" -+ @link = "%%PREFIX%%/share/puppetdb" - @name = "puppetdb" - @sbin_dir = case @osfamily - when /archlinux/ - "/usr/bin" - else -- "/usr/sbin" -+ "%%PREFIX%%/sbin" - end - end - -@@ -129,6 +129,8 @@ - @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp) - when /openbsd/ - @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1' -+ when /freebsd/ -+ @plibdir = @pe ? PE_SITELIBDIR : Facter.value(:rubysitedir).chomp - when /archlinux/ - @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]').chomp) - end diff --git a/databases/puppetdb/files/patch-ext__files__config.ini b/databases/puppetdb/files/patch-ext__files__config.ini deleted file mode 100644 index be98199b4818..000000000000 --- a/databases/puppetdb/files/patch-ext__files__config.ini +++ /dev/null @@ -1,14 +0,0 @@ ---- ./ext/files/config.ini.orig 2014-09-01 19:00:53.886157411 +0000 -+++ ./ext/files/config.ini 2014-09-01 19:06:59.957163437 +0000 -@@ -3,9 +3,9 @@ - - [global] - # Store mq/db data in a custom directory --vardir = /var/lib/puppetdb -+vardir = /var/db/puppetdb - # Use an external logback config file --logging-config = /etc/puppetdb/logback.xml -+logging-config = %%PREFIX%%/etc/puppetdb/logback.xml - - - [command-processing] diff --git a/databases/puppetdb/files/patch-ext__files__database.ini b/databases/puppetdb/files/patch-ext__files__database.ini deleted file mode 100644 index f6a7e1b36f74..000000000000 --- a/databases/puppetdb/files/patch-ext__files__database.ini +++ /dev/null @@ -1,11 +0,0 @@ ---- ./ext/files/database.ini.orig 2014-07-07 17:37:41.000000000 +0000 -+++ ./ext/files/database.ini 2014-09-01 19:00:53.907156973 +0000 -@@ -12,7 +12,7 @@ - # For the embedded DB: file:/path/to/database;hsqldb.tx=mvcc;sql.syntax_pgs=true - # For PostgreSQL: //host:port/databaseName - # Defaults to embedded DB located in <vardir>/db --subname = file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true -+subname = file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true - - # Connect as a specific user - # username = foobar diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb b/databases/puppetdb/files/patch-ext__files__puppetdb deleted file mode 100644 index 76f891510301..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb +++ /dev/null @@ -1,20 +0,0 @@ ---- ./ext/files/puppetdb.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb 2014-09-01 19:03:36.589145104 +0000 -@@ -6,7 +6,7 @@ - - # Display usage then exit - function usage { -- local libexecdir=/usr/libexec/puppetdb -+ local libexecdir=%%PREFIX%%/libexec/puppetdb - local files="${libexecdir}/puppetdb-*" - - # Seems trying to match an asterisk is hard in bash -@@ -48,7 +48,7 @@ - function execsubcommand { - sub=$1 - shift -- cmd="/usr/libexec/puppetdb/puppetdb-${sub}" -+ cmd="%%PREFIX%%/libexec/puppetdb/puppetdb-${sub}" - - if [ -e ${cmd} ]; then - exec "${cmd}" "$@" diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-anonymize b/databases/puppetdb/files/patch-ext__files__puppetdb-anonymize deleted file mode 100644 index 2c0101183c0a..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-anonymize +++ /dev/null @@ -1,9 +0,0 @@ ---- ./ext/files/puppetdb-anonymize.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb-anonymize 2014-09-01 19:08:46.772124148 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash - --. /usr/libexec/puppetdb/puppetdb.env -+. %%PREFIX%%/libexec/puppetdb/puppetdb.env - - ${JAVA_BIN} -Xmx192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetdb/puppetdb-oom.hprof -Djava.security.egd=file:/dev/urandom -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core anonymize "$@" diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-export b/databases/puppetdb/files/patch-ext__files__puppetdb-export deleted file mode 100644 index ccc1e42773d3..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-export +++ /dev/null @@ -1,9 +0,0 @@ ---- ./ext/files/puppetdb-export.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb-export 2014-09-01 19:05:29.845137420 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash - --. /usr/libexec/puppetdb/puppetdb.env -+. %%PREFIX%%/libexec/puppetdb/puppetdb.env - - ${JAVA_BIN} -Xmx192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetdb/puppetdb-oom.hprof -Djava.security.egd=file:/dev/urandom -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core export "$@" diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-foreground b/databases/puppetdb/files/patch-ext__files__puppetdb-foreground deleted file mode 100644 index 50acb56d9a4d..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-foreground +++ /dev/null @@ -1,12 +0,0 @@ ---- ./ext/files/puppetdb-foreground.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-foreground 2014-09-01 19:09:39.676120322 +0000 -@@ -1,7 +1,7 @@ - #!/bin/bash - --. /usr/libexec/puppetdb/puppetdb.env -+. %%PREFIX%%/libexec/puppetdb/puppetdb.env - - ARGS="$@" - --su ${USER} -s /bin/bash -c "${JAVA_BIN} ${JAVA_ARGS} -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core services -c ${CONFIG} ${@}" -+su ${USER} -s %%PREFIX%%/bin/bash -c "${JAVA_BIN} ${JAVA_ARGS} -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core services -c ${CONFIG} ${@}" diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-import b/databases/puppetdb/files/patch-ext__files__puppetdb-import deleted file mode 100644 index 6571ef118766..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-import +++ /dev/null @@ -1,9 +0,0 @@ ---- ./ext/files/puppetdb-import.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-import 2014-09-01 19:08:07.084126366 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash - --. /usr/libexec/puppetdb/puppetdb.env -+. %%PREFIX%%/libexec/puppetdb/puppetdb.env - - ${JAVA_BIN} -Xmx192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetdb/puppetdb-oom.hprof -Djava.security.egd=file:/dev/urandom -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core import "$@" diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup b/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup deleted file mode 100644 index 074f930759c5..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/files/puppetdb-ssl-setup.orig 2015-10-28 11:03:42 UTC -+++ ext/files/puppetdb-ssl-setup -@@ -227,10 +227,10 @@ else - agent_vardir=`puppet agent --configprint vardir` - - if id -u pe-puppetdb > /dev/null 2>&1; then -- puppetdb_confdir="/etc/puppetlabs/puppetdb" -+ puppetdb_confdir="%%PREFIX%%/etc/puppetlabs/puppetdb" - user=pe-puppetdb - else -- puppetdb_confdir="/etc/puppetdb" -+ puppetdb_confdir="%%PREFIX%%/etc/puppetdb" - user=puppetdb - fi - fi diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog b/databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog deleted file mode 100644 index 643fc12e4e4c..000000000000 --- a/databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog +++ /dev/null @@ -1,6 +0,0 @@ ---- ./ext/files/puppetdb.newsyslog.orig 2014-09-01 19:00:53.887156756 +0000 -+++ ./ext/files/puppetdb.newsyslog 2014-09-01 19:00:53.887156756 +0000 -@@ -0,0 +1,3 @@ -+# See man 5 newsyslog.conf or man.freebsd.org/newsyslog.conf(5) -+# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] -+/var/log/puppetdb/puppetdb.log puppetdb:puppetdb 640 12 * $W6D0 J /var/run/puppetdb/puppetdb.pid diff --git a/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb b/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb deleted file mode 100644 index dc279d8aeb92..000000000000 --- a/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/master/lib/puppet/util/puppetdb/char_encoding.rb.orig 2015-10-13 22:23:24 UTC -+++ ext/master/lib/puppet/util/puppetdb/char_encoding.rb -@@ -33,7 +33,7 @@ module CharEncoding - - - def self.utf8_string(str) -- if RUBY_VERSION =~ /1.8/ -+ if RUBY_VERSION =~ /^1\.8/ - # Ruby 1.8 doesn't have String#encode and related methods, and there - # appears to be a bug in iconv that will interpret some byte sequences - # as 6-byte characters. Thus, we are forced to resort to some unfortunate diff --git a/databases/puppetdb/files/patch-tasks__install.rake b/databases/puppetdb/files/patch-tasks__install.rake deleted file mode 100644 index 2ce0d47428f5..000000000000 --- a/databases/puppetdb/files/patch-tasks__install.rake +++ /dev/null @@ -1,76 +0,0 @@ ---- tasks/install.rake.orig 2014-07-07 17:37:05.000000000 +0000 -+++ tasks/install.rake 2014-09-01 19:42:02.500986018 +0000 -@@ -14,24 +14,21 @@ - @osfamily = Facter.value(:osfamily).downcase - mkdir_p "#{DESTDIR}/#{@install_dir}" - mkdir_p "#{DESTDIR}/#{@config_dir}" -- mkdir_p "#{DESTDIR}/#{@config_dir}/.." - mkdir_p "#{DESTDIR}/#{@log_dir}" -- mkdir_p "#{DESTDIR}/etc/init.d/" -+ unless @osfamily =~ /freebsd/ -+ mkdir_p "#{DESTDIR}/etc/init.d/" -+ end - mkdir_p "#{DESTDIR}/#{@lib_dir}" - mkdir_p "#{DESTDIR}/#{@libexec_dir}" - mkdir_p "#{DESTDIR}/#{@sbin_dir}" -- mkdir_p "#{DESTDIR}/etc/logrotate.d/" -- ln_sf @config_dir, "#{DESTDIR}/#{@lib_dir}/config" -- ln_sf @log_dir, "#{DESTDIR}/#{@install_dir}/log" -+# ln_sf @config_dir, "#{DESTDIR}/#{@lib_dir}/config" -+# ln_sf @log_dir, "#{DESTDIR}/#{@install_dir}/log" - - unless @pe -- mkdir_p "#{DESTDIR}/var/lib/puppetdb/state" -- mkdir_p "#{DESTDIR}/var/lib/puppetdb/db" -- mkdir_p "#{DESTDIR}/var/lib/puppetdb/mq" -- ln_sf "#{@lib_dir}/state", "#{DESTDIR}#{@link}/state" -- ln_sf "#{@lib_dir}/db", "#{DESTDIR}#{@link}/db" -- ln_sf "#{@lib_dir}/mq", "#{DESTDIR}#{@link}/mq" -- mkdir_p "#{DESTDIR}/etc/puppetdb" -+ mkdir_p "#{DESTDIR}#{@lib_dir}/state" -+ mkdir_p "#{DESTDIR}#{@lib_dir}/db" -+ mkdir_p "#{DESTDIR}#{@lib_dir}/mq" -+ mkdir_p "#{DESTDIR}#{@etc_dir}" - else - mkdir_p "#{DESTDIR}#{@lib_dir}/state" - mkdir_p "#{DESTDIR}#{@lib_dir}/db" -@@ -40,11 +37,11 @@ - end - - cp_p JAR_FILE, "#{DESTDIR}/#{@install_dir}" -- cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}" -- cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}" -- cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}" -- cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}" -- cp_pr "ext/files/puppetdb.logrotate", "#{DESTDIR}/etc/logrotate.d/#{@name}" -+ cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}/config.ini.sample" -+ cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}/database.ini.sample" -+ cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}/jetty.ini.sample" -+ cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}/repl.ini.sample" -+ cp_pr "ext/files/puppetdb.newsyslog", "#{DESTDIR}%%PREFIX%%/etc/newsyslog.conf.d/#{@name}" - cp_pr "ext/files/logback.xml", "#{DESTDIR}/#{@config_dir}/.." - cp_pr "ext/files/puppetdb", "#{DESTDIR}/#{@sbin_dir}" - -@@ -100,6 +97,11 @@ - cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc" - cp_p "ext/files/puppetdb.env", "#{DESTDIR}/#{@libexec_dir}/#{@name}.env" - chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc" -+ elsif @osfamily == "freebsd" -+ #mkdir_p "#{DESTDIR}/etc/rc.d/" -+ #cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc" -+ #cp_p "ext/files/puppetdb.env", "#{DESTDIR}/#{@libexec_dir}/#{@name}.env" -+ #chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc" - elsif @osfamily == "archlinux" - #systemd! - mkdir_p "#{DESTDIR}/etc/sysconfig" -@@ -113,10 +115,5 @@ - end - chmod 0750, "#{DESTDIR}/#{@config_dir}" - chmod 0640, "#{DESTDIR}/#{@config_dir}/../logback.xml" -- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-ssl-setup" -- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-foreground" -- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-import" -- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-export" -- chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-anonymize" - chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb" - end diff --git a/databases/puppetdb/files/pkg-message.in b/databases/puppetdb/files/pkg-message.in deleted file mode 100644 index 0517edf086e1..000000000000 --- a/databases/puppetdb/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -If this is a new installation, please run the follow to setup your SSL/puppetdb -server: - -%%PREFIX%%/sbin/puppetdb ssl-setup - -Please also remember to add puppetdb_enable="YES" into your rc.conf. diff --git a/databases/puppetdb/files/puppetdb.in b/databases/puppetdb/files/puppetdb.in deleted file mode 100644 index a28754be9417..000000000000 --- a/databases/puppetdb/files/puppetdb.in +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: puppetdb -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Configuration settings for puppetdb in /etc/rc.conf: -# -# puppetdb_enable (bool): -# Set to "NO" by default. -# Set it to "YES" to enable puppetdb -# -# puppetdb_args (str): -# Extra arguments passed to start command -# -# puppetdb_java_home (str): -# Set to "%%JAVA_HOME%%" by default. -# Set the Java virtual machine to run puppetdb -# -# puppetdb_java_opts (str): -# Set to "" by default. -# Java VM args to use. -# -# puppetdb_user (str): -# Set to "puppetdb" by default. -# User to run puppetdb as. -# -# puppetdb_group (str): -# Set to "puppetdb" by default. -# Group for data file ownership. -# -# puppetdb_log_file (str): -# Set to "/var/log/puppetdb/puppetdb.log" by default. -# Log file location. -# - -. /etc/rc.subr - -name="puppetdb" -rcvar=puppetdb_enable - -load_rc_config "${name}" - -: ${puppetdb_enable="NO"} -: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"} -: ${puppetdb_java_home="%%JAVA_HOME%%"} -: ${puppetdb_user="puppetdb"} -: ${puppetdb_group="puppetdb"} -: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"} - -pidfile="/var/run/puppetdb/puppetdb.pid" -command="/usr/sbin/daemon" -java_cmd="${puppetdb_java_home}/bin/java" -procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" - - -required_files="${java_cmd}" - -start_precmd="puppetdb_prestart" - -puppetdb_prestart() { - if [ ! -f "${puppetdb_log_file}" ]; then - touch "${puppetdb_log_file}" - chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}" - chmod 640 "${puppetdb_log_file}" - fi - if [ ! -d "/var/run/puppetdb" ]; then - install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb" - fi - - chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d" - chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d" - - chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml" - chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml" - - chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb" - chmod 0750 "/var/db/puppetdb" -} - -run_rc_command "$1" diff --git a/databases/puppetdb/pkg-descr b/databases/puppetdb/pkg-descr deleted file mode 100644 index 47fcde3773c6..000000000000 --- a/databases/puppetdb/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -The PuppetDB storeconfigs backend - -WWW: https://docs.puppetlabs.com/puppetdb/latest/ diff --git a/databases/puppetdb/pkg-plist b/databases/puppetdb/pkg-plist deleted file mode 100644 index e7eb5c9c0b4c..000000000000 --- a/databases/puppetdb/pkg-plist +++ /dev/null @@ -1,27 +0,0 @@ -%%ETCDIR%%/logback.xml -etc/newsyslog.conf.d/puppetdb -libexec/puppetdb/puppetdb-anonymize -libexec/puppetdb/puppetdb-export -libexec/puppetdb/puppetdb-foreground -libexec/puppetdb/puppetdb-import -libexec/puppetdb/puppetdb-ssl-setup -sbin/puppetdb-anonymize -sbin/puppetdb-export -sbin/puppetdb-foreground -sbin/puppetdb-import -sbin/puppetdb-ssl-setup -sbin/puppetdb -%%DATADIR%%/puppetdb.jar -@group puppetdb -@sample etc/puppetdb/conf.d/config.ini.sample -@sample etc/puppetdb/conf.d/database.ini.sample -@sample etc/puppetdb/conf.d/jetty.ini.sample -@sample etc/puppetdb/conf.d/repl.ini.sample -@group -@mode 0750 -@dir /var/db/puppetdb/state -@dir /var/db/puppetdb/db -@dir /var/db/puppetdb/mq -@dir /var/db/puppetdb -@mode -@dir(puppetdb,puppetdb,) /var/log/puppetdb diff --git a/databases/rubygem-redis-actionpack4/Makefile b/databases/rubygem-redis-actionpack4/Makefile deleted file mode 100644 index c60276a75960..000000000000 --- a/databases/rubygem-redis-actionpack4/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= redis-actionpack -PORTVERSION= 4.0.1 -PORTREVISION= 1 -CATEGORIES= databases rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 4 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Redis session store for ActionPack - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-actionpack4>=4:www/rubygem-actionpack4 \ - rubygem-redis-rack>=1.5.0:www/rubygem-redis-rack \ - rubygem-redis-store>=1.1.0:devel/rubygem-redis-store - -DEPRECATED= Use databases/rubygem-redis-actionpack instead -EXPIRATION_DATE=2017-03-31 - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -PORTSCOUT= limit:^4\. - -.include <bsd.port.mk> diff --git a/databases/rubygem-redis-actionpack4/distinfo b/databases/rubygem-redis-actionpack4/distinfo deleted file mode 100644 index ab7926c5a45d..000000000000 --- a/databases/rubygem-redis-actionpack4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rubygem/redis-actionpack-4.0.1.gem) = fcf9186b3f7b315e18e360546019e08b5733fef93816ccbd6a57b50b613354ca -SIZE (rubygem/redis-actionpack-4.0.1.gem) = 9728 diff --git a/databases/rubygem-redis-actionpack4/files/patch-gemspec b/databases/rubygem-redis-actionpack4/files/patch-gemspec deleted file mode 100644 index 9e08063f9a32..000000000000 --- a/databases/rubygem-redis-actionpack4/files/patch-gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- redis-actionpack.gemspec.orig 2017-03-15 08:52:49 UTC -+++ redis-actionpack.gemspec -@@ -23,7 +23,7 @@ Gem::Specification.new do |s| - s.specification_version = 4 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then -- s.add_runtime_dependency(%q<redis-store>.freeze, ["~> 1.1.0"]) -+ s.add_runtime_dependency(%q<redis-store>.freeze, [">= 1.1.0"]) - s.add_runtime_dependency(%q<redis-rack>.freeze, ["~> 1.5.0"]) - s.add_runtime_dependency(%q<actionpack>.freeze, ["~> 4"]) - s.add_development_dependency(%q<rake>.freeze, ["~> 10"]) diff --git a/databases/rubygem-redis-actionpack4/pkg-descr b/databases/rubygem-redis-actionpack4/pkg-descr deleted file mode 100644 index efb2d0816242..000000000000 --- a/databases/rubygem-redis-actionpack4/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Redis session store for ActionPack - -WWW: http://redis-store.org/redis-actionpack diff --git a/devel/Makefile b/devel/Makefile index f40cb3ed1fe0..0fab9a8ffbc2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -784,7 +784,6 @@ SUBDIR += go-metrics SUBDIR += go-nuid SUBDIR += go-pflag - SUBDIR += go-pretty SUBDIR += go-protobuf SUBDIR += go-raw SUBDIR += go-runewidth @@ -1395,7 +1394,6 @@ SUBDIR += libopensync SUBDIR += libopkele SUBDIR += liborcus - SUBDIR += liborcus07 SUBDIR += libosinfo SUBDIR += libosmo-abis SUBDIR += libosmo-netif @@ -1610,7 +1608,6 @@ SUBDIR += maven33 SUBDIR += mcpp SUBDIR += mdds - SUBDIR += mdds0 SUBDIR += memleax SUBDIR += menhir SUBDIR += mercator @@ -5395,7 +5392,6 @@ SUBDIR += rubygem-newrelic_rpm3 SUBDIR += rubygem-nice-ffi SUBDIR += rubygem-nio4r - SUBDIR += rubygem-nio4r1 SUBDIR += rubygem-nori SUBDIR += rubygem-notiffany SUBDIR += rubygem-notify diff --git a/devel/go-pretty/Makefile b/devel/go-pretty/Makefile deleted file mode 100644 index a0cdb252371f..000000000000 --- a/devel/go-pretty/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Grzegorz Blach <gblach@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= go-pretty -PORTVERSION= 20130510 -PORTREVISION= 1 -CATEGORIES= devel -MASTER_SITES= LOCAL/gblach/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Pretty-printing package for go values - -BUILD_DEPENDS= ${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text -RUN_DEPENDS= ${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text - -USES= go -GO_PKGNAME= github.com/kr/pretty - -DEPRECATED= Go libraries should not be packaged -EXPIRATION_DATE= 2017-04-08 - -.include <bsd.port.mk> diff --git a/devel/go-pretty/distinfo b/devel/go-pretty/distinfo deleted file mode 100644 index 33698305ebff..000000000000 --- a/devel/go-pretty/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (go-pretty-20130510.tar.gz) = 871a9ecb2409bc4d323f506d13215dd481d5bb81f81337186327895ae7bbb715 -SIZE (go-pretty-20130510.tar.gz) = 5953 diff --git a/devel/go-pretty/pkg-descr b/devel/go-pretty/pkg-descr deleted file mode 100644 index 74896da9e619..000000000000 --- a/devel/go-pretty/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Go package which provides pretty-printing for go values. This is useful during -debugging, to avoid wrapping long output lines in the terminal. - -This package also provides a convenience wrapper for each function in -package fmt that takes a format string. - -WWW: https://github.com/kr/pretty diff --git a/devel/go-pretty/pkg-plist b/devel/go-pretty/pkg-plist deleted file mode 100644 index 016c1e46db75..000000000000 --- a/devel/go-pretty/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -%%GO_LIBDIR%%/%%GO_PKGNAME%%.a -%%GO_SRCDIR%%/%%GO_PKGNAME%%/License -%%GO_SRCDIR%%/%%GO_PKGNAME%%/Readme -%%GO_SRCDIR%%/%%GO_PKGNAME%%/diff.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/diff_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/example_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/formatter.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/formatter_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/pretty.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/zero.go diff --git a/devel/liborcus07/Makefile b/devel/liborcus07/Makefile deleted file mode 100644 index fce8c98884ae..000000000000 --- a/devel/liborcus07/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# $FreeBSD$ - -PORTNAME= liborcus -PORTVERSION= 0.7.1 -PORTREVISION= 2 -CATEGORIES= devel misc -MASTER_SITES= http://kohei.us/files/orcus/src/ -PKGNAMESUFFIX= 07 - -MAINTAINER= office@FreeBSD.org -COMMENT= Standalone file import filter library for spreadsheet documents - -LICENSE= MIT - -BUILD_DEPENDS= ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 -LIB_DEPENDS= libboost_system.so:devel/boost-libs - -DEPRECATED= Deprecated by upstream, use devel/liborcus -EXPIRATION_DATE= 2017-03-31 - -BROKEN_sparc64= cannot link with boost - -GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig tar:xz -USE_LDCONFIG= yes -INSTALL_TARGET= install-strip - -CONFIGURE_ARGS= --disable-spreadsheet-model --disable-werror \ - --with-boost="${LOCALBASE}" \ - --with-boost-system=boost_system -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -post-install: - @${RM} ${STAGEDIR}${PREFIX}/bin/* - -.include <bsd.port.mk> diff --git a/devel/liborcus07/distinfo b/devel/liborcus07/distinfo deleted file mode 100644 index 250761d15746..000000000000 --- a/devel/liborcus07/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (liborcus-0.7.1.tar.xz) = 04846b64262210a0d4e18d72779c901633e45dc9cca2108235b38d4715266a43 -SIZE (liborcus-0.7.1.tar.xz) = 1472804 diff --git a/devel/liborcus07/pkg-descr b/devel/liborcus07/pkg-descr deleted file mode 100644 index 0fae702668b5..000000000000 --- a/devel/liborcus07/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Orcus is a library that provides a collection of standalone file processing -filters. It is currently focused on providing filters for spreadsheet -documents, but filters for other productivity application types (such as -wordprocessor and presentation) are in consideration. - -WWW: http://gitorious.org/orcus/ diff --git a/devel/liborcus07/pkg-plist b/devel/liborcus07/pkg-plist deleted file mode 100644 index 4db69397c66f..000000000000 --- a/devel/liborcus07/pkg-plist +++ /dev/null @@ -1,49 +0,0 @@ -include/liborcus-0.8/orcus/base64.hpp -include/liborcus-0.8/orcus/cell_buffer.hpp -include/liborcus-0.8/orcus/css_parser.hpp -include/liborcus-0.8/orcus/csv_parser.hpp -include/liborcus-0.8/orcus/csv_parser_base.hpp -include/liborcus-0.8/orcus/dom_tree.hpp -include/liborcus-0.8/orcus/env.hpp -include/liborcus-0.8/orcus/exception.hpp -include/liborcus-0.8/orcus/format_detection.hpp -include/liborcus-0.8/orcus/global.hpp -include/liborcus-0.8/orcus/interface.hpp -include/liborcus-0.8/orcus/measurement.hpp -include/liborcus-0.8/orcus/ooxml/encryption_info.hpp -include/liborcus-0.8/orcus/orcus_csv.hpp -include/liborcus-0.8/orcus/orcus_gnumeric.hpp -include/liborcus-0.8/orcus/orcus_ods.hpp -include/liborcus-0.8/orcus/orcus_xls_xml.hpp -include/liborcus-0.8/orcus/orcus_xlsx.hpp -include/liborcus-0.8/orcus/orcus_xml.hpp -include/liborcus-0.8/orcus/parser_global.hpp -include/liborcus-0.8/orcus/pstring.hpp -include/liborcus-0.8/orcus/sax_ns_parser.hpp -include/liborcus-0.8/orcus/sax_parser.hpp -include/liborcus-0.8/orcus/sax_parser_base.hpp -include/liborcus-0.8/orcus/sax_token_parser.hpp -include/liborcus-0.8/orcus/spreadsheet/export_interface.hpp -include/liborcus-0.8/orcus/spreadsheet/import_interface.hpp -include/liborcus-0.8/orcus/spreadsheet/types.hpp -include/liborcus-0.8/orcus/stream.hpp -include/liborcus-0.8/orcus/string_pool.hpp -include/liborcus-0.8/orcus/tokens.hpp -include/liborcus-0.8/orcus/types.hpp -include/liborcus-0.8/orcus/xml_namespace.hpp -include/liborcus-0.8/orcus/xml_structure_tree.hpp -include/liborcus-0.8/orcus/zip_archive.hpp -include/liborcus-0.8/orcus/zip_archive_stream.hpp -lib/liborcus-0.8.a -lib/liborcus-0.8.so -lib/liborcus-0.8.so.0 -lib/liborcus-0.8.so.0.0.0 -lib/liborcus-mso-0.8.a -lib/liborcus-mso-0.8.so -lib/liborcus-mso-0.8.so.0 -lib/liborcus-mso-0.8.so.0.0.0 -lib/liborcus-parser-0.8.a -lib/liborcus-parser-0.8.so -lib/liborcus-parser-0.8.so.0 -lib/liborcus-parser-0.8.so.0.0.0 -libdata/pkgconfig/liborcus-0.8.pc diff --git a/devel/mdds0/Makefile b/devel/mdds0/Makefile deleted file mode 100644 index 386b95622661..000000000000 --- a/devel/mdds0/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mdds -PORTVERSION= 0.12.1 -CATEGORIES= devel -MASTER_SITES= http://kohei.us/files/mdds/src/ -PKGNAMESUFFIX= 0 -DISTNAME= ${PORTNAME}_${PORTVERSION} - -MAINTAINER= office@FreeBSD.org -COMMENT= Multi-dimensional data index algorithm - -LICENSE= MIT - -DEPRECATED= Deprecated by upstream, use devel/mdds -EXPIRATION_DATE= 2017-03-31 - -USES= tar:bzip2 -NO_ARCH= yes -NO_BUILD= yes - -do-configure: - @${SED} -e 's|@prefix@|${PREFIX}|' \ - -e 's|@includedir@|$${prefix}/include|' \ - -e 's|@VERSION@|${PORTVERSION}|' \ - ${WRKSRC}/misc/mdds.pc.in > ${WRKSRC}/misc/mdds.pc - -do-install: - cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX} - ${INSTALL_DATA} ${WRKSRC}/misc/mdds.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig - -.include <bsd.port.mk> diff --git a/devel/mdds0/distinfo b/devel/mdds0/distinfo deleted file mode 100644 index 77abc9e4d2ee..000000000000 --- a/devel/mdds0/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mdds_0.12.1.tar.bz2) = 23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d -SIZE (mdds_0.12.1.tar.bz2) = 153265 diff --git a/devel/mdds0/files/patch-include_mdds_flat__segment__tree.hpp b/devel/mdds0/files/patch-include_mdds_flat__segment__tree.hpp deleted file mode 100644 index ad0652bfe740..000000000000 --- a/devel/mdds0/files/patch-include_mdds_flat__segment__tree.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- include/mdds/flat_segment_tree.hpp.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/flat_segment_tree.hpp -@@ -32,7 +32,6 @@ - #include <sstream> - #include <utility> - #include <cassert> --#include <limits> - - #include "mdds/node.hpp" - #include "mdds/flat_segment_tree_itr.hpp" diff --git a/devel/mdds0/files/patch-include_mdds_flat__segment__tree__def.inl b/devel/mdds0/files/patch-include_mdds_flat__segment__tree__def.inl deleted file mode 100644 index d193b6ffdd37..000000000000 --- a/devel/mdds0/files/patch-include_mdds_flat__segment__tree__def.inl +++ /dev/null @@ -1,11 +0,0 @@ ---- include/mdds/flat_segment_tree_def.inl.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/flat_segment_tree_def.inl -@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_se - // We don't ever use the value of the right leaf node, but we need the - // value to be always the same, to make it easier to check for - // equality. -- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max(); -+ m_right_leaf->value_leaf.value = init_val; - } - - template<typename _Key, typename _Value> diff --git a/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__def.inl b/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__def.inl deleted file mode 100644 index 53c88946b30f..000000000000 --- a/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__def.inl +++ /dev/null @@ -1,13 +0,0 @@ ---- include/mdds/mixed_type_matrix_def.inl.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/mixed_type_matrix_def.inl -@@ -220,8 +220,8 @@ void mixed_type_matrix<_String,_Flag>::a - // assignment to self. - return; - -- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows()); -- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols()); -+ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows()); -+ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols()); - for (size_t i = 0; i < row_count; ++i) - for (size_t j = 0; j < col_count; ++j) - mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j); diff --git a/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl b/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl deleted file mode 100644 index a91f65f4a3f5..000000000000 --- a/devel/mdds0/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl +++ /dev/null @@ -1,24 +0,0 @@ ---- include/mdds/mixed_type_matrix_storage_filled_linear.inl.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/mixed_type_matrix_storage_filled_linear.inl -@@ -354,8 +354,8 @@ public: - } - - array_type new_array(new_size, &m_init_elem); -- size_t min_rows = ::std::min(row, m_rows); -- size_t min_cols = ::std::min(col, m_cols); -+ size_t min_rows = (::std::min)(row, m_rows); -+ size_t min_cols = (::std::min)(col, m_cols); - for (size_t i = 0; i < min_rows; ++i) - { - for (size_t j = 0; j < min_cols; ++j) -@@ -614,8 +614,8 @@ public: - } - - array_type new_array(new_size, element(0.0)); -- size_t min_rows = ::std::min(row, m_rows); -- size_t min_cols = ::std::min(col, m_cols); -+ size_t min_rows = (::std::min)(row, m_rows); -+ size_t min_cols = (::std::min)(col, m_cols); - for (size_t i = 0; i < min_rows; ++i) - { - for (size_t j = 0; j < min_cols; ++j) diff --git a/devel/mdds0/files/patch-include_mdds_multi__type__vector__itr.hpp b/devel/mdds0/files/patch-include_mdds_multi__type__vector__itr.hpp deleted file mode 100644 index 3bfde43204de..000000000000 --- a/devel/mdds0/files/patch-include_mdds_multi__type__vector__itr.hpp +++ /dev/null @@ -1,83 +0,0 @@ ---- include/mdds/multi_type_vector_itr.hpp.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/multi_type_vector_itr.hpp -@@ -139,14 +139,15 @@ protected: - typedef typename parent_type::size_type size_type; - typedef iterator_value_node<size_type, typename parent_type::element_block_type> node; - -- iterator_common_base() : m_cur_node(0, 0) {} -+ iterator_common_base() : m_cur_node(0, 0), m_singular(true) {} - - iterator_common_base( - const base_iterator_type& pos, const base_iterator_type& end, - size_type start_pos, size_type block_index) : - m_cur_node(start_pos, block_index), - m_pos(pos), -- m_end(end) -+ m_end(end), -+ m_singular(false) - { - if (m_pos != m_end) - update_node(); -@@ -154,9 +155,13 @@ protected: - - iterator_common_base(const iterator_common_base& other) : - m_cur_node(other.m_cur_node), -- m_pos(other.m_pos), -- m_end(other.m_end) -+ m_singular(other.m_singular) - { -+ if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } - } - - void update_node() -@@ -196,6 +201,7 @@ protected: - node m_cur_node; - base_iterator_type m_pos; - base_iterator_type m_end; -+ bool m_singular; - - public: - bool operator== (const iterator_common_base& other) const -@@ -218,16 +224,34 @@ public: - iterator_common_base& operator= (const iterator_common_base& other) - { - m_cur_node = other.m_cur_node; -- m_pos = other.m_pos; -- m_end = other.m_end; -+ m_singular = other.m_singular; -+ if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } - return *this; - } - - void swap(iterator_common_base& other) - { - m_cur_node.swap(other.m_cur_node); -- std::swap(m_pos, other.m_pos); -- std::swap(m_end, other.m_end); -+ std::swap(m_singular, other.m_singular); -+ if (!(m_singular || other.m_singular)) -+ { -+ std::swap(m_pos, other.m_pos); -+ std::swap(m_end, other.m_end); -+ } -+ else if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } -+ else if (!other.m_singular) -+ { -+ other.m_pos = m_pos; -+ other.m_end = m_end; -+ } - } - - const node& get_node() const { return m_cur_node; } diff --git a/devel/mdds0/files/patch-include_mdds_point__quad__tree.hpp b/devel/mdds0/files/patch-include_mdds_point__quad__tree.hpp deleted file mode 100644 index 87864a0755fa..000000000000 --- a/devel/mdds0/files/patch-include_mdds_point__quad__tree.hpp +++ /dev/null @@ -1,17 +0,0 @@ ---- include/mdds/point_quad_tree.hpp.orig 2015-06-11 23:53:55 UTC -+++ include/mdds/point_quad_tree.hpp -@@ -635,10 +635,10 @@ point_quad_tree<_Key,_Data>::~point_quad - template<typename _Key, typename _Data> - void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data) - { -- m_xrange.first = ::std::min(m_xrange.first, x); -- m_xrange.second = ::std::max(m_xrange.second, x); -- m_yrange.first = ::std::min(m_yrange.first, y); -- m_yrange.second = ::std::max(m_yrange.second, y); -+ m_xrange.first = (::std::min)(m_xrange.first, x); -+ m_xrange.second = (::std::max)(m_xrange.second, x); -+ m_yrange.first = (::std::min)(m_yrange.first, y); -+ m_yrange.second = (::std::max)(m_yrange.second, y); - - if (!m_root) - { diff --git a/devel/mdds0/pkg-descr b/devel/mdds0/pkg-descr deleted file mode 100644 index ab2be66abb43..000000000000 --- a/devel/mdds0/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Multi-Dimensional Data Structure (mdds) is a collection of multi-dimensional -data structure and indexing algorithm. - -WWW: https://gitlab.com/mdds/mdds diff --git a/devel/mdds0/pkg-plist b/devel/mdds0/pkg-plist deleted file mode 100644 index 3ece30ebabc4..000000000000 --- a/devel/mdds0/pkg-plist +++ /dev/null @@ -1,35 +0,0 @@ -include/mdds/compat/unique_ptr.hpp -include/mdds/default_deleter.hpp -include/mdds/flat_segment_tree.hpp -include/mdds/flat_segment_tree_def.inl -include/mdds/flat_segment_tree_itr.hpp -include/mdds/global.hpp -include/mdds/hash_container/map.hpp -include/mdds/mixed_type_matrix.hpp -include/mdds/mixed_type_matrix_def.inl -include/mdds/mixed_type_matrix_element.hpp -include/mdds/mixed_type_matrix_flag_storage.hpp -include/mdds/mixed_type_matrix_storage.hpp -include/mdds/mixed_type_matrix_storage_filled_linear.inl -include/mdds/mixed_type_matrix_storage_sparse.inl -include/mdds/multi_type_matrix.hpp -include/mdds/multi_type_matrix_def.inl -include/mdds/multi_type_vector.hpp -include/mdds/multi_type_vector_custom_func1.hpp -include/mdds/multi_type_vector_custom_func2.hpp -include/mdds/multi_type_vector_custom_func3.hpp -include/mdds/multi_type_vector_def.inl -include/mdds/multi_type_vector_itr.hpp -include/mdds/multi_type_vector_macro.hpp -include/mdds/multi_type_vector_trait.hpp -include/mdds/multi_type_vector_types.hpp -include/mdds/node.hpp -include/mdds/point_quad_tree.hpp -include/mdds/quad_node.hpp -include/mdds/rectangle_set.hpp -include/mdds/rectangle_set_def.inl -include/mdds/segment_tree.hpp -include/mdds/segment_tree_def.inl -include/mdds/sorted_string_map.hpp -include/mdds/sorted_string_map_def.inl -libdata/pkgconfig/mdds.pc diff --git a/devel/rubygem-nio4r1/Makefile b/devel/rubygem-nio4r1/Makefile deleted file mode 100644 index bb7476f0ec2f..000000000000 --- a/devel/rubygem-nio4r1/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= nio4r -PORTVERSION= 1.2.1 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 1 - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= New IO for Ruby - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Use devel/rubygem-nio4r instead -EXPIRATION_DATE=2017-03-31 - -USE_RUBY= yes -USES= gem - -.include <bsd.port.mk> diff --git a/devel/rubygem-nio4r1/distinfo b/devel/rubygem-nio4r1/distinfo deleted file mode 100644 index 9079416baed5..000000000000 --- a/devel/rubygem-nio4r1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rubygem/nio4r-1.2.1.gem) = 0a5a93676c7c116c51f00366800a7c039d67393dadb4b873059375d7cfa9b6a9 -SIZE (rubygem/nio4r-1.2.1.gem) = 94208 diff --git a/devel/rubygem-nio4r1/pkg-descr b/devel/rubygem-nio4r1/pkg-descr deleted file mode 100644 index a8f29496254a..000000000000 --- a/devel/rubygem-nio4r1/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -nio4r provides an abstract, cross-platform stateful I/O selector API for Ruby. -I/O selectors are the heart of "reactor"-based event loops, and monitor multiple -I/O objects for various types of readiness, e.g. ready for reading or writing. - -The most similar API provided by Ruby today is Kernel.select, however the select -API requires you to pass in arrays of all of the I/O objects you're interested -in every time. nio4r provides a more object-oriented API that lets you register -I/O objects with a selector then handle them when they're selected for various -types of events. - -nio4r is modeled after the Java NIO API, but simplified for ease-of-use. - -Its goals are: -- Expose high-level interfaces for stateful IO selectors -- Keep the API small to maximize both portability and performance across many - different OSes and Ruby VMs -- Provide inherently thread-safe facilities for working with IO objects - -WWW: https://github.com/celluloid/nio4r diff --git a/editors/Makefile b/editors/Makefile index e80b51ce7cfa..126dec77853a 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -196,7 +196,6 @@ SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu - SUBDIR += libreoffice4 SUBDIR += linux-sublime SUBDIR += linux-sublime3 SUBDIR += madedit diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile deleted file mode 100644 index 9e699dc7b3b8..000000000000 --- a/editors/libreoffice4/Makefile +++ /dev/null @@ -1,377 +0,0 @@ -# $FreeBSD$ - -PORTNAME= libreoffice -PORTVERSION= 4.3.7 -PORTREVISION= 15 -CATEGORIES= editors -MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ - http://dev-www.libreoffice.org/extern/:ext \ - http://dev-www.libreoffice.org/src/:src -PKGNAMESUFFIX= 4 -DISTFILES= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} -DIST_SUBDIR= libreoffice -EXTRACT_ONLY:= ${DISTFILES} - -MAINTAINER= office@FreeBSD.org -COMMENT= Full integrated office productivity suite - -LICENSE= LGPL3 MPL -LICENSE_COMB= dual - -BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ - zip:archivers/zip \ - ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs \ - cppunit-config:devel/cppunit \ - dmake:devel/dmake \ - ${LOCALBASE}/bin/gperf:devel/gperf \ - ${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \ - gpatch:devel/patch \ - ucpp:devel/ucpp \ - vigra-config:graphics/vigra \ - ${LOCALBASE}/include/glm/glm.hpp:math/glm \ - bash:shells/bash \ - gsed:textproc/gsed -LIB_DEPENDS= libapr-1.so:devel/apr1 \ - libicutu.so:devel/icu \ - liblangtag.so:devel/liblangtag \ - liborcus-0.8.so:devel/liborcus07 \ - libcurl.so:ftp/curl \ - libcairo.so:graphics/cairo \ - libgraphite2.so:graphics/graphite2 \ - liblcms2.so:graphics/lcms2 \ - libcdr-0.1.so:graphics/libcdr01 \ - libetonyek-0.1.so:graphics/libetonyek01 \ - libfreehand-0.1.so:graphics/libfreehand \ - libgltf-0.0.so:graphics/libgltf \ - libwpg-0.3.so:graphics/libwpg03 \ - libGeneratedSaxParser.so:graphics/opencollada \ - libpng.so:graphics/png \ - libpoppler.so:graphics/poppler \ - liblpsolve55.so:math/lp_solve \ - libcmis-0.5.so:net/libcmis \ - libharfbuzz.so:print/harfbuzz \ - libmspub-0.1.so:print/libmspub01 \ - libnss3.so:security/nss \ - libclucene-core.so:textproc/clucene \ - libexpat.so:textproc/expat2 \ - libhunspell-1.6.so:textproc/hunspell \ - libhyphen.so:textproc/hyphen \ - libabw-0.1.so:textproc/libabw \ - libe-book-0.1.so:textproc/libe-book \ - libexttextcat-2.0.so:textproc/libexttextcat \ - libmwaw-0.3.so:textproc/libmwaw03 \ - libodfgen-0.1.so:textproc/libodfgen01 \ - librevenge-0.0.so:textproc/librevenge \ - libvisio-0.1.so:textproc/libvisio01 \ - libwpd-0.10.so:textproc/libwpd010 \ - libwps-0.3.so:textproc/libwps03 \ - libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt \ - libmythes-1.2.so:textproc/mythes \ - librdf.so:textproc/redland \ - libserf-1.so:www/serf -RUN_DEPENDS= ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ - ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ - ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ - ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ - ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ - ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g - -DEPRECATED= Deprecated by upstream -EXPIRATION_DATE= 2017-03-31 - -CONFLICTS_INSTALL= libreoffice-5.* -ONLY_FOR_ARCHS= amd64 i386 - -_MAKE_JOBS= # - -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf aclocal -USE_GL= gl glew glu -USE_OPENLDAP= yes -USE_PERL5= build -USE_QT4= # empty but required -USE_XORG= xaw xrandr -USES= bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info tar:xz -WANT_GNOME= yes - -LOVERSION= ${PORTVERSION}.${RCVER} -RCVER= 2 - -DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \ - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src - -EXTRA_PATCHES= ${FILESDIR}/enable-opencollada:-p1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} - -COLLADA_MODS= COLLADABaseUtils COLLADAFramework \ - COLLADASaxFrameworkLoader GeneratedSaxParser -COLLADA_CFLAGS= ${COLLADA_MODS:S|^|-I${LOCALBASE}/include/opencollada/|} -COLLADA_LIBS= -L${LOCALBASE}/lib/opencollada \ - ${COLLADA_MODS:S|^COLLADA|OpenCOLLADA|:S|^|-l|} - -CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ - GNUTAR="${TAR}" \ - GPERF=${LOCALBASE}/bin/gperf \ - OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \ - OPENCOLLADA_LIBS="${COLLADA_LIBS}" \ - PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ - PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" - -CONFIGURE_ARGS+= --disable-dependency-tracking \ - --disable-fetch-external \ - --disable-online-update \ - --exec-prefix=${PREFIX} \ - --with-build-version="FreeBSD ports ${PKGVERSION}" \ - --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ - --with-gnu-patch=${LOCALBASE}/bin/gpatch \ - --with-os-version=${OSVERSION} \ - --with-parallelism=${MAKE_JOBS_NUMBER} \ - --with-vendor="FreeBSD ports" - -CONFIGURE_ARGS+= --disable-coinmp \ - --disable-epm \ - --disable-firebird-sdbc \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-kde \ - --disable-kdeab \ - --disable-mergelibs \ - --disable-packagekit \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-python=system \ - --with-alloc=system \ - --with-external-dict-dir=${LOCALBASE}/share/hunspell \ - --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ - --with-external-thes-dir=${LOCALBASE}/share/mythes \ - --with-system-altlinuxhyph \ - --with-system-apr \ - --with-system-boost \ - --with-system-cairo \ - --with-system-clucene \ - --with-system-cppunit \ - --with-system-curl \ - --with-system-dicts \ - --with-system-expat \ - --with-system-glew \ - --with-system-glm \ - --with-system-graphite \ - --with-system-harfbuzz \ - --with-system-hunspell \ - --with-system-icu \ - --with-system-jpeg \ - --with-system-lcms2 \ - --with-system-libabw \ - --with-system-libcdr \ - --with-system-libcmis \ - --with-system-libebook \ - --with-system-libetonyek \ - --with-system-libexttextcat \ - --with-system-libfreehand \ - --with-system-libgltf \ - --with-system-liblangtag \ - --with-system-libmspub \ - --with-system-libmwaw \ - --with-system-libodfgen \ - --with-system-libpng \ - --with-system-librevenge \ - --with-system-libvisio \ - --with-system-libwpd \ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-libxml \ - --with-system-lpsolve \ - --with-system-mdds \ - --with-system-mesa-headers \ - --with-system-mythes \ - --with-system-neon \ - --with-system-nss \ - --with-system-opencollada \ - --with-system-openldap \ - --with-system-openssl \ - --with-system-orcus \ - --with-system-poppler \ - --with-system-postgresql \ - --with-system-redland \ - --with-system-serf \ - --with-system-ucpp \ - --with-system-vigra \ - --with-system-zlib \ - --without-fonts \ - --without-myspell-dicts \ - --without-system-npapi-headers - -#XXX add: --with-system-libeot or --with-system-libatomic_ops - -OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \ - SYSTRAY TEST VERBOSE WEBDAV -OPTIONS_DEFAULT=CUPS GTK2 - -JAVA_DESC= Add Java support (XML filters, macros) -MMEDIA_DESC= Enable multimedia backend for impress -PGSQL_DESC= Build with PostgreSQL-SDBC driver -SDK_DESC= Build with SDK -SYSTRAY_DESC= Enable systemtray quickstarter -TEST_DESC= Run all regression tests -VERBOSE_DESC= Increase build verbosity -WEBDAV_DESC= Enable webdav protocol - -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CONFIGURE_ENABLE= cups - -DEBUG_CONFIGURE_ON= --enable-crashdump --enable-dbgutil --enable-debug -DEBUG_CONFIGURE_OFF= --enable-release-build - -GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib -GNOME_USE= GNOME=gconf2 -GNOME_CONFIGURE_ENABLE= dbus gconf lockdown - -GTK3_USE= GNOME=gtk30 -GTK3_CONFIGURE_ENABLE= gtk3 - -JAVA_CATEGORIES= java -JAVA_DISTFILES= 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip:src \ - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:src \ - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ - 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz:src \ - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:src \ - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \ - e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz:src \ - ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:src \ - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \ - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src -JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ - ${JAVAJARDIR}/junit.jar:java/junit -# XXX jni.h from GNU classpath causes ABI conflicts. -JAVA_CONFLICTS_BUILD= classpath-[0-9]* -JAVA_CONFIGURE_ON= --enable-ext-wiki-publisher \ - --enable-report-builder \ - --with-ant-home=${LOCALBASE}/share/java/apache-ant \ - --with-jdk-home="${JAVA_HOME}" \ - --with-junit=${JAVAJARDIR}/junit.jar \ - --with-hamcrest=${JAVAJARDIR}/hamcrest.jar -JAVA_CONFIGURE_OFF= --without-java -JAVA_USE= JAVA=yes -JAVA_VARS= JAVA_BUILD=yes - -KDE4_USES= kde:4 -KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build -KDE4_CONFIGURE_ENABLE= kde4 -KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ - QT4DIR="${PREFIX}" \ - QT4INC="${QT_INCDIR}" \ - QT4LIB="${QT_LIBDIR}" - -MMEDIA_USE= GSTREAMER1=yes -MMEDIA_CONFIGURE_ENABLE= gstreamer - -PGSQL_USES= pgsql:9.0+ -PGSQL_CONFIGURE_ENABLE= postgresql-sdbc -PGSQL_CONFIGURE_WITH= gssapi krb5 - -SDK_DISTFILES= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext -SDK_BUILD_DEPENDS= doxygen:devel/doxygen -SDK_CONFIGURE_ENABLE= odk -SDK_CONFIGURE_ON= --with-doxygen=${LOCALBASE}/bin/doxygen -SDK_CONFIGURE_OFF= --without-doxygen - -SYSTRAY_CONFIGURE_ENABLE= systray - -TEST_CONFIGURE_ENABLE= cve-tests - -WEBDAV_LIB_DEPENDS= libneon.so:www/neon -WEBDAV_CONFIGURE_ENABLE= neon - -# for dynamic plist generation -PLISTD?= ${WRKDIR}/plist_dirs -PLISTF?= ${WRKDIR}/plist_files - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDEBUG} -IGNORE= is broken with DEBUG option -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-Makefile.in -.endif - -.if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MVERBOSE} -CONFIGURE_ARGS+= --enable-verbose -.endif - -.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gtk -.else -CONFIGURE_ARGS+= --disable-gtk -.endif - -.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} -USES+= desktop-file-utils -CONFIGURE_ARGS+= --enable-gio -INSTALLS_ICONS= yes -.else -CONFIGURE_ARGS+= --disable-gio -.endif - -.if empty(PORT_OPTIONS:MTEST) -EXTRA_PATCHES+= ${FILESDIR}/disable-cppunittester -.endif - -.include <bsd.port.pre.mk> - -.if ${COMPILER_FEATURES:Mlibc++} -EXTRA_PATCHES+= ${FILESDIR}/extra-libc++:-p1 -EXTRA_PATCHES+= ${FILESDIR}/extra-libc++.i386:-p0 -.endif - -.if ${COMPILER_FEATURES:Mlibstdc++} -EXTRA_PATCHES+= ${FILESDIR}/extra-configure.ac -.endif - -ACLOCAL_ARGS= -I "${WRKSRC}/m4" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -MAKE_ENV+= ENVCFLAGS="${CFLAGS}" ENVCFLAGSCXX="${CXXFLAGS}" -MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}" -MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed - -pre-configure: - @${TOUCH} ${WRKSRC}/autogen.lastrun - -post-configure: - @${TOUCH} ${WRKSRC}/src.downloaded - -do-install: - @cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} distro-pack-install - @${RM} ${PLISTD} ${PLISTF} - @cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ - -empty -exec ${ECHO_CMD} "@dir {}" \; >> ${PLISTD} - @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s bin etc lib man \ - \( -type f -o -type l \) -print >> ${PLISTF} -.for subdir in application-registry applications icons mime mime-info mimelnk - @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \ - \( -type f -o -type l \) -print >> ${PLISTF} -.endfor -.if ${PORT_OPTIONS:MSDK} -.for subdir in include share share/doc share/idl - @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \ - \( -type f -o -type l \) -print >> ${PLISTF} -.endfor -.endif - @${SORT} -u ${PLISTF} >> ${TMPPLIST} - @${SORT} -u ${PLISTD} >> ${TMPPLIST} - -.include <bsd.port.post.mk> diff --git a/editors/libreoffice4/distinfo b/editors/libreoffice4/distinfo deleted file mode 100644 index cb234423c729..000000000000 --- a/editors/libreoffice4/distinfo +++ /dev/null @@ -1,51 +0,0 @@ -TIMESTAMP = 1473971067 -SHA256 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831 -SIZE (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 -SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 -SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470 -SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 -SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 -SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a -SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670 -SHA256 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 -SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664 -SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b -SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 -SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 -SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796 -SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 -SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157 -SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 -SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 -SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb -SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291 -SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 -SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 -SHA256 (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908 -SIZE (libreoffice/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 739050 -SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 -SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 -SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 -SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 -SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 -SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150 -SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 -SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311 -SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd -SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031 -SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 -SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 -SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 -SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 -SHA256 (libreoffice/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz) = 3a32dfb846c58d3b3ff264235cfcbaf54ad086a793f64cbe4409f46886ceb655 -SIZE (libreoffice/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz) = 187403 -SHA256 (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = 648f10fb764d000d6a68b2d4e008117900e853c197a024d1f91dbba9b91012ca -SIZE (libreoffice/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz) = 726942 -SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba -SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 -SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 -SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 -SHA256 (libreoffice/libreoffice-4.3.7.2.tar.xz) = 3a6baa64e1f775f9c1c7398449780b118f8a2cef2be9dfa797c4732fe10c0db9 -SIZE (libreoffice/libreoffice-4.3.7.2.tar.xz) = 153267644 -SHA256 (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 21a7a445041d0794e76b83b3877ec1741feca6eaec984919bf6633b417aab9bc -SIZE (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 1854916 diff --git a/editors/libreoffice4/files/disable-cppunittester b/editors/libreoffice4/files/disable-cppunittester deleted file mode 100644 index 6cb4d3934ae1..000000000000 --- a/editors/libreoffice4/files/disable-cppunittester +++ /dev/null @@ -1,10 +0,0 @@ ---- ./sal/cppunittester/cppunittester.cxx.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./sal/cppunittester/cppunittester.cxx 2013-02-18 18:38:28.000000000 -0500 -@@ -167,6 +167,7 @@ - } - - SAL_IMPLEMENT_MAIN() { -+ return EXIT_SUCCESS; - #ifdef WNT - //Disable Dr-Watson in order to crash simply without popup dialogs under - //windows diff --git a/editors/libreoffice4/files/enable-opencollada b/editors/libreoffice4/files/enable-opencollada deleted file mode 100644 index 7857a517cfed..000000000000 --- a/editors/libreoffice4/files/enable-opencollada +++ /dev/null @@ -1,172 +0,0 @@ -From f24c60870531689d95c056037e48cd29ad1d17bb Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 20 Oct 2014 14:21:22 +0200 -Subject: allow to build with system opencollada - -Change-Id: I6101099c57d429987e06bca0652c843f4a94f8cc - -diff --git a/Makefile.fetch b/Makefile.fetch -index e8ccf5b..18b12be 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -184,7 +184,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) - $(call fetch_Optional,NSS,NSS_TARBALL) \ - $(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \ - $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ -- $(call fetch_Optional,COLLADA2GLTF,OPENCOLLADA_TARBALL) \ -+ $(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \ - $(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \ - $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ - $(call fetch_Optional,ORCUS,ORCUS_TARBALL) \ -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 5277aea..911dab1 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3371,6 +3371,20 @@ endif # SYSTEN_LIBGLTF - - ifeq ($(ENABLE_COLLADA),TRUE) - -+ifeq ($(SYSTEM_OPENCOLLADA),TRUE) -+ -+define gb_LinkTarget__use_opencollada_parser -+$(call gb_LinkTarget_set_include,$(1),\ -+ $$(INCLUDE) \ -+ $(OPENCOLLADA_CFLAGS) \ -+) -+ -+$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS)) -+ -+endef -+ -+else # !SYSTEM_OPENCOLLADA -+ - define gb_LinkTarget__use_opencollada_parser - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ -@@ -3385,6 +3399,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ - ) - endef - -+endif # SYSTEM_OPENCOLLADA -+ - define gb_LinkTarget__use_collada2gltf - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf) \ -diff --git a/config_host.mk.in b/config_host.mk.in -index 0fefbb0..738c80c 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -431,7 +431,8 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ - export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@ - export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ - export OOO_VENDOR=@OOO_VENDOR@ --export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -+export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@ -+export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@ - export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ - export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ - export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ -@@ -558,6 +559,7 @@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ - export SYSTEM_NSS=@SYSTEM_NSS@ - export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ - export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ -+export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@ - export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ - export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ - export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ -diff --git a/configure.ac b/configure.ac -index 17feb1a..5d2198b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1641,6 +1641,11 @@ AC_ARG_WITH(system-ucpp, - [Use ucpp already on system.]),, - []) - -+AC_ARG_WITH(system-opencollada, -+ AS_HELP_STRING([--with-system-opencollada], -+ [Use openCOLLADA already on system.]),, -+ [with_system_opencollada=no]) -+ - AC_ARG_WITH(system-openldap, - AS_HELP_STRING([--with-system-openldap], - [Use the OpenLDAP LDAP SDK already on system.]),, -@@ -10342,11 +10347,41 @@ if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then - AC_MSG_RESULT([yes]) - ENABLE_COLLADA=TRUE - AC_DEFINE(HAVE_FEATURE_COLLADA,1) -+ AC_MSG_CHECKING([which OPENCOLLADA to use]) -+ if test "$with_system_opencollada" = "yes"; then -+ AC_MSG_RESULT([external]) -+ SYSTEM_OPENCOLLADA=TRUE -+ AS_IF([test -n "$OPENCOLLADA_CFLAGS"],[],[AC_MSG_ERROR([export OPENCOLLADA_CFLAGS])]) -+ AS_IF([test -n "$OPENCOLLADA_LIBS"],[],[AC_MSG_ERROR([export OPENCOLLADA_LIBS])]) -+ AC_LANG_PUSH([C++]) -+ save_CXXFLAGS=$CXXFLAGS -+ save_CPPFLAGS=$CPPFLAGS -+ CXXFLAGS="$CXXFLAGS $OPENCOLLADA_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $OPENCOLLADA_CFLAGS" -+ AC_CHECK_HEADERS( -+ COLLADABU.h \ -+ COLLADAFW.h \ -+ COLLADASaxFWLLoader.h \ -+ GeneratedSaxParser.h, -+ [], -+ [AC_MSG_ERROR([openCOLLADA headers not found. Install openCOLLADA])], -+ []) -+ CXXFLAGS=$save_CXXFLAGS -+ CPPFLAGS=$save_CPPFLAGS -+ AC_LANG_POP([C++]) -+ OPENCOLLADA_CFLAGS=$(printf '%s' "$OPENCOLLADA_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") -+ else -+ AC_MSG_RESULT([internal]) -+ BUILD_TYPE="$BUILD_TYPE OPENCOLLADA" -+ fi - BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" - else - AC_MSG_RESULT([no]) - fi - AC_SUBST(ENABLE_COLLADA) -+AC_SUBST([OPENCOLLADA_CFLAGS]) -+AC_SUBST([OPENCOLLADA_LIBS]) -+AC_SUBST([SYSTEM_OPENCOLLADA]) - - # pdf import? - AC_MSG_CHECKING([whether to build the PDF import feature]) -diff --git a/external/Module_external.mk b/external/Module_external.mk -index c95ea20..688e335 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -75,7 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,NEON,neon) \ - $(call gb_Helper_optional,NSS,nss) \ - $(call gb_Helper_optional,ODFGEN,libodfgen) \ -- $(call gb_Helper_optional,COLLADA2GLTF,opencollada) \ -+ $(call gb_Helper_optional,OPENCOLLADA,opencollada) \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ - $(call gb_Helper_optional,ORCUS,liborcus) \ --- -cgit v0.10.2 - -From bd4e81bab2726cbab30b58a71c25db9b7d1ddb7e Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 20 Oct 2014 18:38:44 +0200 -Subject: put back variable deleted by mistake - -Change-Id: Ic705fe6bb7c3b9bae4b09d0b487f48056675b4b8 - -diff --git a/config_host.mk.in b/config_host.mk.in -index 738c80c..32b5145 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -433,6 +433,7 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ - export OOO_VENDOR=@OOO_VENDOR@ - export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@ - export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@ -+export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ - export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ - export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ - export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ --- -cgit v0.10.2 - diff --git a/editors/libreoffice4/files/extra-Makefile.in b/editors/libreoffice4/files/extra-Makefile.in deleted file mode 100644 index 525c02df260c..000000000000 --- a/editors/libreoffice4/files/extra-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2014-09-16 16:10:41.000000000 -0400 -+++ Makefile.in 2014-10-08 17:49:10.000000000 -0400 -@@ -308,7 +308,7 @@ - @exit 1 - endif - --distro-pack-install: install -+distro-pack-install: install-strip - $(SRCDIR)/bin/distro-install-clean-up - $(SRCDIR)/bin/distro-install-desktop-integration - $(SRCDIR)/bin/distro-install-sdk diff --git a/editors/libreoffice4/files/extra-configure.ac b/editors/libreoffice4/files/extra-configure.ac deleted file mode 100644 index 58f39d630ac7..000000000000 --- a/editors/libreoffice4/files/extra-configure.ac +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.ac.orig 2014-10-23 07:32:50.000000000 -0400 -+++ configure.ac 2014-10-31 00:18:35.000000000 -0400 -@@ -6228,26 +6228,6 @@ - # MSVC supports (a subset of) CXX11 without any switch - HAVE_CXX11=TRUE - CXXFLAGS_CXX11= --elif test "$GCC" = "yes"; then -- CXXFLAGS_CXX11= -- AC_MSG_CHECKING([whether $CXX supports C++11]) -- for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do -- save_CXXFLAGS=$CXXFLAGS -- CXXFLAGS="$CXXFLAGS $flag -Werror" -- AC_LANG_PUSH([C++]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void f() {}]])],[CXXFLAGS_CXX11=$flag]) -- AC_LANG_POP([C++]) -- CXXFLAGS=$save_CXXFLAGS -- if test -n "$CXXFLAGS_CXX11"; then -- HAVE_CXX11=TRUE -- break -- fi -- done -- if test "$HAVE_CXX11" = TRUE; then -- AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)]) -- else -- AC_MSG_RESULT(no) -- fi - fi - - if test $CPP_LIBRARY = GLIBCXX -a "$HAVE_CXX11" = TRUE; then diff --git a/editors/libreoffice4/files/extra-libc++ b/editors/libreoffice4/files/extra-libc++ deleted file mode 100644 index 3650f24f974c..000000000000 --- a/editors/libreoffice4/files/extra-libc++ +++ /dev/null @@ -1,94 +0,0 @@ -From 7511a8eeca171575e878528a1fa434197f1c1f22 Mon Sep 17 00:00:00 2001 -From: Baptiste Daroussin <bapt@FreeBSD.org> -Date: Tue, 10 Jun 2014 18:35:36 +0200 -Subject: [PATCH] Fix build on FreeBSD with libc++ - -Change-Id: Ib51b05eb3f7c5d1288bee0f9f738ab1f37251c3e ---- - bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 32 ++++++++++++++++++++ - .../source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 7 +++++ - 2 files changed, 39 insertions(+) - -diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -index e476119..624d543 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -@@ -31,6 +31,32 @@ - #include "config_gcc.h" - #include "uno/mapping.h" - -+#ifdef _LIBCPP_VERSION -+ -+namespace __cxxabiv1 -+{ -+ struct __class_type_info : public std::type_info -+ { -+ explicit __class_type_info( const char *__n ) : type_info( __n ) { } -+ virtual ~__class_type_info(); -+ }; -+ -+ struct __si_class_type_info : public __class_type_info -+ { -+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) : -+ __class_type_info( __n ), __base_type( __b ) { } -+ virtual ~__si_class_type_info(); -+ const __class_type_info *__base_type; -+ }; -+ -+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; -+ -+extern "C" _LIBCPP_NORETURN void __cxa_throw( -+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); -+} -+ -+#else -+ - namespace CPPU_CURRENT_NAMESPACE - { - -@@ -101,6 +127,8 @@ extern "C" void __cxa_throw( - __attribute__((noreturn)); - } - #endif -+} -+#endif - - namespace CPPU_CURRENT_NAMESPACE - { -@@ -109,7 +137,11 @@ void raiseException( - uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); - - void fillUnoException( -+#ifdef _LIBCPP_VERSION -+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+#else - __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+#endif - } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx -index b520054..f4c70a1 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx -+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx -@@ -285,10 +285,17 @@ static void cpp_call( - catch (...) - { - // fill uno exception -+#ifdef _LIBCPP_VERSION -+ CPPU_CURRENT_NAMESPACE::fillUnoException( -+ reinterpret_cast< __cxxabiv1::__cxa_eh_globals * >( -+ __cxxabiv1::__cxa_get_globals())->caughtExceptions, -+ *ppUnoExc, pThis->getBridge()->getCpp2Uno()); -+#else - fillUnoException( - reinterpret_cast< CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * >( - __cxxabiv1::__cxa_get_globals())->caughtExceptions, - *ppUnoExc, pThis->getBridge()->getCpp2Uno()); -+#endif - - // temporary params - for ( ; nTempIndices--; ) --- -1.7.9.5 - diff --git a/editors/libreoffice4/files/extra-libc++.i386 b/editors/libreoffice4/files/extra-libc++.i386 deleted file mode 100644 index b9004f454a82..000000000000 --- a/editors/libreoffice4/files/extra-libc++.i386 +++ /dev/null @@ -1,84 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2014-09-16 16:10:41.000000000 -0400 -+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx 2014-10-10 18:08:14.000000000 -0400 -@@ -32,10 +32,34 @@ - #include <uno/any2.h> - #include "uno/mapping.h" - --namespace CPPU_CURRENT_NAMESPACE -+#ifdef _LIBCPP_VERSION -+ -+namespace __cxxabiv1 - { -+ struct __class_type_info : public std::type_info -+ { -+ explicit __class_type_info( const char *__n ) : type_info( __n ) { } -+ virtual ~__class_type_info(); -+ }; -+ -+ struct __si_class_type_info : public __class_type_info -+ { -+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) : -+ __class_type_info( __n ), __base_type( __b ) { } -+ virtual ~__si_class_type_info(); -+ const __class_type_info *__base_type; -+ }; - --void dummy_can_throw_anything( char const * ); -+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; -+ -+extern "C" _LIBCPP_NORETURN void __cxa_throw( -+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); -+} -+ -+#else -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ - - // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -@@ -104,16 +128,23 @@ - __attribute__((noreturn)); - } - #endif -+} -+#endif - - namespace CPPU_CURRENT_NAMESPACE - { - -+void dummy_can_throw_anything( char const * ); -+ - void raiseException( - uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); - - void fillUnoException( -+#ifdef _LIBCPP_VERSION -+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+#else - __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -- -+#endif - } - - namespace x86 ---- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2014-09-16 16:10:41.000000000 -0400 -+++ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 2014-10-10 17:59:01.000000000 -0400 -@@ -203,10 +203,17 @@ - catch (...) - { - // fill uno exception -+#ifdef _LIBCPP_VERSION -+ CPPU_CURRENT_NAMESPACE::fillUnoException( -+ reinterpret_cast< __cxxabiv1::__cxa_eh_globals * >( -+ __cxxabiv1::__cxa_get_globals())->caughtExceptions, -+ *ppUnoExc, pThis->getBridge()->getCpp2Uno()); -+#else - fillUnoException( - reinterpret_cast< CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * >( - __cxxabiv1::__cxa_get_globals())->caughtExceptions, - *ppUnoExc, pThis->getBridge()->getCpp2Uno()); -+#endif - - // temporary params - for ( ; nTempIndices--; ) diff --git a/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d b/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d deleted file mode 100644 index fb05313a6578..000000000000 --- a/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d +++ /dev/null @@ -1,183 +0,0 @@ ---- canvas/source/cairo/cairo_spritecanvashelper.cxx.orig 2015-04-20 19:36:29 UTC -+++ canvas/source/cairo/cairo_spritecanvashelper.cxx -@@ -402,11 +402,12 @@ namespace cairocanvas - ::basegfx::computeSetDifference( aUncoveredAreas, - rUpdateArea.maTotalBounds, - ::basegfx::B2DRange( rDestRect ) ); -+ SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface()); - ::std::for_each( aUncoveredAreas.begin(), - aUncoveredAreas.end(), - ::boost::bind( &repaintBackground, - boost::cref(pCompositingCairo), -- boost::cref(mpOwningSpriteCanvas->getBufferSurface()), -+ boost::cref(surface), - _1 ) ); - - cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); ---- canvas/source/vcl/spritecanvashelper.cxx.orig 2015-04-20 19:36:29 UTC -+++ canvas/source/vcl/spritecanvashelper.cxx -@@ -573,12 +573,12 @@ namespace vclcanvas - - // repaint all affected sprites on top of background into - // VDev. -+ ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) ); - ::std::for_each( rSortedUpdateSprites.begin(), - rSortedUpdateSprites.end(), - ::boost::bind( &spriteRedrawStub2, - ::boost::ref( maVDev.get() ), -- ::boost::cref( -- ::vcl::unotools::b2DPointFromPoint(aOutputPosition)), -+ ::boost::cref( outPos ), - _1 ) ); - - // flush to screen ---- dbaccess/source/ui/tabledesign/TableController.cxx.orig 2015-04-20 19:36:29 UTC -+++ dbaccess/source/ui/tabledesign/TableController.cxx -@@ -1392,7 +1392,8 @@ void OTableController::assignTable() - setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); - if(!isEditable()) - { -- ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True ))); -+ sal_Bool t( sal_True ); -+ ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); - } - m_bNew = false; - // be notified when the table is in disposing ---- oox/source/drawingml/table/tablecell.cxx.orig 2015-04-20 19:36:29 UTC -+++ oox/source/drawingml/table/tablecell.cxx -@@ -142,9 +142,9 @@ void applyTableStylePart( const ::oox::c - if (rTableStylePart.getTextColor().isUsed()) - aTextCharProps.maCharColor = rTableStylePart.getTextColor(); - if( rTableStylePart.getTextBoldStyle().is_initialized() ) -- aTextCharProps.moBold = rTableStylePart.getTextBoldStyle(); -+ aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle(); - if( rTableStylePart.getTextItalicStyle().is_initialized() ) -- aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle(); -+ aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle(); - } - - void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) ---- reportdesign/source/core/api/ReportDefinition.cxx.orig 2015-04-20 19:36:29 UTC -+++ reportdesign/source/core/api/ReportDefinition.cxx -@@ -1612,8 +1612,9 @@ void SAL_CALL OReportDefinition::switchT - m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage); - } - // notify our container listeners -+ OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this); - m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>( -- ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage))); -+ ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage))); - } - - uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception) ---- slideshow/source/engine/activities/activitybase.hxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/activities/activitybase.hxx -@@ -111,7 +111,7 @@ protected: - ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const - { return mpAttributeLayer; } - -- bool isRepeatCountValid() const { return maRepeats; } -+ bool isRepeatCountValid() const { return bool(maRepeats); } - double getRepeatCount() const { return *maRepeats; } - bool isAutoReverse() const { return mbAutoReverse; } - ---- slideshow/source/engine/rehearsetimingsactivity.cxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/rehearsetimingsactivity.cxx -@@ -400,11 +400,12 @@ void RehearseTimingsActivity::viewsChang - { - // new sprite pos, transformation might have changed: - maSpriteRectangle = calcSpriteRectangle( maViews.front().first ); -+ ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() ); - - // reposition sprites - for_each_sprite( boost::bind( &cppcanvas::Sprite::move, - _1, -- boost::cref(maSpriteRectangle.getMinimum())) ); -+ boost::cref( rectMin )) ); - - // sprites changed, need screen update - mrScreenUpdater.notifyUpdate(); ---- slideshow/source/engine/shapes/appletshape.cxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/shapes/appletshape.cxx -@@ -148,12 +148,13 @@ namespace slideshow - void AppletShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( AppletShape::getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( - &ViewAppletShape::resize, - _1, -- ::boost::cref( AppletShape::getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - -@@ -252,11 +253,12 @@ namespace slideshow - - bool AppletShape::implStartIntrinsicAnimation() - { -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( &ViewAppletShape::startApplet, - _1, -- ::boost::cref( getBounds() ))); -+ ::boost::cref( bounds ))); - mbIsPlaying = true; - - return true; ---- slideshow/source/engine/shapes/drawshape.cxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/shapes/drawshape.cxx -@@ -168,6 +168,7 @@ namespace slideshow - } - - // redraw all view shapes, by calling their update() method -+ ViewShape::RenderArgs renderArgs( getViewRenderArgs() ); - if( ::std::count_if( maViewShapes.begin(), - maViewShapes.end(), - ::boost::bind<bool>( -@@ -178,8 +179,7 @@ namespace slideshow - // the extra mem_fn. WTF. - _1, - ::boost::cref( mpCurrMtf ), -- ::boost::cref( -- getViewRenderArgs() ), -+ ::boost::cref( renderArgs ), - nUpdateFlags, - isVisible() ) ) - != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) ) ---- slideshow/source/engine/shapes/mediashape.cxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/shapes/mediashape.cxx -@@ -125,12 +125,13 @@ namespace slideshow - void MediaShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewMediaShapes.begin(), - maViewMediaShapes.end(), - ::boost::bind( - &ViewMediaShape::resize, - _1, -- ::boost::cref( getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - ---- slideshow/source/engine/unoviewcontainer.cxx.orig 2015-04-20 19:36:29 UTC -+++ slideshow/source/engine/unoviewcontainer.cxx -@@ -45,11 +45,12 @@ namespace slideshow - const UnoViewVector::iterator aEnd( maViews.end() ); - - // already added? -+ uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView()); - if( ::std::find_if( maViews.begin(), - aEnd, - ::boost::bind( - ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), -- ::boost::cref( rView->getUnoView() ), -+ ::boost::cref( xView ), - ::boost::bind( - &UnoView::getUnoView, - _1 ) ) ) != aEnd ) diff --git a/editors/libreoffice4/files/patch-avmedia__Library_avmediaogl.mk b/editors/libreoffice4/files/patch-avmedia__Library_avmediaogl.mk deleted file mode 100644 index 3c03d7bad785..000000000000 --- a/editors/libreoffice4/files/patch-avmedia__Library_avmediaogl.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- avmedia/Library_avmediaogl.mk.orig 2014-11-10 06:52:56.000000000 -0500 -+++ avmedia/Library_avmediaogl.mk 2014-11-25 15:42:07.000000000 -0500 -@@ -53,7 +53,7 @@ - $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ - OpenGL \ - )) --else ifeq ($(OS),LINUX) -+else ifneq ($(filter FREEBSD LINUX,$(OS)),) - $(eval $(call gb_Library_add_libs,avmediaogl,\ - -lGL \ - )) diff --git a/editors/libreoffice4/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice4/files/patch-bin__distro-install-desktop-integration deleted file mode 100644 index 9d2f21886c02..000000000000 --- a/editors/libreoffice4/files/patch-bin__distro-install-desktop-integration +++ /dev/null @@ -1,66 +0,0 @@ ---- bin/distro-install-desktop-integration.orig 2014-09-16 16:10:41.000000000 -0400 -+++ bin/distro-install-desktop-integration 2014-10-08 17:00:29.000000000 -0400 -@@ -94,13 +94,13 @@ - } - - # install desktop integration from plain packages --sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` -+sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` - cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" - cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" - builddir=`pwd` - cd $sysui_temp - # we want non-versioned stuff in the distro packages --sed -i \ -+sed -i "" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ - -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -111,9 +111,11 @@ - export PREFIX=$INSTALLDIRNAME - export ICON_PREFIX=$INSTALLDIRNAME - export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons -+ export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata - export PRODUCTVERSION= - export KDEMAINDIR=$PREFIXDIR - export GNOMEDIR=$PREFIXDIR -+ export PREFIXDIR=$PREFIXDIR - export GNOME_MIME_THEME=hicolor - bash ./create_tree.sh - ) -@@ -129,7 +131,7 @@ - # we want non-versioned desktop files - cd $DESTDIR/$INSTALLDIR/share/xdg - # we want non-versioned stuff in the distro packages --sed -i \ -+sed -i "" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ - -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ - -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -144,7 +146,7 @@ - $PREFIXDIR/share/mime/packages \ - $PREFIXDIR/share/mime-info \ - $PREFIXDIR/share/icons ; do -- find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand -+ find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand - done - fi - -@@ -176,12 +178,12 @@ - test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand - - # create bash completion --mkdir -p $DESTDIR/etc/bash_completion.d --./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh --test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand -+mkdir -p $DESTDIR$PREFIXDIR/etc/bash_completion.d -+./bin/generate-bash-completion bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh -+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand - if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then -- ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh -- test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand -+ ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/ooffice.sh -+ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand - fi - - echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath"; diff --git a/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx b/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx deleted file mode 100644 index 0eced6fa0540..000000000000 --- a/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_intel__except.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig 2014-04-22 18:25:28.000000000 -0400 -+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 2014-05-06 16:19:42.000000000 -0400 -@@ -20,6 +20,10 @@ - #include <cstdio> - #include <cstring> - #include <dlfcn.h> -+#if defined(FREEBSD) -+#include <sys/param.h> -+#endif -+ - #include <boost/unordered_map.hpp> - - #include <cxxabi.h> diff --git a/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx b/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx deleted file mode 100644 index 1f7979c54001..000000000000 --- a/editors/libreoffice4/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__except.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx.orig 2014-04-22 18:25:28.000000000 -0400 -+++ bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2014-05-06 16:19:44.000000000 -0400 -@@ -21,6 +21,9 @@ - #include <stdio.h> - #include <string.h> - #include <dlfcn.h> -+#if defined(FREEBSD) -+#include <sys/param.h> -+#endif - - #include <cxxabi.h> - #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h diff --git a/editors/libreoffice4/files/patch-chart2__Library_chartcore.mk b/editors/libreoffice4/files/patch-chart2__Library_chartcore.mk deleted file mode 100644 index d0b9567c3f11..000000000000 --- a/editors/libreoffice4/files/patch-chart2__Library_chartcore.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- chart2/Library_chartcore.mk.orig 2014-11-10 06:52:56.000000000 -0500 -+++ chart2/Library_chartcore.mk 2014-11-25 16:17:07.000000000 -0500 -@@ -261,6 +261,11 @@ - $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ - OpenGL \ - )) -+else ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,chartcore,\ -+ -lGL \ -+ -lX11 \ -+)) - else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,chartcore,\ - -ldl \ diff --git a/editors/libreoffice4/files/patch-chart2__Library_chartopengl.mk b/editors/libreoffice4/files/patch-chart2__Library_chartopengl.mk deleted file mode 100644 index 610d14f9eecd..000000000000 --- a/editors/libreoffice4/files/patch-chart2__Library_chartopengl.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- chart2/Library_chartopengl.mk.orig 2014-11-10 06:52:56.000000000 -0500 -+++ chart2/Library_chartopengl.mk 2014-11-25 16:22:54.000000000 -0500 -@@ -67,6 +67,11 @@ - $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ - OpenGL \ - )) -+else ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,chartopengl,\ -+ -lGL \ -+ -lX11 \ -+)) - else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,chartopengl,\ - -ldl \ diff --git a/editors/libreoffice4/files/patch-configure.ac b/editors/libreoffice4/files/patch-configure.ac deleted file mode 100644 index d10b2fb99dec..000000000000 --- a/editors/libreoffice4/files/patch-configure.ac +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.ac.orig 2015-04-20 19:36:29 UTC -+++ configure.ac -@@ -7798,7 +7798,7 @@ dnl Check for system libcmis - dnl =================================================================== - # libcmis requires curl and we can't build curl for iOS - if test $_os != iOS; then -- libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0]) -+ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.5 >= 0.5.0]) - ENABLE_CMIS=TRUE - else - ENABLE_CMIS= -@@ -9428,7 +9428,7 @@ if test "$enable_openssl" = "yes"; then - - with_system_openssl=no - libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) -- elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ -+ elif test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ - && test "$with_system_openssl" != "no"; then - with_system_openssl=yes - SYSTEM_OPENSSL=TRUE diff --git a/editors/libreoffice4/files/patch-external__collada2gltf__patches__kill_c++11_code.patch.1 b/editors/libreoffice4/files/patch-external__collada2gltf__patches__kill_c++11_code.patch.1 deleted file mode 100644 index 8a392f3887a2..000000000000 --- a/editors/libreoffice4/files/patch-external__collada2gltf__patches__kill_c++11_code.patch.1 +++ /dev/null @@ -1,475 +0,0 @@ ---- external/collada2gltf/patches/kill_c++11_code.patch.1.orig 2014-11-10 06:52:56.000000000 -0500 -+++ external/collada2gltf/patches/kill_c++11_code.patch.1 2014-12-05 12:32:23.000000000 -0500 -@@ -1531,8 +1531,8 @@ - - - diff -ur collada2gltf.org/extensions/o3dgc-compression/GLTF-Open3DGC.cpp collada2gltf/extensions/o3dgc-compression/GLTF-Open3DGC.cpp ----- collada2gltf.org/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 2014-09-29 15:30:40.134494471 +0200 --+++ collada2gltf/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 2014-09-29 15:55:51.898551665 +0200 -+--- collada2gltf.org/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 2014-05-25 05:30:45.143840000 -0400 -++++ collada2gltf/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 2014-10-31 01:56:34.000000000 -0400 - @@ -138,7 +138,7 @@ - return true; - } -@@ -1563,7 +1563,7 @@ - - for (unsigned int i = 0 ; i < primitivesCount ; i++) { - - shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); --+ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - if (primitive->getPrimitive() != profile->getGLenumForString("TRIANGLES")) { - return false; - } -@@ -1590,7 +1590,7 @@ - for (unsigned int i = 0 ; i < primitivesCount ; i++) { - - shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); - - shared_ptr <GLTF::GLTFAccessor> uniqueIndices = primitive->getIndices(); --+ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - + boost::shared_ptr <GLTF::GLTFAccessor> uniqueIndices = primitive->getIndices(); - unsigned int indicesCount = (unsigned int)(uniqueIndices->getCount()); - //FIXME: assumes triangles, but we are guarded from issues by canEncodeOpen3DGCMesh -@@ -1601,7 +1601,7 @@ - allTrianglesCount += trianglesCount; - - shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); - - shared_ptr <GLTF::GLTFAccessor> uniqueIndices = primitive->getIndices(); --+ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr<GLTF::GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - + boost::shared_ptr <GLTF::GLTFAccessor> uniqueIndices = primitive->getIndices(); - unsigned int indicesCount = (unsigned int)(uniqueIndices->getCount()); - unsigned int* indicesPtr = (unsigned int*)uniqueIndices->getBufferView()->getBufferDataByApplyingOffset(); -@@ -1620,7 +1620,7 @@ - params.SetNumFloatAttributes(nFloatAttributes); - ifs.SetNumFloatAttributes(nFloatAttributes); - - shared_ptr<JSONObject> compressionObject = static_pointer_cast<JSONObject>(mesh->getExtensions()->createObjectIfNeeded("Open3DGC-compression")); --+ boost::shared_ptr<JSONObject> compressionObject = static_pointer_cast<JSONObject>(mesh->getExtensions()->createObjectIfNeeded("Open3DGC-compression")); -++ boost::shared_ptr<JSONObject> compressionObject = boost::static_pointer_cast<JSONObject>(mesh->getExtensions()->createObjectIfNeeded("Open3DGC-compression")); - - ifs.ComputeMinMax(O3DGC_SC3DMC_MAX_ALL_DIMS); - BinaryStream bstream(vertexCount * 8); -@@ -4251,9 +4251,30 @@ - - #endif - diff -ur collada2gltf.org/helpers/geometryHelpers.cpp collada2gltf/helpers/geometryHelpers.cpp ----- collada2gltf.org/helpers/geometryHelpers.cpp 2014-09-29 15:30:40.146494472 +0200 --+++ collada2gltf/helpers/geometryHelpers.cpp 2014-09-29 16:01:12.134563781 +0200 --@@ -193,8 +193,8 @@ -+--- collada2gltf.org/helpers/geometryHelpers.cpp 2014-05-25 05:30:45.143840000 -0400 -++++ collada2gltf/helpers/geometryHelpers.cpp 2014-12-05 12:27:58.000000000 -0500 -+@@ -26,6 +26,8 @@ -+ #include <stdlib.h> -+ #include "geometryHelpers.h" -+ -++#include <boost/unordered_map.hpp> -++ -+ using namespace rapidjson; -+ #if __cplusplus <= 199711L -+ using namespace std::tr1; -+@@ -121,9 +123,9 @@ -+ } -+ }; -+ -+- typedef unordered_map<unsigned int* ,unsigned int /* index of existing n-uplet of indices */, RemappedMeshIndexesHash, RemappedMeshIndexesEq> RemappedMeshIndexesHashmap; -++ typedef boost::unordered_map<unsigned int* ,unsigned int /* index of existing n-uplet of indices */, RemappedMeshIndexesHash, RemappedMeshIndexesEq> RemappedMeshIndexesHashmap; -+ -+- typedef unordered_map<unsigned int ,unsigned int> IndicesMap; -++ typedef boost::unordered_map<unsigned int ,unsigned int> IndicesMap; -+ -+ //FIXME: this could be just an intermediate anonymous(no id) GLTFBuffer -+ class GLTFPrimitiveRemapInfos -+@@ -193,8 +195,8 @@ - for (size_t meshAttributeIndex = 0 ; meshAttributeIndex < count; meshAttributeIndex++) { - MeshAttributesBufferInfos *bufferInfos = &allBufferInfos[meshAttributeIndex]; - -@@ -4264,7 +4285,7 @@ - - if (originalMeshAttribute->elementByteLength() != remappedMeshAttribute->elementByteLength()) { - // FIXME : report error --@@ -213,12 +213,12 @@ -+@@ -213,12 +215,12 @@ - return allBufferInfos; - } - -@@ -4280,7 +4301,7 @@ - unsigned int* remapTableForPositions /* we fill/keep this to be able to remap skin weight/bone indices later on*/) - { - size_t indicesSize = allIndices.size(); --@@ -267,14 +267,14 @@ -+@@ -267,14 +269,14 @@ - } - - -@@ -4298,7 +4319,7 @@ - { - unsigned int generatedIndicesCount = 0; - --@@ -317,10 +317,10 @@ -+@@ -317,10 +319,10 @@ - } - - endIndex = currentIndex; -@@ -4312,7 +4333,7 @@ - - indices->setBufferView(indicesBufferView); - indices->setCount(vertexIndicesCount); --@@ -334,20 +334,20 @@ -+@@ -334,20 +336,20 @@ - - #define DUMP_UNIFIED_INDEXES_INFO 0 - -@@ -4338,7 +4359,7 @@ - printf("vertex source cout :%d\n",(int)vertexSource->getCount()); - } - #endif --@@ -358,7 +358,7 @@ -+@@ -358,7 +360,7 @@ - - if (primitiveCount == 0) { - // FIXME: report error -@@ -4347,7 +4368,7 @@ - } - - //in originalMeshAttributes we'll get the flattened list of all the meshAttributes as a vector. --@@ -370,7 +370,7 @@ -+@@ -370,7 +372,7 @@ - GLTF::Semantic semantic = allSemantics[i]; - size_t attributesCount = sourceMesh->getMeshAttributesCountForSemantic(semantic); - for (size_t j = 0 ; j < attributesCount ; j ++) { -@@ -4356,7 +4377,7 @@ - unsigned int indexSet = j; - std::string semanticIndexSetKey = keyWithSemanticAndSet(semantic, indexSet); - unsigned int size = (unsigned int)originalMeshAttributes.size(); --@@ -382,16 +382,16 @@ -+@@ -382,16 +384,16 @@ - - maxVertexAttributes = (unsigned int)originalMeshAttributes.size(); - -@@ -4372,23 +4393,23 @@ - unsigned int* indicesInRemapping = (unsigned int*)malloc(sizeof(unsigned int) * allIndices->size()); - - - shared_ptr<GLTFPrimitive> sourcePrimitive = static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); --+ boost::shared_ptr<GLTFPrimitive> sourcePrimitive = static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); -++ boost::shared_ptr<GLTFPrimitive> sourcePrimitive = boost::static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); - VertexAttributeVector vertexAttributes = sourcePrimitive->getVertexAttributes(); - for (unsigned int k = 0 ; k < allIndices->size() ; k++) { - GLTF::Semantic semantic = vertexAttributes[k]->getSemantic(); --@@ -401,9 +401,9 @@ -+@@ -401,9 +403,9 @@ - indicesInRemapping[k] = idx; - } - - - shared_ptr<GLTFPrimitive> targetPrimitive = static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); --+ boost::shared_ptr<GLTFPrimitive> targetPrimitive = static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); -++ boost::shared_ptr<GLTFPrimitive> targetPrimitive = boost::static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); - - - shared_ptr<GLTF::GLTFPrimitiveRemapInfos> primitiveRemapInfos = __BuildPrimitiveUniqueIndexes(targetPrimitive, *allIndices, remappedMeshIndexesMap, indicesInRemapping, startIndex, maxVertexAttributes, endIndex, profile); - + boost::shared_ptr<GLTF::GLTFPrimitiveRemapInfos> primitiveRemapInfos = __BuildPrimitiveUniqueIndexes(targetPrimitive, *allIndices, remappedMeshIndexesMap, indicesInRemapping, startIndex, maxVertexAttributes, endIndex, profile); - - free(indicesInRemapping); - --@@ -412,7 +412,7 @@ -+@@ -412,7 +414,7 @@ - allPrimitiveRemapInfos.push_back(primitiveRemapInfos); - } else { - // FIXME: report error -@@ -4397,7 +4418,7 @@ - } - } - --@@ -427,14 +427,14 @@ -+@@ -427,14 +429,14 @@ - GLTF::Semantic semantic = allSemantics[i]; - size_t attributesCount = sourceMesh->getMeshAttributesCountForSemantic(semantic); - for (size_t j = 0 ; j < attributesCount ; j ++) { -@@ -4416,7 +4437,7 @@ - remappedMeshAttribute->setBufferView(remappedBufferView); - remappedMeshAttribute->setCount(vertexCount); - --@@ -452,10 +452,10 @@ -+@@ -452,10 +454,10 @@ - */ - - for (unsigned int i = 0 ; i < primitiveCount ; i++) { -@@ -4425,20 +4446,20 @@ - IndicesVector *allIndices = allIndicesSharedPtr.get(); - unsigned int* indicesInRemapping = (unsigned int*)calloc(sizeof(unsigned int) * (*allIndices).size(), 1); - - shared_ptr<GLTFPrimitive> sourcePrimitive = static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); --+ boost::shared_ptr<GLTFPrimitive> sourcePrimitive = static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); -++ boost::shared_ptr<GLTFPrimitive> sourcePrimitive = boost::static_pointer_cast<GLTFPrimitive>(sourcePrimitives[i]); - VertexAttributeVector vertexAttributes = sourcePrimitive->getVertexAttributes(); - - for (unsigned int k = 0 ; k < (*allIndices).size() ; k++) { --@@ -466,7 +466,7 @@ -+@@ -466,7 +468,7 @@ - indicesInRemapping[k] = idx; - } - - - shared_ptr<GLTFPrimitive> targetPrimitive = static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); --+ boost::shared_ptr<GLTFPrimitive> targetPrimitive = static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); -++ boost::shared_ptr<GLTFPrimitive> targetPrimitive = boost::static_pointer_cast<GLTFPrimitive>(targetPrimitives[i]); - bool status = __RemapPrimitiveVertices(targetPrimitive, - (*allIndices), - originalMeshAttributes , --@@ -478,13 +478,13 @@ -+@@ -478,13 +480,13 @@ - - if (!status) { - // FIXME: report error -@@ -4454,7 +4475,7 @@ - printf("vertex dest count :%d\n",(int)vertexSource->getCount()); - } - #endif --@@ -496,7 +496,7 @@ -+@@ -496,7 +498,7 @@ - - class SubMeshContext { - public: -@@ -4463,7 +4484,7 @@ - //For each sub mesh being built, maintain 2 maps, - //with key:indice value: remapped indice - IndicesMap indexToRemappedIndex; --@@ -505,7 +505,7 @@ -+@@ -505,7 +507,7 @@ - SubMeshContext* __CreateSubMeshContext(const std::string& id) - { - SubMeshContext *subMesh = new SubMeshContext(); -@@ -4472,7 +4493,7 @@ - targetMesh->setID(id); - subMesh->targetMesh = targetMesh; - --@@ -554,9 +554,9 @@ -+@@ -554,9 +556,9 @@ - GLTF::Semantic semantic = allSemantics[i]; - size_t attributesCount = sourceMesh->getMeshAttributesCountForSemantic(semantic); - for (size_t j = 0 ; j < attributesCount ; j ++) { -@@ -4484,7 +4505,7 @@ - - unsigned int vertexAttributeCount = (unsigned int)subMesh->indexToRemappedIndex.size(); - --@@ -568,10 +568,10 @@ -+@@ -568,10 +570,10 @@ - context[1] = subMesh; - selectedMeshAttribute->applyOnAccessor(__RemapMeshAttribute, (void*)context); - -@@ -4497,7 +4518,7 @@ - remappedMeshAttribute->setBufferView(remappedBufferView); - remappedMeshAttribute->setCount(vertexAttributeCount); - --@@ -580,35 +580,35 @@ -+@@ -580,35 +582,35 @@ - } - } - -@@ -4511,7 +4532,7 @@ - - for (size_t i = 0 ; i < primitives.size() ; i++) { - - shared_ptr<GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); --+ boost::shared_ptr<GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr<GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - } - - if (!splitNeeded) -@@ -4541,7 +4562,7 @@ - subMesh = __CreateSubMeshContext(sourceMesh->getID()); - targetMesh = subMesh->targetMesh; - } --@@ -628,15 +628,15 @@ -+@@ -628,15 +630,15 @@ - meshIndex++; - } - -@@ -4549,7 +4570,7 @@ - + boost::shared_ptr <GLTFPrimitive> targetPrimitive; - //when we are done with a primitive we mark its nextIndice with a -1 - - shared_ptr<GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive> (primitives[i]); --+ boost::shared_ptr<GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive> (primitives[i]); -++ boost::shared_ptr<GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive> (primitives[i]); - - - targetPrimitive = shared_ptr <GLTFPrimitive> (new GLTFPrimitive((*primitive))); - + targetPrimitive = boost::shared_ptr <GLTFPrimitive> (new GLTFPrimitive((*primitive))); -@@ -4561,7 +4582,7 @@ - - unsigned int* indicesPtr = (unsigned int*)indices->getBufferView()->getBufferDataByApplyingOffset(); - unsigned int* targetIndicesPtr = (unsigned int*)malloc(indices->getBufferView()->getBuffer()->getByteLength()); --@@ -690,9 +690,9 @@ -+@@ -690,9 +692,9 @@ - allNextPrimitiveIndices[i] = nextPrimitiveIndex; - - if (targetIndicesCount > 0) { -@@ -4573,7 +4594,7 @@ - - indices->setBufferView(targetBufferView); - indices->setCount(targetIndicesCount); --@@ -728,7 +728,7 @@ -+@@ -728,7 +730,7 @@ - //Not required anymore since Open3DGC supports now sharing same vertex buffer and WebGL is disabled - //DO NOT REMOVE - might be useful again someday - /* -@@ -4582,7 +4603,7 @@ - GLTF::JSONValueVector primitives = sourceMesh->getPrimitives()->values(); - if (primitives.size() == 1) { - return false; --@@ -738,9 +738,9 @@ -+@@ -738,9 +740,9 @@ - - for (size_t i = 0 ; i < primitiveCount ; i++) { - IndicesMap remappedIndices; -@@ -4590,12 +4611,12 @@ - - shared_ptr <GLTFPrimitive> refPrimitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); - - shared_ptr <GLTFPrimitive> targetPrimitive = shared_ptr <GLTFPrimitive> (new GLTFPrimitive((*refPrimitive))); - + boost::shared_ptr <GLTFMesh> targetMesh = boost::shared_ptr <GLTFMesh> (new GLTFMesh()); --+ boost::shared_ptr <GLTFPrimitive> refPrimitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr <GLTFPrimitive> refPrimitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - + boost::shared_ptr <GLTFPrimitive> targetPrimitive = boost::shared_ptr <GLTFPrimitive> (new GLTFPrimitive((*refPrimitive))); - - targetMesh->appendPrimitive(targetPrimitive); - --@@ -759,9 +759,9 @@ -+@@ -759,9 +761,9 @@ - } - } - -@@ -4607,12 +4628,12 @@ - - indices->setBufferView(targetIndicesView); - indices->setCount(indicesCount); --@@ -770,21 +770,21 @@ -+@@ -770,21 +772,21 @@ - - - // Now for each mesh attribute in the mesh, create another one just for the primitive - - shared_ptr <GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); --+ boost::shared_ptr <GLTFPrimitive> primitive = static_pointer_cast<GLTFPrimitive>(primitives[i]); -++ boost::shared_ptr <GLTFPrimitive> primitive = boost::static_pointer_cast<GLTFPrimitive>(primitives[i]); - VertexAttributeVector vertexAttributes = primitive->getVertexAttributes(); - for (size_t j = 0 ; j < vertexAttributes.size() ; j++) { - Semantic semantic = vertexAttributes[j]->getSemantic(); -@@ -4633,7 +4654,7 @@ - targetAttribute->setCount(targetVertexCount); - targetAttribute->setBufferView(targetAttributeBufferView); - --@@ -811,4 +811,4 @@ -+@@ -811,4 +813,4 @@ - } - */ - -@@ -4786,8 +4807,8 @@ - if (JSONValue::isEqualTo(value) == true) - return true; - diff -ur collada2gltf.org/JSON/JSONObject.cpp collada2gltf/JSON/JSONObject.cpp ----- collada2gltf.org/JSON/JSONObject.cpp 2014-09-29 15:30:40.142494472 +0200 --+++ collada2gltf/JSON/JSONObject.cpp 2014-09-29 15:48:14.562534363 +0200 -+--- collada2gltf.org/JSON/JSONObject.cpp 2014-05-25 05:30:45.116840000 -0400 -++++ collada2gltf/JSON/JSONObject.cpp 2014-10-31 01:56:34.000000000 -0400 - @@ -38,8 +38,8 @@ - namespace GLTF - { -@@ -4815,7 +4836,7 @@ - array->_parseRapidJSONArray(currentValue); - this->setValue(key, array); - } --@@ -128,10 +128,10 @@ -+@@ -128,30 +128,30 @@ - { - } - -@@ -4828,8 +4849,9 @@ - + outObject = boost::shared_ptr <GLTF::JSONObject> (new GLTF::JSONObject()); - setValue(key, outObject); - } else { -- outObject = static_pointer_cast <GLTF::JSONObject> (getValue(key)); --@@ -139,10 +139,10 @@ -+- outObject = static_pointer_cast <GLTF::JSONObject> (getValue(key)); -++ outObject = boost::static_pointer_cast <GLTF::JSONObject> (getValue(key)); -+ } - return outObject; - } - -@@ -4842,8 +4864,10 @@ - + outObject = boost::shared_ptr <GLTF::JSONArray> (new GLTF::JSONArray()); - setValue(key, outObject); - } else { -- outObject = static_pointer_cast <GLTF::JSONArray> (getValue(key)); --@@ -151,7 +151,7 @@ -+- outObject = static_pointer_cast <GLTF::JSONArray> (getValue(key)); -++ outObject = boost::static_pointer_cast <GLTF::JSONArray> (getValue(key)); -+ } -+ return outObject; - } - - -@@ -4863,16 +4887,18 @@ - - - shared_ptr <JSONObject> JSONObject::getObject(const std::string &key) { - - shared_ptr <JSONValue> value = this->_keyToJSONValue[key]; -+- return static_pointer_cast <JSONObject> (value); - + boost::shared_ptr <JSONObject> JSONObject::getObject(const std::string &key) { - + boost::shared_ptr <JSONValue> value = this->_keyToJSONValue[key]; -- return static_pointer_cast <JSONObject> (value); -++ return boost::static_pointer_cast <JSONObject> (value); - } - - - shared_ptr <JSONArray> JSONObject::getArray(const std::string &key) { - - shared_ptr <JSONValue> value = this->_keyToJSONValue[key]; -+- return static_pointer_cast <JSONArray> (value); - + boost::shared_ptr <JSONArray> JSONObject::getArray(const std::string &key) { - + boost::shared_ptr <JSONValue> value = this->_keyToJSONValue[key]; -- return static_pointer_cast <JSONArray> (value); -++ return boost::static_pointer_cast <JSONArray> (value); - } - - void JSONObject::setUnsignedInt32(const std::string &key, unsigned int value) { -@@ -4883,7 +4909,7 @@ - unsigned int JSONObject::getUnsignedInt32(const std::string &key) { - if (this->contains(key)) { - - shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); --+ boost::shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); -++ boost::shared_ptr <JSONNumber> number = boost::static_pointer_cast <JSONNumber> (this->getValue(key)); - return number->getUnsignedInt32(); - } - return 0; -@@ -4897,7 +4923,7 @@ - bool JSONObject::getBool(const std::string &key) { - if (this->contains(key)) { - - shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); --+ boost::shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); -++ boost::shared_ptr <JSONNumber> number = boost::static_pointer_cast <JSONNumber> (this->getValue(key)); - - return number->getBool(); - } -@@ -4912,7 +4938,7 @@ - int JSONObject::getInt32(const std::string &key) { - if (this->contains(key)) { - - shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); --+ boost::shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); -++ boost::shared_ptr <JSONNumber> number = boost::static_pointer_cast <JSONNumber> (this->getValue(key)); - return number->getInt32(); - } - return 0; -@@ -4926,7 +4952,7 @@ - double JSONObject::getDouble(const std::string &key) { - if (this->contains(key)) { - - shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); --+ boost::shared_ptr <JSONNumber> number = static_pointer_cast <JSONNumber> (this->getValue(key)); -++ boost::shared_ptr <JSONNumber> number = boost::static_pointer_cast <JSONNumber> (this->getValue(key)); - return number->getDouble(); - } - return 0; -@@ -4940,7 +4966,7 @@ - const std::string JSONObject::getString(const std::string &key) { - if (this->contains(key)) { - - shared_ptr <JSONString> str = static_pointer_cast <JSONString> (this->getValue(key)); --+ boost::shared_ptr <JSONString> str = static_pointer_cast <JSONString> (this->getValue(key)); -++ boost::shared_ptr <JSONString> str = boost::static_pointer_cast <JSONString> (this->getValue(key)); - return str->getString(); - } - return ""; -@@ -4994,7 +5020,7 @@ - JSONValueVectorRef allKeys = keysA->values(); - for (size_t i = 0 ; i < allKeys.size() ; i++) { - - shared_ptr<JSONString> key = static_pointer_cast<JSONString>(allKeys[i]); --+ boost::shared_ptr<JSONString> key = static_pointer_cast<JSONString>(allKeys[i]); -++ boost::shared_ptr<JSONString> key = boost::static_pointer_cast<JSONString>(allKeys[i]); - - - shared_ptr<JSONValue> objA = this->getValue(key->getString()); - - shared_ptr<JSONValue> objB = objectValue->getValue(key->getString()); diff --git a/editors/libreoffice4/files/patch-i18npool__CustomTarget_breakiterator.mk b/editors/libreoffice4/files/patch-i18npool__CustomTarget_breakiterator.mk deleted file mode 100644 index 3e173ac57299..000000000000 --- a/editors/libreoffice4/files/patch-i18npool__CustomTarget_breakiterator.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- i18npool/CustomTarget_breakiterator.mk.orig 2014-09-16 16:10:41.000000000 -0400 -+++ i18npool/CustomTarget_breakiterator.mk 2014-10-08 17:23:21.000000000 -0400 -@@ -98,7 +98,7 @@ - # sed substitution... - $(i18npool_BIDIR)/%.txt : \ - $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir -- sed -e ': dummy' \ -+ $(GNUSED) -e ': dummy' \ - $(if $(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),-e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \ - $(if $(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER),,\ - -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \ diff --git a/editors/libreoffice4/files/patch-i18npool_source_breakiterator_breakiterator__unicode.cxx b/editors/libreoffice4/files/patch-i18npool_source_breakiterator_breakiterator__unicode.cxx deleted file mode 100644 index 2d1082bc42c5..000000000000 --- a/editors/libreoffice4/files/patch-i18npool_source_breakiterator_breakiterator__unicode.cxx +++ /dev/null @@ -1,42 +0,0 @@ -Minimal exceprt from upstream fix only to unbreak build - -https://cgit.freedesktop.org/libreoffice/core/commit/?id=3e42714c76b1347babfdea0564009d8d82a83af4 - ---- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2015-04-20 19:36:29 UTC -+++ i18npool/source/breakiterator/breakiterator_unicode.cxx -@@ -65,10 +65,13 @@ BreakIterator_Unicode::~BreakIterator_Un - class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator - { - public: -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. - inline void publicSetBreakType(int32_t type) - { - setBreakType(type); - }; -+#endif - OOoRuleBasedBreakIterator(UDataMemory* image, - UErrorCode &status) - : RuleBasedBreakIterator(image, status) -@@ -144,12 +147,21 @@ void SAL_CALL BreakIterator_Unicode::loa - } - } - if (rbi) { -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private -+ // instead of protected, so the old workaround of -+ // https://ssl.icu-project.org/trac/ticket/5498 -+ // doesn't work anymore. However, they also claim to have fixed -+ // the cause that an initial fBreakType==-1 would lead to an -+ // endless loop under some circumstances. -+ // Let's see ... - switch (rBreakType) { - case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; - case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; - case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; - case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; - } -+#endif - icuBI->aBreakIterator = rbi; - } - } diff --git a/editors/libreoffice4/files/patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx b/editors/libreoffice4/files/patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx deleted file mode 100644 index b66898b99345..000000000000 --- a/editors/libreoffice4/files/patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx +++ /dev/null @@ -1,14 +0,0 @@ -Minimal exceprt from upstream fix only to unbreak build - -https://cgit.freedesktop.org/libreoffice/core/commit/?id=072b32442e3f6f220936a93ad1fcbde57746b747 - ---- lingucomponent/source/spellcheck/spell/sspellimp.cxx.orig 2016-01-29 07:10:27 UTC -+++ lingucomponent/source/spellcheck/spell/sspellimp.cxx -@@ -37,7 +37,6 @@ - - #include <lingutil.hxx> - #include <hunspell.hxx> --#include <dictmgr.hxx> - #include <sspellimp.hxx> - - #include <linguistic/lngprops.hxx> diff --git a/editors/libreoffice4/files/patch-sal__osl__unx__backtrace.c b/editors/libreoffice4/files/patch-sal__osl__unx__backtrace.c deleted file mode 100644 index 9d45eb142fc2..000000000000 --- a/editors/libreoffice4/files/patch-sal__osl__unx__backtrace.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sal/osl/unx/backtrace.c.orig 2014-09-16 16:10:41.000000000 -0400 -+++ sal/osl/unx/backtrace.c 2014-10-14 15:52:40.000000000 -0400 -@@ -177,15 +177,15 @@ - if ( dli.dli_fname && dli.dli_fbase ) - { - offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -- fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ fprintf( fp, "%s+0x%tx", dli.dli_fname, offset ); - } - if ( dli.dli_sname && dli.dli_saddr ) - { - offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -- fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset ); - } - } -- fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ fprintf( fp, "[%p]\n", *pFramePtr ); - } - fflush( fp ); - fclose( fp ); diff --git a/editors/libreoffice4/files/patch-sal__osl__unx__system.c b/editors/libreoffice4/files/patch-sal__osl__unx__system.c deleted file mode 100644 index 3e139dbfe30e..000000000000 --- a/editors/libreoffice4/files/patch-sal__osl__unx__system.c +++ /dev/null @@ -1,12 +0,0 @@ ---- sal/osl/unx/system.c.orig 2014-09-16 16:10:41.000000000 -0400 -+++ sal/osl/unx/system.c 2014-10-14 15:48:58.000000000 -0400 -@@ -298,6 +298,9 @@ - #endif /* NO_PTHREAD_RTL */ - - #if defined(FREEBSD) -+ -+#include <math.h> -+ - char *fcvt(double value, int ndigit, int *decpt, int *sign) - { - static char ret[256]; diff --git a/editors/libreoffice4/files/patch-sal__osl__unx__system.h b/editors/libreoffice4/files/patch-sal__osl__unx__system.h deleted file mode 100644 index 625b745b6004..000000000000 --- a/editors/libreoffice4/files/patch-sal__osl__unx__system.h +++ /dev/null @@ -1,13 +0,0 @@ ---- sal/osl/unx/system.h.orig 2014-09-16 16:10:41.000000000 -0400 -+++ sal/osl/unx/system.h 2014-10-14 14:31:50.000000000 -0400 -@@ -113,7 +113,9 @@ - #endif - - #ifdef FREEBSD --# define ETIME ETIMEDOUT -+# ifndef ETIME -+# define ETIME ETIMEDOUT -+# endif - # include <pthread.h> - # include <sys/sem.h> - # include <dlfcn.h> diff --git a/editors/libreoffice4/files/patch-sd__Module_sd.mk b/editors/libreoffice4/files/patch-sd__Module_sd.mk deleted file mode 100644 index 14081cf28498..000000000000 --- a/editors/libreoffice4/files/patch-sd__Module_sd.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- sd/Module_sd.mk.orig 2013-12-11 01:11:21.000000000 +0900 -+++ sd/Module_sd.mk 2014-01-29 17:01:07.000000000 +0900 -@@ -24,7 +24,6 @@ - - ifneq ($(OS),DRAGONFLY) - $(eval $(call gb_Module_add_check_targets,sd,\ -- CppunitTest_sd_uimpress \ - CppunitTest_sd_import_tests \ - CppunitTest_sd_filters_test \ - )) diff --git a/editors/libreoffice4/files/patch-shell__Module_shell.mk b/editors/libreoffice4/files/patch-shell__Module_shell.mk deleted file mode 100644 index 6e189e2102ef..000000000000 --- a/editors/libreoffice4/files/patch-shell__Module_shell.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- shell/Module_shell.mk.orig 2014-06-12 04:25:19.000000000 -0400 -+++ shell/Module_shell.mk 2014-06-23 18:40:42.000000000 -0400 -@@ -14,7 +14,7 @@ - Library_localebe \ - )) - --ifeq ($(OS),LINUX) -+ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) - ifeq ($(ENABLE_GIO),TRUE) - $(eval $(call gb_Module_add_targets,shell,\ - Library_losessioninstall \ diff --git a/editors/libreoffice4/files/patch-solenv__bin__concat-deps.c b/editors/libreoffice4/files/patch-solenv__bin__concat-deps.c deleted file mode 100644 index 490ba064798b..000000000000 --- a/editors/libreoffice4/files/patch-solenv__bin__concat-deps.c +++ /dev/null @@ -1,36 +0,0 @@ ---- solenv/bin/concat-deps.c.orig 2014-09-16 16:10:41.000000000 -0400 -+++ solenv/bin/concat-deps.c 2014-10-14 14:55:14.000000000 -0400 -@@ -33,9 +33,7 @@ - #define CORE_LITTLE_ENDIAN - #endif /* Def _MSC_VER */ - --#if defined(__linux) || defined(__OpenBSD__) || \ -- defined(__FreeBSD__) || defined(__NetBSD__) || \ -- defined(__DragonFly__) || defined(__FreeBSD_kernel__) -+#if defined(__linux) || defined(__FreeBSD_kernel__) - #include <sys/param.h> - #if __BYTE_ORDER == __LITTLE_ENDIAN - #undef CORE_BIG_ENDIAN -@@ -46,7 +44,21 @@ - #undef CORE_LITTLE_ENDIAN - #endif /* __BYTE_ORDER == __BIG_ENDIAN */ - #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ --#endif /* Def __linux || Def *BSD */ -+#endif /* Def __linux */ -+ -+#if defined(__OpenBSD__) || defined(__FreeBSD__) || \ -+ defined(__NetBSD__) || defined(__DragonFly__) -+#include <machine/endian.h> -+#if _BYTE_ORDER == _LITTLE_ENDIAN -+#undef CORE_BIG_ENDIAN -+#define CORE_LITTLE_ENDIAN -+#else /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */ -+#if _BYTE_ORDER == _BIG_ENDIAN -+#define CORE_BIG_ENDIAN -+#undef CORE_LITTLE_ENDIAN -+#endif /* _BYTE_ORDER == _BIG_ENDIAN */ -+#endif /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */ -+#endif /* Def *BSD */ - - #ifdef __sun - #ifdef __sparc diff --git a/editors/libreoffice4/files/patch-solenv__gbuild__UnpackedTarball.mk b/editors/libreoffice4/files/patch-solenv__gbuild__UnpackedTarball.mk deleted file mode 100644 index 74266b638f1c..000000000000 --- a/editors/libreoffice4/files/patch-solenv__gbuild__UnpackedTarball.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- solenv/gbuild/UnpackedTarball.mk.orig 2014-04-22 18:25:28.000000000 -0400 -+++ solenv/gbuild/UnpackedTarball.mk 2014-05-07 13:33:55.000000000 -0400 -@@ -33,6 +33,7 @@ - -x \ - $(3) \ - -C $(UNPACKED_DIR) \ -+ --no-same-owner --no-same-permissions \ - $(STRIP_COMPONENTS)=$(UNPACKED_STRIP_COMPONENTS) \ - -f $(UNPACKED_TARBALL) - endef diff --git a/editors/libreoffice4/files/patch-solenv__gbuild__platform__unxgcc.mk b/editors/libreoffice4/files/patch-solenv__gbuild__platform__unxgcc.mk deleted file mode 100644 index d8afe2d14f9f..000000000000 --- a/editors/libreoffice4/files/patch-solenv__gbuild__platform__unxgcc.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/gbuild/platform/unxgcc.mk.orig 2013-12-11 01:11:21.000000000 +0900 -+++ solenv/gbuild/platform/unxgcc.mk 2014-01-29 17:09:01.000000000 +0900 -@@ -48,7 +48,7 @@ - gb_CXXFLAGS := \ - $(gb_CXXFLAGS_COMMON) \ - -fPIC \ -- -Wshadow \ -+ -Wno-unused-parameter \ - -Woverloaded-virtual \ - - ifneq ($(COM_GCC_IS_CLANG),TRUE) diff --git a/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk b/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk deleted file mode 100644 index c834b8323fa3..000000000000 --- a/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/gbuild/platform/com_GCC_defs.mk.orig 2015-04-20 19:36:29 UTC -+++ solenv/gbuild/platform/com_GCC_defs.mk -@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3 - gb_AFLAGS := $(AFLAGS) - - gb_COMPILERDEFS := \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY \ -+ -DBOOST_SYSTEM_NO_DEPRECATED \ - -DCPPU_ENV=$(gb_CPPU_ENV) \ - - gb_CFLAGS_COMMON := \ diff --git a/editors/libreoffice4/files/patch-svtools__source__control__ctrlbox.cxx b/editors/libreoffice4/files/patch-svtools__source__control__ctrlbox.cxx deleted file mode 100644 index 07749d7eee6c..000000000000 --- a/editors/libreoffice4/files/patch-svtools__source__control__ctrlbox.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./svtools/source/control/ctrlbox.cxx.orig 2013-03-12 07:00:34.000000000 -0400 -+++ ./svtools/source/control/ctrlbox.cxx 2013-03-20 17:11:17.000000000 -0400 -@@ -829,7 +829,7 @@ - if ( nPos < pLineList->size() ) { - ImpLineList::iterator it = pLineList->begin(); - ::std::advance( it, nPos ); -- pLineList->insert( it, reinterpret_cast<ImpLineListData *>(NULL) ); -+ pLineList->insert( it, static_cast<ImpLineListData *>(NULL) ); - } else { - pLineList->push_back( NULL ); - } diff --git a/editors/libreoffice4/files/patch-sysui__desktop__share__create_tree.sh b/editors/libreoffice4/files/patch-sysui__desktop__share__create_tree.sh deleted file mode 100644 index abe0ba6b673c..000000000000 --- a/editors/libreoffice4/files/patch-sysui__desktop__share__create_tree.sh +++ /dev/null @@ -1,48 +0,0 @@ ---- sysui/desktop/share/create_tree.sh.orig 2014-09-16 16:10:41.000000000 -0400 -+++ sysui/desktop/share/create_tree.sh 2014-10-08 17:40:45.000000000 -0400 -@@ -57,33 +57,33 @@ - chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".* - fi - --mkdir -p "${DESTDIR}/usr/bin" -+mkdir -p "${DESTDIR}${PREFIXDIR}/bin" - - test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_PREFIX}" || office_prefix=/opt - office_root=${office_prefix}/${PREFIX} - - #this symlink is needed to have the API boostrap functions running right --ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}" -+ln -sf "${office_root}/program/soffice" "${DESTDIR}${PREFIXDIR}/bin/${PREFIX}" - - if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then - # compat symlinks - mkdir -p "${DESTDIR}${office_prefix}" - ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" -- ln -sf /usr/bin/${PREFIX} "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}" -+ ln -sf ${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}" - fi - - test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" --mkdir -p "${DESTDIR}/usr/share/mime/packages" --cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file" --chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file" -+mkdir -p "${DESTDIR}${PREFIXDIR}/share/mime/packages" -+cp openoffice.org.xml "${DESTDIR}${PREFIXDIR}/share/mime/packages/$mime_def_file" -+chmod 0644 "${DESTDIR}${PREFIXDIR}/share/mime/packages/$mime_def_file" - --mkdir -p "${DESTDIR}/usr/share/applications" -+mkdir -p "${DESTDIR}${PREFIXDIR}/share/applications" - for i in `cat launcherlist`; do -- ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/usr/share/applications/${PREFIX}-${i}" -+ ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}${PREFIXDIR}/share/applications/${PREFIX}-${i}" - done - --mkdir -p "${DESTDIR}/usr/share/appdata" --for i in base calc draw impress writer; do -- cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml" --done -+#mkdir -p "${DESTDIR}${PREFIXDIR}/share/appdata" -+#for i in base calc draw impress writer; do -+# cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" -+#done - diff --git a/editors/libreoffice4/files/patch-vcl__Library_vclopengl.mk b/editors/libreoffice4/files/patch-vcl__Library_vclopengl.mk deleted file mode 100644 index d30262f0c9c7..000000000000 --- a/editors/libreoffice4/files/patch-vcl__Library_vclopengl.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- vcl/Library_vclopengl.mk.orig 2014-11-10 06:52:56.000000000 -0500 -+++ vcl/Library_vclopengl.mk 2014-11-25 16:06:48.000000000 -0500 -@@ -53,6 +53,12 @@ - $(eval $(call gb_Library_use_system_darwin_frameworks,vclopengl,\ - OpenGL \ - )) -+else ifeq ($(OS),FREEBSD) -+$(eval $(call gb_Library_add_libs,vclopengl,\ -+ -lGL \ -+ -lGLU \ -+ -lX11 \ -+)) - else ifeq ($(OS),LINUX) - $(eval $(call gb_Library_add_libs,vclopengl,\ - -ldl \ diff --git a/editors/libreoffice4/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx b/editors/libreoffice4/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx deleted file mode 100644 index c8e35c703002..000000000000 --- a/editors/libreoffice4/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2013-02-18 18:47:08.000000000 -0500 -@@ -4025,7 +4025,7 @@ - aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) ); - g_free( pIconThemeName ); - -- aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); -+ aStyleSet.SetToolbarIconSize( nDispDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); - - #if !GTK_CHECK_VERSION(2,9,0) - static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = diff --git a/editors/libreoffice4/files/patch-vcl_source_glyphs_graphite__layout.cxx b/editors/libreoffice4/files/patch-vcl_source_glyphs_graphite__layout.cxx deleted file mode 100644 index 7480d0f5111c..000000000000 --- a/editors/libreoffice4/files/patch-vcl_source_glyphs_graphite__layout.cxx +++ /dev/null @@ -1,77 +0,0 @@ -From ba27300d419786ca6fa8a7df950d01f472de3314 Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist <tml@collabora.com> -Date: Tue, 8 Jul 2014 09:49:50 +0300 -Subject: Fix some round() confusion - -Why insist on using the same name as a standard function? Causes -confusion with VS2013 at least, "ambiguous call to overloaded -function." - -Sure, this might be caused by a bug in the compiler (or its -headers). Or maybe vagueness in the language definition? Who cares, I -still claim that intentionally writing an own function called round() -is asking for problems. So rename it to round_to_long(). - -(And then the return value of calls to this function, which is of type -'long', is assigned in a couple of places to variables of type 'int', -fun... Intentional, knowing there will be no overflow, or a bug -waiting to happen?) - -Change-Id: If15d44f10f9f05de1c7c79492baf158eee770b8b - ---- vcl/source/glyphs/graphite_layout.cxx.orig 2015-04-20 19:36:29 UTC -+++ vcl/source/glyphs/graphite_layout.cxx -@@ -40,6 +40,8 @@ - #include <deque> - - // Platform -+#include <config_global.h> -+ - #include <svsys.h> - - #include <salgdi.hxx> -@@ -86,7 +88,7 @@ static FILE * grLog() - - namespace - { -- inline long round(const float n) { -+ inline long round_to_long(const float n) { - return long(n + (n < 0 ? -0.5 : 0.5)); - } - -@@ -354,8 +356,8 @@ GraphiteLayout::fillFrom(gr_segment * pS - baseSlot = gr_slot_next_sibling_attachment(baseSlot); - } - } -- long nXOffset = round(fMinX * fScaling); -- mnWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset; -+ long nXOffset = round_to_long(fMinX * fScaling); -+ mnWidth = round_to_long(fMaxX * fScaling) - nXOffset + nDxOffset; - if (mnWidth < 0) - { - // This can happen when there was no base inside the range -@@ -426,8 +428,8 @@ GraphiteLayout::append(gr_segment *pSeg, - nextOrigin = nextGlyphOrigin; - long glyphId = gr_slot_gid(gi); - long deltaOffset = 0; -- int scaledGlyphPos = round(gr_slot_origin_X(gi) * scaling); -- int glyphWidth = round((nextOrigin - gOrigin) * scaling); -+ int scaledGlyphPos = round_to_long(gr_slot_origin_X(gi) * scaling); -+ int glyphWidth = round_to_long((nextOrigin - gOrigin) * scaling); - // if (glyphWidth < 0) - // { - // nextOrigin = gOrigin; -@@ -469,11 +471,11 @@ GraphiteLayout::append(gr_segment *pSeg, - GlyphItem aGlyphItem(mvGlyphs.size(), - glyphId, - Point(scaledGlyphPos + rDXOffset, -- round((-gr_slot_origin_Y(gi) * scaling))), -+ round_to_long((-gr_slot_origin_Y(gi) * scaling))), - nGlyphFlags, - glyphWidth); - if (glyphId != static_cast<long>(GF_DROPPED)) -- aGlyphItem.mnOrigWidth = round(gr_slot_advance_X(gi, mpFace, mpFont) * scaling); -+ aGlyphItem.mnOrigWidth = round_to_long(gr_slot_advance_X(gi, mpFace, mpFont) * scaling); - mvGlyphs.push_back(aGlyphItem); - - // update the offset if this glyph was dropped diff --git a/editors/libreoffice4/pkg-descr b/editors/libreoffice4/pkg-descr deleted file mode 100644 index 44354c50a8d9..000000000000 --- a/editors/libreoffice4/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -LibreOffice is the free power-packed Open Source personal productivity suite for -Windows, Macintosh and Linux, that gives you six feature-rich applications for -all your document production and data processing needs: Writer, Calc, Impress, -Draw, Math and Base. - -WWW: http://www.libreoffice.org/ diff --git a/security/Makefile b/security/Makefile index b7f2b6c9dac4..1ef402e9b58e 100644 --- a/security/Makefile +++ b/security/Makefile @@ -436,8 +436,6 @@ SUBDIR += openvpn-auth-radius SUBDIR += openvpn-devel SUBDIR += openvpn-mbedtls - SUBDIR += openvpn23 - SUBDIR += openvpn23-polarssl SUBDIR += ophcrack SUBDIR += orthrus SUBDIR += osiris diff --git a/security/openvpn23-polarssl/Makefile b/security/openvpn23-polarssl/Makefile deleted file mode 100644 index 0b229d4aaf0c..000000000000 --- a/security/openvpn23-polarssl/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Matthias Andree <mandree@FreeBSD.org> -# $FreeBSD$ - -PKGNAMESUFFIX= -polarssl - -COMMENT= Secure IP/Ethernet tunnel daemon, PolarSSL-based build - -OPTIONS_EXCLUDE= OPENSSL PKCS11 X509ALTUSERNAME -OPTIONS_SLAVE= POLARSSL - -MASTERDIR= ${.CURDIR}/../../security/openvpn23 - -.include "${MASTERDIR}/Makefile" diff --git a/security/openvpn23/Makefile b/security/openvpn23/Makefile deleted file mode 100644 index 7cded9a4205d..000000000000 --- a/security/openvpn23/Makefile +++ /dev/null @@ -1,130 +0,0 @@ -# Created by: Matthias Andree <mandree@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= openvpn -DISTVERSION= 2.3.14 -CATEGORIES= security net -MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ - http://build.openvpn.net/downloads/releases/ -PKGNAMESUFFIX?= 23 - -MAINTAINER= mandree@FreeBSD.org -COMMENT?= Secure IP/Ethernet tunnel daemon - -DEPRECATED= Replaced by new upstream relesae 2.4.x -EXPIRATION_DATE= 2017-03-31 - -LICENSE= GPLv2 - -CONFLICTS_INSTALL= openvpn-2.[!3].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* - -GNU_CONFIGURE= yes -USES= cpe libtool pkgconfig shebangfix tar:xz -SHEBANG_FILES= sample/sample-scripts/verify-cn \ - sample/sample-scripts/auth-pam.pl \ - sample/sample-scripts/ucn.pl -# avoid picking up CMAKE, we don't have cmocka anyways. -CONFIGURE_ENV+= ac_cv_prog_CMAKE= CMAKE= - -# let OpenVPN's configure script pick up the requisite libraries, -# but do not break the plugin build if an older version is installed -CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -# set PLUGIN_LIBDIR so that unqualified plugin paths are found: -CPPFLAGS+= -DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\" - -OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ - TUNNELBLICK TEST -OPTIONS_DEFAULT= EASYRSA OPENSSL TEST -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL POLARSSL -# The following feature is always enabled since 2.3.9 and no longer optional. -# PW_SAVE_DESC= Interactive passwords may be read from a file -PKCS11_DESC= Use security/pkcs11-helper -EASYRSA_DESC= Install security/easy-rsa RSA helper package -POLARSSL_DESC= SSL/TLS via mbedTLS 1.3.X (not 2.x) -TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) -X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) - -EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa - -PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper -PKCS11_CONFIGURE_ENABLE= pkcs11 - -TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch - -X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username - -X509ALTUSERNAME_PREVENTS= POLARSSL -X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead - -OPENSSL_USES= ssl -OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl - -# Pin the libmbedtls version because the 2.3.x port can't work with .so.10 or -# newer from the security/mbedtls package. Upstream works in progress -# for OpenVPN 2.4 to use mbedTLS 2.X. -POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 -POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl - -USE_RC_SUBR= openvpn -USE_LDCONFIG= ${PREFIX}/lib - -SUB_FILES= pkg-message openvpn-client - -.ifdef (LOG_OPENVPN) -CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} -.endif - -LIB_DEPENDS+= liblzo2.so:archivers/lzo2 - -PORTDOCS= * -PORTEXAMPLES= * - -TEST_ALL_TARGET= check -TEST_TEST_TARGET_OFF= check - -# XXX Please remove this compatibility wrapper after 2017Q2 is branched. -.ifdef(WITHOUT_CHECK) -WARNING+= "${.CURDIR}: WITHOUT_CHECK is deprecated, please use WITHOUT=TEST or OPTIONS_UNSET=TEST." -WITHOUT+= TEST -.endif - -pre-configure: -.ifdef (LOG_OPENVPN) - @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" -.else - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" - @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6" - @${ECHO} "" -.endif - -post-configure: - ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ - ${WRKSRC}/src/plugins/auth-pam/Makefile \ - ${WRKSRC}/src/plugins/down-root/Makefile - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.up ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.down ${STAGEDIR}${PREFIX}/libexec/openvpn-client.down - @${REINPLACE_CMD} 's|resolvconf -p -a|resolvconf -a|' ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up - ${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client - ${MKDIR} ${STAGEDIR}${PREFIX}/include - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ -.for i in AUTHORS ChangeLog PORTS - ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ -.endfor - -post-install-EXAMPLES-on: - (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) - ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* - -.include <bsd.port.mk> diff --git a/security/openvpn23/distinfo b/security/openvpn23/distinfo deleted file mode 100644 index fb9730e32aba..000000000000 --- a/security/openvpn23/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1481159357 -SHA256 (openvpn-2.3.14.tar.xz) = f3a0d0eaf8d544409f76a9f2a238a0cd3dde9e1a9c1f98ac732a8b572bcdee98 -SIZE (openvpn-2.3.14.tar.xz) = 831404 diff --git a/security/openvpn23/files/extra-tunnelblick-openvpn_xorpatch b/security/openvpn23/files/extra-tunnelblick-openvpn_xorpatch deleted file mode 100644 index 690b86b83e16..000000000000 --- a/security/openvpn23/files/extra-tunnelblick-openvpn_xorpatch +++ /dev/null @@ -1,296 +0,0 @@ -This work allows obfuscation of the OpenVPN header to make it harder for -layer 7 inspection to identify such traffic, which may come with blocking -or recording actions in certain territories of the world. This patch, in -a nutshell, can increase privacy and range of communication for its users. - -The `scramble' option introduced hereby is off by default. - -The option's usage, history and controversy of the patch is explained in -detail on the following wiki page: - -https://tunnelblick.net/cOpenvpn_xorpatch.html - - ---- src/openvpn/forward.c.orig 2016-08-23 14:16:28 UTC -+++ src/openvpn/forward.c -@@ -674,7 +674,10 @@ read_incoming_link (struct context *c) - - status = link_socket_read (c->c2.link_socket, - &c->c2.buf, -- &c->c2.from); -+ &c->c2.from, -+ c->options.ce.xormethod, -+ c->options.ce.xormask, -+ c->options.ce.xormasklen); - - if (socket_connection_reset (c->c2.link_socket, status)) - { -@@ -1151,7 +1154,10 @@ process_outgoing_link (struct context *c - /* Send packet */ - size = link_socket_write (c->c2.link_socket, - &c->c2.to_link, -- to_addr); -+ to_addr, -+ c->options.ce.xormethod, -+ c->options.ce.xormask, -+ c->options.ce.xormasklen); - - #ifdef ENABLE_SOCKS - /* Undo effect of prepend */ ---- src/openvpn/options.c.orig 2016-08-23 14:16:22 UTC -+++ src/openvpn/options.c -@@ -792,6 +792,9 @@ init_options (struct options *o, const b - o->max_routes = MAX_ROUTES_DEFAULT; - o->resolve_retry_seconds = RESOLV_RETRY_INFINITE; - o->proto_force = -1; -+ o->ce.xormethod = 0; -+ o->ce.xormask = "\0"; -+ o->ce.xormasklen = 0; - #ifdef ENABLE_OCC - o->occ = true; - #endif -@@ -907,6 +910,9 @@ setenv_connection_entry (struct env_set - setenv_int_i (es, "local_port", e->local_port, i); - setenv_str_i (es, "remote", e->remote, i); - setenv_int_i (es, "remote_port", e->remote_port, i); -+ setenv_int_i (es, "xormethod", e->xormethod, i); -+ setenv_str_i (es, "xormask", e->xormask, i); -+ setenv_int_i (es, "xormasklen", e->xormasklen, i); - - #ifdef ENABLE_HTTP_PROXY - if (e->http_proxy_options) -@@ -1366,6 +1372,9 @@ show_connection_entry (const struct conn - SHOW_INT (connect_retry_seconds); - SHOW_INT (connect_timeout); - SHOW_INT (connect_retry_max); -+ SHOW_INT (xormethod); -+ SHOW_STR (xormask); -+ SHOW_INT (xormasklen); - - #ifdef ENABLE_HTTP_PROXY - if (o->http_proxy_options) -@@ -5131,6 +5140,46 @@ add_option (struct options *options, - options->proto_force = proto_force; - options->force_connection_list = true; - } -+ else if (streq (p[0], "scramble") && p[1]) -+ { -+ VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION); -+ if (streq (p[1], "xormask") && p[2] && (!p[3])) -+ { -+ options->ce.xormethod = 1; -+ options->ce.xormask = p[2]; -+ options->ce.xormasklen = strlen(options->ce.xormask); -+ } -+ else if (streq (p[1], "xorptrpos") && (!p[2])) -+ { -+ options->ce.xormethod = 2; -+ options->ce.xormask = NULL; -+ options->ce.xormasklen = 0; -+ } -+ else if (streq (p[1], "reverse") && (!p[2])) -+ { -+ options->ce.xormethod = 3; -+ options->ce.xormask = NULL; -+ options->ce.xormasklen = 0; -+ } -+ else if (streq (p[1], "obfuscate") && p[2] && (!p[3])) -+ { -+ options->ce.xormethod = 4; -+ options->ce.xormask = p[2]; -+ options->ce.xormasklen = strlen(options->ce.xormask); -+ } -+ else if (!p[2]) -+ { -+ msg (M_WARN, "WARNING: No recognized 'scramble' method specified; using 'scramble xormask \"%s\"'", p[1]); -+ options->ce.xormethod = 1; -+ options->ce.xormask = p[1]; -+ options->ce.xormasklen = strlen(options->ce.xormask); -+ } -+ else -+ { -+ msg (msglevel, "No recognized 'scramble' method specified or extra parameters for 'scramble'"); -+ goto err; -+ } -+ } - #ifdef ENABLE_HTTP_PROXY - else if (streq (p[0], "http-proxy") && p[1]) - { ---- src/openvpn/options.h.orig 2016-08-23 14:16:22 UTC -+++ src/openvpn/options.h -@@ -100,6 +100,9 @@ struct connection_entry - int connect_retry_max; - int connect_timeout; - bool connect_timeout_defined; -+ int xormethod; -+ const char *xormask; -+ int xormasklen; - #ifdef ENABLE_HTTP_PROXY - struct http_proxy_options *http_proxy_options; - #endif ---- src/openvpn/socket.c.orig 2016-08-23 14:16:22 UTC -+++ src/openvpn/socket.c -@@ -52,6 +52,53 @@ const int proto_overhead[] = { /* indexe - IPv6_TCP_HEADER_SIZE, - }; - -+int buffer_mask (struct buffer *buf, const char *mask, int xormasklen) { -+ int i; -+ uint8_t *b; -+ if ( xormasklen > 0 ) { -+ for (i = 0, b = BPTR (buf); i < BLEN(buf); i++, b++) { -+ *b = *b ^ mask[i % xormasklen]; -+ } -+ } -+ return BLEN (buf); -+} -+ -+int buffer_xorptrpos (struct buffer *buf) { -+ int i; -+ uint8_t *b; -+ for (i = 0, b = BPTR (buf); i < BLEN(buf); i++, b++) { -+ *b = *b ^ i+1; -+ } -+ return BLEN (buf); -+} -+ -+int buffer_reverse (struct buffer *buf) { -+/* This function has been rewritten for Tunnelblick. The buffer_reverse function at -+ * https://github.com/clayface/openvpn_xorpatch -+ * makes a copy of the buffer and it writes to the byte **after** the -+ * buffer contents, so if the buffer is full then it writes outside of the buffer. -+ * This rewritten version does neither. -+ * -+ * For interoperability, this rewritten version preserves the behavior of the original -+ * function: it does not modify the first character of the buffer. So it does not -+ * actually reverse the contents of the buffer. Instead, it changes 'abcde' to 'aedcb'. -+ * (Of course, the actual buffer contents are bytes, and not necessarily characters.) -+ */ -+ int len = BLEN(buf); -+ if ( len > 2 ) { /* Leave '', 'a', and 'ab' alone */ -+ int i; -+ uint8_t *b_start = BPTR (buf) + 1; /* point to first byte to swap */ -+ uint8_t *b_end = BPTR (buf) + (len - 1); /* point to last byte to swap */ -+ uint8_t tmp; -+ for (i = 0; i < (len-1)/2; i++, b_start++, b_end--) { -+ tmp = *b_start; -+ *b_start = *b_end; -+ *b_end = tmp; -+ } -+ } -+ return len; -+} -+ - /* - * Convert sockflags/getaddr_flags into getaddr_flags - */ ---- src/openvpn/socket.h.orig 2016-08-23 14:16:22 UTC -+++ src/openvpn/socket.h -@@ -245,6 +245,10 @@ struct link_socket - #endif - }; - -+int buffer_mask (struct buffer *buf, const char *xormask, int xormasklen); -+int buffer_xorptrpos (struct buffer *buf); -+int buffer_reverse (struct buffer *buf); -+ - /* - * Some Posix/Win32 differences. - */ -@@ -873,30 +877,56 @@ int link_socket_read_udp_posix (struct l - static inline int - link_socket_read (struct link_socket *sock, - struct buffer *buf, -- struct link_socket_actual *from) -+ struct link_socket_actual *from, -+ int xormethod, -+ const char *xormask, -+ int xormasklen) - { -+ int res; - if (proto_is_udp(sock->info.proto)) /* unified UDPv4 and UDPv6 */ - { -- int res; - - #ifdef WIN32 - res = link_socket_read_udp_win32 (sock, buf, from); - #else - res = link_socket_read_udp_posix (sock, buf, from); - #endif -- return res; - } - else if (proto_is_tcp(sock->info.proto)) /* unified TCPv4 and TCPv6 */ - { - /* from address was returned by accept */ - addr_copy_sa(&from->dest, &sock->info.lsa->actual.dest); -- return link_socket_read_tcp (sock, buf); -+ res = link_socket_read_tcp (sock, buf); - } - else - { - ASSERT (0); - return -1; /* NOTREACHED */ - } -+ switch(xormethod) -+ { -+ case 0: -+ break; -+ case 1: -+ buffer_mask(buf,xormask,xormasklen); -+ break; -+ case 2: -+ buffer_xorptrpos(buf); -+ break; -+ case 3: -+ buffer_reverse(buf); -+ break; -+ case 4: -+ buffer_mask(buf,xormask,xormasklen); -+ buffer_xorptrpos(buf); -+ buffer_reverse(buf); -+ buffer_xorptrpos(buf); -+ break; -+ default: -+ ASSERT (0); -+ return -1; /* NOTREACHED */ -+ } -+ return res; - } - - /* -@@ -980,8 +1010,34 @@ link_socket_write_udp (struct link_socke - static inline int - link_socket_write (struct link_socket *sock, - struct buffer *buf, -- struct link_socket_actual *to) -+ struct link_socket_actual *to, -+ int xormethod, -+ const char *xormask, -+ int xormasklen) - { -+ switch(xormethod) -+ { -+ case 0: -+ break; -+ case 1: -+ buffer_mask(buf,xormask,xormasklen); -+ break; -+ case 2: -+ buffer_xorptrpos(buf); -+ break; -+ case 3: -+ buffer_reverse(buf); -+ break; -+ case 4: -+ buffer_xorptrpos(buf); -+ buffer_reverse(buf); -+ buffer_xorptrpos(buf); -+ buffer_mask(buf,xormask,xormasklen); -+ break; -+ default: -+ ASSERT (0); -+ return -1; /* NOTREACHED */ -+ } - if (proto_is_udp(sock->info.proto)) /* unified UDPv4 and UDPv6 */ - { - return link_socket_write_udp (sock, buf, to); diff --git a/security/openvpn23/files/openvpn-client.in b/security/openvpn23/files/openvpn-client.in deleted file mode 100644 index 471757811795..000000000000 --- a/security/openvpn23/files/openvpn-client.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -exec %%PREFIX%%/sbin/openvpn --script-security 2 \ - --up %%PREFIX%%/libexec/openvpn-client.up \ - --plugin openvpn-plugin-down-root.so %%PREFIX%%/libexec/openvpn-client.down \ - --config "$@" diff --git a/security/openvpn23/files/openvpn.in b/security/openvpn23/files/openvpn.in deleted file mode 100644 index 6eab55e69ea6..000000000000 --- a/security/openvpn23/files/openvpn.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -# -# openvpn.sh - load tun/tap driver and start OpenVPN daemon -# -# (C) Copyright 2005 - 2008, 2010 by Matthias Andree -# based on suggestions by Matthias Grimm and Dirk Gouders -# with multi-instance contribution from Denis Shaposhnikov, Gleb Kozyrev -# and Vasil Dimov -# softrestart feature suggested by Nick Hibma -# -# $FreeBSD$ -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -# Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# PROVIDE: openvpn -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# ----------------------------------------------------------------------------- -# -# This script supports running multiple instances of openvpn. -# To run additional instances link this script to something like -# % ln -s openvpn openvpn_foo -# and define additional openvpn_foo_* variables in one of -# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/openvpn_foo -# -# Below NAME should be substituted with the name of this script. By default -# it is openvpn, so read as openvpn_enable. If you linked the script to -# openvpn_foo, then read as openvpn_foo_enable etc. -# -# The following variables are supported (defaults are shown). -# You can place them in any of -# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME -# -# NAME_enable="NO" # set to YES to enable openvpn -# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" -# # it is OK to specify the if_ prefix. -# -# # optional: -# NAME_flags= # additional command line arguments -# NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file -# NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory -# -# You also need to set NAME_configfile and NAME_dir, if the configuration -# file and directory where keys and certificates reside differ from the above -# settings. -# -# Note that we deliberately refrain from unloading drivers. -# -# For further documentation, please see openvpn(8). -# - -. /etc/rc.subr - -# service(8) does not create an authentic environment, try to guess, -# and as of 10.3-RELEASE-p0, it will not find the indented name= -# assignments below. So give it a default. -# Trailing semicolon also for service(8)'s benefit: -name="$file" ; - -case "$0" in -/etc/rc*) - # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), - # so get the name of the script from $_file - name="$_file" - ;; -*/service) - # do not use this as $0 - ;; -*) - name="$0" - ;; -esac - -# default name to "openvpn" if guessing failed -# Trailing semicolon also for service(8)'s benefit: -name="${name:-openvpn}" ; -name="${name##*/}" -rcvar=${name}_enable - -stop_postcmd() -{ - rm -f "$pidfile" || warn "Could not remove $pidfile." -} - -softrestart() -{ - sig_reload=USR1 run_rc_command reload - exit $? -} - -openvpn_stats() -{ - sig_reload=USR2 - run_rc_command ${rc_prefix}reload $rc_extra_args -} - -# reload: support SIGHUP to reparse configuration file -# softrestart: support SIGUSR1 to reconnect without superuser privileges -# stats: support SIGUSR2 to write statistics to the syslog -extra_commands="reload softrestart stats" -softrestart_cmd="softrestart" -stats_cmd="openvpn_stats" - -# pidfile -pidfile="/var/run/${name}.pid" - -# command and arguments -command="%%PREFIX%%/sbin/openvpn" - -# run this last -stop_postcmd="stop_postcmd" - -load_rc_config ${name} - -eval ": \${${name}_enable:=\"NO\"}" -eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" - -configfile="$(eval echo \${${name}_configfile})" -dir="$(eval echo \${${name}_dir})" -interfaces="$(eval echo \${${name}_if})" - -required_modules= -for i in $interfaces ; do - required_modules="$required_modules${required_modules:+" "}if_${i#if_}" -done - -required_files=${configfile} - -command_args="--cd ${dir} --daemon ${name} --config ${configfile} --writepid ${pidfile}" - -run_rc_command "$1" diff --git a/security/openvpn23/files/patch-configure b/security/openvpn23/files/patch-configure deleted file mode 100644 index 226436314279..000000000000 --- a/security/openvpn23/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2016-08-23 14:19:07 UTC -+++ configure -@@ -17160,8 +17160,6 @@ fi - $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed." >&6; } - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: !! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&5 --$as_echo "!! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&6; } - if false; then - CMOCKA_INITIALIZED_TRUE= - CMOCKA_INITIALIZED_FALSE='#' diff --git a/security/openvpn23/files/patch-sample__sample-config-files__loopback-client b/security/openvpn23/files/patch-sample__sample-config-files__loopback-client deleted file mode 100644 index 0b485a641d8a..000000000000 --- a/security/openvpn23/files/patch-sample__sample-config-files__loopback-client +++ /dev/null @@ -1,13 +0,0 @@ ---- sample/sample-config-files/loopback-client.orig 2016-08-23 14:16:22 UTC -+++ sample/sample-config-files/loopback-client -@@ -9,8 +9,8 @@ - # ./openvpn --config sample-config-files/loopback-client (In one window) - # ./openvpn --config sample-config-files/loopback-server (Simultaneously in another window) - --rport 16000 --lport 16001 -+rport 16100 -+lport 16101 - remote localhost - local localhost - dev null diff --git a/security/openvpn23/files/patch-sample__sample-config-files__loopback-server b/security/openvpn23/files/patch-sample__sample-config-files__loopback-server deleted file mode 100644 index 58691b133de7..000000000000 --- a/security/openvpn23/files/patch-sample__sample-config-files__loopback-server +++ /dev/null @@ -1,13 +0,0 @@ ---- sample/sample-config-files/loopback-server.orig 2016-08-23 14:16:22 UTC -+++ sample/sample-config-files/loopback-server -@@ -9,8 +9,8 @@ - # ./openvpn --config sample-config-files/loopback-client (In one window) - # ./openvpn --config sample-config-files/loopback-server (Simultaneously in another window) - --rport 16001 --lport 16000 -+rport 16101 -+lport 16100 - remote localhost - local localhost - dev null diff --git a/security/openvpn23/files/patch-tests__t_cltsrv.sh b/security/openvpn23/files/patch-tests__t_cltsrv.sh deleted file mode 100644 index e1dcb3cab046..000000000000 --- a/security/openvpn23/files/patch-tests__t_cltsrv.sh +++ /dev/null @@ -1,65 +0,0 @@ ---- tests/t_cltsrv.sh.orig 2016-08-23 13:10:22 UTC -+++ tests/t_cltsrv.sh -@@ -1,7 +1,7 @@ - #! /bin/sh - # - # t_cltsrv.sh - script to test OpenVPN's crypto loopback --# Copyright (C) 2005, 2006, 2008 Matthias Andree -+# Copyright (C) 2005 - 2014 Matthias Andree - # - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU General Public License -@@ -22,8 +22,9 @@ set -e - srcdir="${srcdir:-.}" - top_srcdir="${top_srcdir:-..}" - top_builddir="${top_builddir:-..}" --trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15 --trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3 -+root="${top_srcdir}/sample" -+trap "rm -f ${root}/sample-config-files/loopback-*.test log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15 -+trap "a=\$? ; rm -f ${root}/sample-config-files/loopback-*.test log.$$ log.$$.signal ; test \$a = 0 && exit 1 || exit \$a" 0 3 - addopts= - case `uname -s` in - FreeBSD) -@@ -45,18 +46,38 @@ esac - # make sure that the --down script is executable -- fail (rather than - # skip) test if it isn't. - downscript="../tests/t_cltsrv-down.sh" --root="${top_srcdir}/sample" - test -x "${root}/${downscript}" || chmod +x "${root}/${downscript}" || { echo >&2 "${root}/${downscript} is not executable, failing." ; exit 1 ; } - echo "The following test will take about two minutes." >&2 - echo "If the addresses are in use, this test will retry up to two times." >&2 - -+set -- $(ifconfig lo0 | grep -E '\<inet' | head -n1) -+add= -+if [ "x$1$2" = "x" ] ; then -+ echo >&2 "### NO ADDRESSES ON LOOPBACK INTERFACE lo0, SKIPPING TEST ###" -+ exit 77 -+fi -+if [ "inet6" = "$1" ] ; then -+ add='proto udp6 ' -+fi -+for i in server client ; do -+ sed -e "s/localhost/$2/" -e "/^remote /a\\ -+$add" ${root}/sample-config-files/loopback-$i \ -+ >${root}/sample-config-files/loopback-$i.test -+done -+ - # go - success=0 - for i in 1 2 3 ; do - set +e - ( -- "${top_builddir}/src/openvpn/openvpn" --script-security 2 --cd "${root}" ${addopts} --setenv role srv --down "${downscript}" --tls-exit --ping-exit 180 --config "sample-config-files/loopback-server" & -- "${top_builddir}/src/openvpn/openvpn" --script-security 2 --cd "${top_srcdir}/sample" ${addopts} --setenv role clt --down "${downscript}" --tls-exit --ping-exit 180 --config "sample-config-files/loopback-client" -+ "${top_builddir}/src/openvpn/openvpn" --script-security 2 \ -+ --cd "${root}" ${addopts} --setenv role srv \ -+ --down "${downscript}" --tls-exit --ping-exit 180 \ -+ --config "sample-config-files/loopback-server.test" & -+ "${top_builddir}/src/openvpn/openvpn" --script-security 2 \ -+ --cd "${top_srcdir}/sample" ${addopts} --setenv role clt \ -+ --down "${downscript}" --tls-exit --ping-exit 180 \ -+ --config "sample-config-files/loopback-client.test" - ) 3>log.$$.signal >log.$$ 2>&1 - e1=$? - wait $! diff --git a/security/openvpn23/files/pkg-message.in b/security/openvpn23/files/pkg-message.in deleted file mode 100644 index 8c1eaa14b3b2..000000000000 --- a/security/openvpn23/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -### ------------------------------------------------------------------------ -### Edit /etc/rc.conf[.local] to start OpenVPN automatically at system -### startup. See %%PREFIX%%/etc/rc.d/openvpn for details. -### ------------------------------------------------------------------------ -### Connect to VPN server as a client with this command to include -### the client.up/down scripts in the initialization: -### openvpn-client <spec>.ovpn -### ------------------------------------------------------------------------ -### For compatibility notes when interoperating with older OpenVPN -### versions, please, see <http://openvpn.net/relnotes.html> -### ------------------------------------------------------------------------ diff --git a/security/openvpn23/files/up-script.sample b/security/openvpn23/files/up-script.sample deleted file mode 100644 index 2b9acee3dc85..000000000000 --- a/security/openvpn23/files/up-script.sample +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# OpenVPN simple up/down script for openresolvconf integration. -# (C) Copyright 2016 Baptiste Daroussin -# BSD 2-clause license. - -set -e +u -: ${script_type:=down} -case "${script_type}" in -up) - i=1 - while :; do - eval option=\"\$foreign_option_${i}\" || break - [ "${option}" ] || break - set -- ${option} - i=$((i + 1)) - [ "$1" = "dhcp-option" ] || continue - case "$2" in - DNS) echo "nameserver ${3}" ;; - DOMAIN) echo "domain ${3}" ;; - DOMAIN-SEARCH) echo "search ${3}" ;; - esac - done | /sbin/resolvconf -a "${dev}" - ;; -down) - /sbin/resolvconf -d "${dev}" -f - ;; -esac diff --git a/security/openvpn23/pkg-descr b/security/openvpn23/pkg-descr deleted file mode 100644 index 751e62d362d1..000000000000 --- a/security/openvpn23/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private -Network) daemon which can be used to securely link two or more private networks -using an encrypted tunnel over the internet. It can operate over UDP or TCP, -can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one -server can handle many clients. - -WWW: http://openvpn.net/index.php/open-source.html diff --git a/security/openvpn23/pkg-help b/security/openvpn23/pkg-help deleted file mode 100644 index 9fd1cd9567bd..000000000000 --- a/security/openvpn23/pkg-help +++ /dev/null @@ -1,10 +0,0 @@ -Note that "Tunnelblick" is a controversial option. -It is included for compatibility, not enabled by default, -and should only be used with due consideration, and it should not -replace proper cryptography use in OpenVPN. - -Note that this patch does NOT add documentation for the new --scramble -option, neither to the --help output, nor the manual page. - -Please see this website for a more detailed discussion: -https://tunnelblick.net/cOpenvpn_xorpatch.html diff --git a/security/openvpn23/pkg-plist b/security/openvpn23/pkg-plist deleted file mode 100644 index 2069cc44c6e4..000000000000 --- a/security/openvpn23/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -include/openvpn-plugin.h -lib/openvpn/plugins/openvpn-plugin-auth-pam.so -lib/openvpn/plugins/openvpn-plugin-down-root.so -man/man8/openvpn.8.gz -sbin/openvpn -sbin/openvpn-client -libexec/openvpn-client.up -libexec/openvpn-client.down diff --git a/sysutils/Makefile b/sysutils/Makefile index 7cd0d805f5be..f34653045f6e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -461,8 +461,6 @@ SUBDIR += intel-nvmupdate SUBDIR += intel-pcm SUBDIR += intel-qcu - SUBDIR += iocage - SUBDIR += iocage-devel SUBDIR += iocell SUBDIR += iogen SUBDIR += iograph @@ -480,7 +478,6 @@ SUBDIR += istatserver SUBDIR += jadm SUBDIR += jail-primer - SUBDIR += jail2 SUBDIR += jailadmin SUBDIR += jailctl SUBDIR += jaildaemon @@ -846,7 +843,6 @@ SUBDIR += ptools SUBDIR += puppet-lint SUBDIR += puppet-mode.el - SUBDIR += puppet38 SUBDIR += puppet4 SUBDIR += puppetserver SUBDIR += pv diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile deleted file mode 100644 index a77ed0514eb6..000000000000 --- a/sysutils/iocage-devel/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: Johannes Meixner <johannes@perceivon.net> -# $FreeBSD$ - -PORTNAME= iocage -PORTVERSION= 20160819 -CATEGORIES= sysutils -PKGNAMESUFFIX= -devel - -MAINTAINER= kmoore@FreeBSD.org -COMMENT= Full featured, no dependency Jail container manager - devel build - -DEPRECATED= Outdated version. Please use sysutils/py-iocage instead -EXPIRATION_DATE= 2017-04-01 - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= uclcmd:devel/uclcmd - -USE_GITHUB= yes -GH_ACCOUNT= iocage -GH_TAGNAME= 218c3be - -NO_BUILD= yes -NO_ARCH= yes - -post-patch: - @${REINPLACE_CMD} -e "s|/usr/local/lib/iocage|${PREFIX}/lib/iocage|g" ${WRKSRC}/iocage - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/iocage - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/iocage ${STAGEDIR}${PREFIX}/etc/rc.d - ${INSTALL_SCRIPT} ${WRKSRC}/iocage ${STAGEDIR}${PREFIX}/sbin - (cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/iocage) - ${INSTALL_MAN} ${WRKSRC}/iocage.8 ${STAGEDIR}${PREFIX}/man/man8 - -.include <bsd.port.mk> diff --git a/sysutils/iocage-devel/distinfo b/sysutils/iocage-devel/distinfo deleted file mode 100644 index 4d6e4501c67d..000000000000 --- a/sysutils/iocage-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1472046296 -SHA256 (iocage-iocage-20160819-218c3be_GH0.tar.gz) = 582f4c4b39879929dc9857b0ae219cf0ec4143ff1b298c28f13bec7776bc3073 -SIZE (iocage-iocage-20160819-218c3be_GH0.tar.gz) = 323679 diff --git a/sysutils/iocage-devel/pkg-descr b/sysutils/iocage-devel/pkg-descr deleted file mode 100644 index 159ba8ac8c2b..000000000000 --- a/sysutils/iocage-devel/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -iocage is a zero dependency drop in jail/container manager -amalgamating some of the best features and technologies -FreeBSD operating system has to offer. - -It is geared for ease of use with a simple and easy to -understand command syntax. - -WWW: https://github.com/iocage/iocage diff --git a/sysutils/iocage-devel/pkg-plist b/sysutils/iocage-devel/pkg-plist deleted file mode 100644 index 5f0572eb2e86..000000000000 --- a/sysutils/iocage-devel/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -etc/rc.d/iocage -lib/iocage/ioc-cmd -lib/iocage/ioc-common -lib/iocage/ioc-configure -lib/iocage/ioc-git -lib/iocage/ioc-globals -lib/iocage/ioc-hacks -lib/iocage/ioc-help -lib/iocage/ioc-image -lib/iocage/ioc-info -lib/iocage/ioc-network -lib/iocage/ioc-rc -lib/iocage/ioc-rctl -lib/iocage/ioc-send -lib/iocage/ioc-snapshot -lib/iocage/ioc-upgrade -lib/iocage/ioc-zfs -man/man8/iocage.8.gz -sbin/iocage diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile deleted file mode 100644 index fc1950cb4d8e..000000000000 --- a/sysutils/iocage/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Bartek Rutkowski <robak@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= iocage -PORTVERSION= 1.7.6 -DISTVERSIONPREFIX=v -CATEGORIES= sysutils - -MAINTAINER= robak@FreeBSD.org -COMMENT= Full featured, no dependency Jail container manager - -DEPRECATED= Outdated version. Please use sysutils/py-iocage instead -EXPIRATION_DATE= 2017-04-01 - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -USE_GITHUB= yes -GH_ACCOUNT= ${PORTNAME} -GH_PROJECT= iocage_legacy - -NO_BUILD= yes -NO_ARCH= yes - -post-patch: - @${REINPLACE_CMD} -e "s|/usr/local/lib/iocage|${PREFIX}/lib/iocage|g" ${WRKSRC}/iocage - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/iocage - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/iocage ${STAGEDIR}${PREFIX}/etc/rc.d - ${INSTALL_SCRIPT} ${WRKSRC}/iocage ${STAGEDIR}${PREFIX}/sbin - (cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/iocage) - ${INSTALL_MAN} ${WRKSRC}/iocage.8 ${STAGEDIR}${PREFIX}/man/man8 - -.include <bsd.port.mk> diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo deleted file mode 100644 index 917e31774598..000000000000 --- a/sysutils/iocage/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1484481883 -SHA256 (iocage-iocage_legacy-v1.7.6_GH0.tar.gz) = 4ff333c198d7c8a8a77c70797aae54dfc08063c712bf476862c4875f3e468788 -SIZE (iocage-iocage_legacy-v1.7.6_GH0.tar.gz) = 297472 diff --git a/sysutils/iocage/pkg-descr b/sysutils/iocage/pkg-descr deleted file mode 100644 index 370169aa7e45..000000000000 --- a/sysutils/iocage/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -iocage is a zero dependency drop in jail/container manager -amalgamating some of the best features and technologies -FreeBSD operating system has to offer. - -It is geared for ease of use with a simple and easy to -understand command syntax. - -This version of iocage is now deprecated in favor of -Python based version in sysutils/py-iocage. - -WWW: https://github.com/iocage/iocage_legacy diff --git a/sysutils/iocage/pkg-plist b/sysutils/iocage/pkg-plist deleted file mode 100644 index 5f0572eb2e86..000000000000 --- a/sysutils/iocage/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -etc/rc.d/iocage -lib/iocage/ioc-cmd -lib/iocage/ioc-common -lib/iocage/ioc-configure -lib/iocage/ioc-git -lib/iocage/ioc-globals -lib/iocage/ioc-hacks -lib/iocage/ioc-help -lib/iocage/ioc-image -lib/iocage/ioc-info -lib/iocage/ioc-network -lib/iocage/ioc-rc -lib/iocage/ioc-rctl -lib/iocage/ioc-send -lib/iocage/ioc-snapshot -lib/iocage/ioc-upgrade -lib/iocage/ioc-zfs -man/man8/iocage.8.gz -sbin/iocage diff --git a/sysutils/jail2/Makefile b/sysutils/jail2/Makefile deleted file mode 100644 index 19daa982de88..000000000000 --- a/sysutils/jail2/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -PORTNAME= jail2 -PORTVERSION= 1.1 -CATEGORIES= sysutils -MASTER_SITES= # -DISTFILES= # - -MAINTAINER= yamagi@yamagi.org -COMMENT= Jail startup/shutdown script with jail.conf support - -DEPRECATED= Starting with 10.0 functionality has been merged into base. -EXPIRATION_DATE= 2017-04-01 - -NO_BUILD= yes -NO_INSTALL= yes - -USE_RC_SUBR= jail2 - -.include <bsd.port.mk> diff --git a/sysutils/jail2/files/jail2.in b/sysutils/jail2/files/jail2.in deleted file mode 100644 index 3066f871dc0a..000000000000 --- a/sysutils/jail2/files/jail2.in +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Alternative rc script for jails. This script relies on -# /etc/jail.conf instead of rc.conf variables. Usage: -# -# jail2_enable -> Enables the script -# jail2_list -> List of jails to be started. The names -# must match the names in /etc/jail.conf -# jail2_$name_zfs -> List of ZFS datasets to connect to the -# jail $name. -# -# To manage ZFS datasets within a jail the dataset must have -# set the parameter "jailed" to 1. Additionally the jail must -# have set the proberties "allow.mount", "allow.mount.zfs" -# and "enforce_statfs" to 0. - -# PROVIDE: jail -# REQUIRE: LOGIN cleanvar -# BEFORE: securelevel -# KEYWORD: shutdown - -. /etc/rc.subr - -name="jail2" -rcvar=jail2_enable - -start_cmd="jail2_start" -stop_cmd="jail2_stop" - -jail2_start() -{ - echo -n "Starting jails: " - - devfs_init_rulesets - - for _j in ${jail2_list}; do - echo -n "${_j} " - - if [ -e /var/run/jail_${_j}.id ]; then - echo "${_j} already exists" - continue - fi - - jail -c -i -J /var/run/jail_${_j}.id ${_j} > /dev/null 2>&1 - - eval _zfs=\"\${jail2_${_j}_zfs:-}\" - _jid=`jls -j ${_j} jid 2>/dev/null` - - if [ -n "${_zfs}" ]; then - for _ds in ${_zfs}; do - _jailed=`zfs get -H jailed ${_ds} 2>/dev/null | awk '{ print $3 }'` - if [ "${_jailed}" = "on" ]; then - zfs jail "${_jid}" ${_ds} 2>/dev/null - fi - done - fi - done - - echo -} - -jail2_stop() -{ - echo -n "Stopping jails: " - - for _j in ${jail2_list}; do - echo -n "${_j} " - - if [ ! -e /var/run/jail_${_j}.id ]; then - echo "${_j} doesn't exists" - continue - fi - - eval _zfs=\"\${jail2_${_j}_zfs:-}\" - _jid=`jls -j ${_j} jid 2>/dev/null` - - jail -r -q ${_j} > /dev/null 2>&1 - rm /var/run/jail_${_j}.id - - if [ -n "${_zfs}" ]; then - for _ds in ${_zfs}; do - _jailed=`zfs get -H jailed ${_ds} 2>/dev/null | awk '{ print $3 }'` - if [ "${_jailed}" = "on" ]; then - zfs unjail "${_jid}" ${_ds} 2>/dev/null - fi - done - fi - done - - echo -} - -load_rc_config $name -: ${jail2_enable="NO"} - -cmd="$1" -if [ $# -gt 0 ]; then - shift -fi -if [ -n "$*" ]; then - jail2_list="$*" -fi - -run_rc_command "${cmd}" diff --git a/sysutils/jail2/pkg-descr b/sysutils/jail2/pkg-descr deleted file mode 100644 index db7e05e0f4eb..000000000000 --- a/sysutils/jail2/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -jail2 is an alternative rc script for jails, relying on jail.conf -instead of rc.conf variables. Additionally, ZFS integration is provided. -In contrast to the default jail rc script this one can run inside jails, -allowing the configuration of hierarchical jails. diff --git a/sysutils/puppet38/Makefile b/sysutils/puppet38/Makefile deleted file mode 100644 index fb51db2d9bf9..000000000000 --- a/sysutils/puppet38/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# Created by: Tomoyuki Sakurai <cherry@trombik.mine.nu> -# $FreeBSD$ - -PORTNAME= puppet -PORTVERSION= 3.8.7 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= http://downloads.puppetlabs.com/puppet/ -PKGNAMESUFFIX= 38 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Configuration management framework written in Ruby - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= rubygem-facter>=0:sysutils/rubygem-facter \ - rubygem-hiera1>=0:sysutils/rubygem-hiera1 -RUN_DEPENDS= rubygem-facter>=0:sysutils/rubygem-facter \ - rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \ - rubygem-hiera1>=0:sysutils/rubygem-hiera1 - -USES= cpe -CPE_VENDOR= puppetlabs -CONFLICTS_INSTALL= puppet37-* puppet4-* -NO_BUILD= yes -NO_ARCH= yes -USE_RUBY= yes -USE_RC_SUBR= puppet puppetmaster -PORTDOCS= LICENSE README.md -PORTEXAMPLES= * -USERS= puppet -GROUPS= puppet -SUB_FILES+= pkg-message -SUB_LIST= RUBY=${RUBY} - -OPTIONS_DEFINE= DOCS EXAMPLES - -DEPRECATED= Upstream support ended, see http://tinyurl.com/puppet3eol -EXPIRATION_DATE= 2017-02-05 - -post-patch: - @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/defaults.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/var/lib/puppet|/var/puppet|" \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|\$$vardir/run|/var/run/puppet|" \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ - ${WRKSRC}/lib/puppet/defaults.rb - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ - ${WRKSRC}/ext/rack/config.ru - -do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} - -post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests - ${MKDIR} ${STAGEDIR}${ETCDIR}/modules - ${MKDIR} ${STAGEDIR}/var/puppet - ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ - --confdir=${ETCDIR} \ - --rundir=/var/run/puppet \ - --vardir=/var/puppet \ - --logdir=/var/log/puppet \ - > ${STAGEDIR}${ETCDIR}/puppet.conf-dist - @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/semver.rb | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${MKDIR} ${STAGEDIR}${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} - -.include <bsd.port.mk> diff --git a/sysutils/puppet38/distinfo b/sysutils/puppet38/distinfo deleted file mode 100644 index bc4d4afb5a6e..000000000000 --- a/sysutils/puppet38/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1477311421 -SHA256 (puppet-3.8.7.tar.gz) = 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 -SIZE (puppet-3.8.7.tar.gz) = 2650247 diff --git a/sysutils/puppet38/files/patch-demote_ports_provider b/sysutils/puppet38/files/patch-demote_ports_provider deleted file mode 100644 index 6e5245f4c44c..000000000000 --- a/sysutils/puppet38/files/patch-demote_ports_provider +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb -index c802092..1f2ed43 100755 ---- lib/puppet/provider/package/ports.rb -+++ lib/puppet/provider/package/ports.rb -@@ -6,8 +6,6 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre - :portuninstall => "/usr/local/sbin/pkg_deinstall", - :portinfo => "/usr/sbin/pkg_info" - -- defaultfor :operatingsystem => :freebsd -- - # I hate ports - %w{INTERACTIVE UNAME}.each do |var| - ENV.delete(var) if ENV.include?(var) diff --git a/sysutils/puppet38/files/patch-ext__rack__config.ru b/sysutils/puppet38/files/patch-ext__rack__config.ru deleted file mode 100644 index 505fac04bbe6..000000000000 --- a/sysutils/puppet38/files/patch-ext__rack__config.ru +++ /dev/null @@ -1,13 +0,0 @@ ---- ./ext/rack/config.ru.orig 2013-12-20 16:47:22.876896492 +0000 -+++ ./ext/rack/config.ru 2013-12-20 16:47:33.826895721 +0000 -@@ -14,8 +14,8 @@ - # Rack applications typically don't start as root. Set --confdir and --vardir - # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing - # to ~puppet/.puppet --ARGV << "--confdir" << "/etc/puppet" --ARGV << "--vardir" << "/var/lib/puppet" -+ARGV << "--confdir" << "%%PREFIX%%/etc/puppet" -+ARGV << "--vardir" << "/var/puppet" - - # NOTE: it's unfortunate that we have to use the "CommandLine" class - # here to launch the app, but it contains some initialization logic diff --git a/sysutils/puppet38/files/patch-lib_puppet_provider_package_pkgng.rb b/sysutils/puppet38/files/patch-lib_puppet_provider_package_pkgng.rb deleted file mode 100644 index bd310d35c0a7..000000000000 --- a/sysutils/puppet38/files/patch-lib_puppet_provider_package_pkgng.rb +++ /dev/null @@ -1,145 +0,0 @@ ---- /dev/null -+++ lib/puppet/provider/package/pkgng.rb -@@ -0,0 +1,142 @@ -+require 'puppet/provider/package' -+ -+Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package do -+ desc "A PkgNG provider for FreeBSD and DragonFly." -+ -+ commands :pkg => "/usr/local/sbin/pkg" -+ -+ confine :operatingsystem => [:freebsd, :dragonfly] -+ -+ defaultfor :operatingsystem => [:freebsd, :dragonfly] -+ -+ has_feature :versionable -+ has_feature :upgradeable -+ -+ def self.get_query -+ pkg(['query', '-a', '%n %v %o']) -+ end -+ -+ def self.get_version_list -+ @version_info_list ||= pkg(['version', '-voRL=']) -+ end -+ -+ def self.get_latest_version(origin) -+ if latest_version = self.get_version_list.lines.find { |l| l =~ /^#{origin} / } -+ latest_version = latest_version.split(' ').last.split(')').first -+ return latest_version -+ end -+ nil -+ end -+ -+ def self.instances -+ packages = [] -+ begin -+ info = self.get_query -+ -+ unless info -+ return packages -+ end -+ -+ info.lines.each do |line| -+ -+ name, version, origin = line.chomp.split(" ", 3) -+ latest_version = get_latest_version(origin) || version -+ -+ pkg = { -+ :ensure => version, -+ :name => name, -+ :provider => self.name, -+ :origin => origin, -+ :version => version, -+ :latest => latest_version -+ } -+ packages << new(pkg) -+ end -+ -+ return packages -+ rescue Puppet::ExecutionFailure -+ nil -+ end -+ end -+ -+ def self.prefetch(resources) -+ packages = instances -+ resources.keys.each do |name| -+ if provider = packages.find{|p| p.name == name or p.origin == name } -+ resources[name].provider = provider -+ end -+ end -+ end -+ -+ def repo_tag_from_urn(urn) -+ # extract repo tag from URN: urn:freebsd:repo:<tag> -+ match = /^urn:freebsd:repo:(.+)$/.match(urn) -+ raise ArgumentError urn.inspect unless match -+ match[1] -+ end -+ -+ def install -+ source = resource[:source] -+ source = URI(source) unless source.nil? -+ -+ # Ensure we handle the version -+ case resource[:ensure] -+ when true, false, Symbol -+ installname = resource[:name] -+ else -+ # If resource[:name] is actually an origin (e.g. 'www/curl' instead of -+ # just 'curl'), drop the category prefix. pkgng doesn't support version -+ # pinning with the origin syntax (pkg install curl-1.2.3 is valid, but -+ # pkg install www/curl-1.2.3 is not). -+ if resource[:name] =~ /\// -+ installname = resource[:name].split('/')[1] + '-' + resource[:ensure] -+ else -+ installname = resource[:name] + '-' + resource[:ensure] -+ end -+ end -+ -+ if not source # install using default repo logic -+ args = ['install', '-qy', installname] -+ elsif source.scheme == 'urn' # install from repo named in URN -+ tag = repo_tag_from_urn(source.to_s) -+ args = ['install', '-qy', '-r', tag, installname] -+ else # add package located at URL -+ args = ['add', '-q', source.to_s] -+ end -+ -+ pkg(args) -+ end -+ -+ def uninstall -+ pkg(['remove', '-qy', resource[:name]]) -+ end -+ -+ def query -+ if @property_hash[:ensure] == nil -+ return nil -+ else -+ version = @property_hash[:version] -+ return { :version => version } -+ end -+ end -+ -+ def version -+ @property_hash[:version] -+ end -+ -+ # Upgrade to the latest version -+ def update -+ install -+ end -+ -+ # Return the latest version of the package -+ def latest -+ debug "returning the latest #{@property_hash[:name].inspect} version #{@property_hash[:latest].inspect}" -+ @property_hash[:latest] -+ end -+ -+ def origin -+ @property_hash[:origin] -+ end -+ -+end diff --git a/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb deleted file mode 100644 index 3857c824a1ba..000000000000 --- a/sysutils/puppet38/files/patch-lib_puppet_provider_service_daemontools.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC -+++ lib/puppet/provider/service/daemontools.rb -@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae - - EOT - -- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat" -+ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat" - - class << self - attr_writer :defpath -@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae - # find the service dir on this node - def servicedir - unless @servicedir -- ["/service", "/etc/service","/var/lib/svscan"].each do |path| -+ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path| - if Puppet::FileSystem.exist?(path) - @servicedir = path - break diff --git a/sysutils/puppet38/files/patch-lib_puppet_provider_service_freebsd.rb b/sysutils/puppet38/files/patch-lib_puppet_provider_service_freebsd.rb deleted file mode 100644 index 067d40b3b1ac..000000000000 --- a/sysutils/puppet38/files/patch-lib_puppet_provider_service_freebsd.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/puppet/provider/service/freebsd.rb.orig 2015-05-30 18:06:50 UTC -+++ lib/puppet/provider/service/freebsd.rb -@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :fre - - # Extract service name - def service_name -- extract_value_name('service', 0, /# (.*)/, '\1') -+ extract_value_name('service', 0, /# (\S+).*/, '\1') - end - - # Extract rcvar name diff --git a/sysutils/puppet38/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb b/sysutils/puppet38/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb deleted file mode 100644 index f81c496bd057..000000000000 --- a/sysutils/puppet38/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb.orig 2015-08-06 16:17:42 UTC -+++ lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb -@@ -3,7 +3,7 @@ require "yaml" - # This needs to be defined up front in case any internal classes need to base - # their behavior off of this. - module SafeYAML -- YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : "syck" -+ YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : (defined?(Psych) && YAML == Psych ? "psych" : "syck") - end - - require "set" diff --git a/sysutils/puppet38/files/pkg-message.in b/sysutils/puppet38/files/pkg-message.in deleted file mode 100644 index d036be0a93e0..000000000000 --- a/sysutils/puppet38/files/pkg-message.in +++ /dev/null @@ -1,14 +0,0 @@ - -To enable the puppet agent, add the following to /etc/rc.conf: - - puppet_enable="YES" - -To enable the puppetmaster, add the following to /etc/rc.conf: - - puppetmaster_enable="YES" - -Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are -deprecated. Use a single file, %%ETCDIR%%/puppet.conf. - -The default PID directory is /var/run/puppet - diff --git a/sysutils/puppet38/files/puppet.in b/sysutils/puppet38/files/puppet.in deleted file mode 100644 index 8ef80e5bd240..000000000000 --- a/sysutils/puppet38/files/puppet.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: puppet -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable the puppet agent: -# -# puppet_enable="YES" - -. /etc/rc.subr - -name="puppet" -rcvar=puppet_enable - -load_rc_config "$name" - -: ${puppet_enable="NO"} -: ${puppet_rundir="/var/run/puppet"} - -command="%%PREFIX%%/bin/puppet" -command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" -command_interpreter=%%RUBY%% -unset puppet_flags - -pidfile="${puppet_rundir}/agent.pid" -start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" - -run_rc_command "$1" diff --git a/sysutils/puppet38/files/puppetmaster.in b/sysutils/puppet38/files/puppetmaster.in deleted file mode 100644 index 8c7a93d19033..000000000000 --- a/sysutils/puppet38/files/puppetmaster.in +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: puppetmaster -# REQUIRE: LOGIN - -# Add the following lines to /etc/rc.conf to enable the puppetmaster: -# -# puppetmaster_enable="YES" -# - -. /etc/rc.subr - -name="puppetmaster" -rcvar=puppetmaster_enable - -load_rc_config "${name}" - -: ${puppetmaster_enable="NO"} -: ${puppetmaster_rundir="/var/run/puppet"} -: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} - -command_interpreter=%%RUBY%% -command="%%PREFIX%%/bin/puppet" -command_args="master ${puppetmaster_flags}" -unset puppetmaster_flags - -pidfile="${puppetmaster_rundir}/master.pid" -puppet_manifest="$($command config print manifest)" - -start_precmd="puppetmaster_checkconfig" -restart_precmd="puppetmaster_checkconfig" -puppetmaster_checkconfig() { - echo -n "Performing sanity check of ${name} configuration: " - if ! ${command} parser validate "${puppet_manifest}" - then - echo "FAILED" - return 1 - else - echo "OK" - return 0 - fi -} - -if [ -z "${puppetmaster_mongrel_ports}" ]; then - run_rc_command "$1" -else - for port in ${puppetmaster_mongrel_ports}; do - pidfile="${puppetmaster_rundir}/mongrel.${port}.pid" - command_args="master --pidfile=${pidfile} --servertype=mongrel --masterport=${port}" - run_rc_command "$1" - _rc_restart_done="false" - done -fi diff --git a/sysutils/puppet38/pkg-descr b/sysutils/puppet38/pkg-descr deleted file mode 100644 index 89a2fce63e8d..000000000000 --- a/sysutils/puppet38/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Puppet lets you centrally manage every important aspect of your system using -a cross-platform specification language that manages all the separate -elements normally aggregated in different files, like users, cron jobs, and -hosts, along with obviously discrete elements like packages, services, and -files. - -WWW: https://puppetlabs.com/puppet/puppet-open-source diff --git a/sysutils/puppet38/pkg-plist b/sysutils/puppet38/pkg-plist deleted file mode 100644 index c49bad37ddfb..000000000000 --- a/sysutils/puppet38/pkg-plist +++ /dev/null @@ -1,53 +0,0 @@ -bin/extlookup2hiera -bin/puppet -man/man5/puppet.conf.5.gz -man/man8/extlookup2hiera.8.gz -man/man8/puppet-agent.8.gz -man/man8/puppet-apply.8.gz -man/man8/puppet-ca.8.gz -man/man8/puppet-catalog.8.gz -man/man8/puppet-cert.8.gz -man/man8/puppet-certificate.8.gz -man/man8/puppet-certificate_request.8.gz -man/man8/puppet-certificate_revocation_list.8.gz -man/man8/puppet-config.8.gz -man/man8/puppet-describe.8.gz -man/man8/puppet-device.8.gz -man/man8/puppet-doc.8.gz -man/man8/puppet-facts.8.gz -man/man8/puppet-file.8.gz -man/man8/puppet-filebucket.8.gz -man/man8/puppet-help.8.gz -man/man8/puppet-inspect.8.gz -man/man8/puppet-instrumentation_data.8.gz -man/man8/puppet-instrumentation_listener.8.gz -man/man8/puppet-instrumentation_probe.8.gz -man/man8/puppet-key.8.gz -man/man8/puppet-kick.8.gz -man/man8/puppet-man.8.gz -man/man8/puppet-master.8.gz -man/man8/puppet-module.8.gz -man/man8/puppet-node.8.gz -man/man8/puppet-parser.8.gz -man/man8/puppet-plugin.8.gz -man/man8/puppet-queue.8.gz -man/man8/puppet-report.8.gz -man/man8/puppet-resource.8.gz -man/man8/puppet-resource_type.8.gz -man/man8/puppet-secret_agent.8.gz -man/man8/puppet-status.8.gz -man/man8/puppet.8.gz -%%RUBY_SITELIBDIR%%/hiera/backend/puppet_backend.rb -%%RUBY_SITELIBDIR%%/hiera/puppet_function.rb -%%RUBY_SITELIBDIR%%/hiera/scope.rb -%%RUBY_SITELIBDIR%%/hiera_puppet.rb -%%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers/json.rb -%%RUBY_SITELIBDIR%%/puppetx/puppet/syntax_checker.rb -%%RUBY_SITELIBDIR%%/puppetx/puppet/bindings_scheme_handler.rb -%%RUBY_SITELIBDIR%%/puppetx.rb -%%ETCDIR%%/puppet.conf-dist -%%ETCDIR%%/auth.conf-dist -@dir(puppet,puppet,) %%ETCDIR%%/manifests -@dir(puppet,puppet,) %%ETCDIR%%/modules -@(puppet,puppet,) www/puppet/config.ru -@dir(puppet,puppet,) /var/puppet diff --git a/textproc/Makefile b/textproc/Makefile index 53219d70377e..50696937d3db 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -219,7 +219,6 @@ SUBDIR += gnome-doc-utils SUBDIR += gnome-spell SUBDIR += gnugrep - SUBDIR += go-text SUBDIR += go.text SUBDIR += goldendict SUBDIR += google-ctemplate @@ -1123,7 +1122,6 @@ SUBDIR += p5-XML-XPath SUBDIR += p5-XML-XPathEngine SUBDIR += p5-XML-XQL - SUBDIR += p5-XML-XSH SUBDIR += p5-XML-XSLT SUBDIR += p5-XML-XUpdate-LibXML SUBDIR += p5-YAML diff --git a/textproc/go-text/Makefile b/textproc/go-text/Makefile deleted file mode 100644 index 376e16d3da16..000000000000 --- a/textproc/go-text/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Grzegorz Blach <gblach@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= go-text -PORTVERSION= 20130911 -CATEGORIES= textproc -MASTER_SITES= LOCAL/gblach/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Go package for manipulating paragraphs of text - -LICENSE= MIT - -USES= go -GO_PKGNAME= github.com/kr/text - -DEPRECATED= Go libraries should not be packaged -EXPIRATION_DATE= 2017-04-08 - -.include <bsd.port.mk> diff --git a/textproc/go-text/distinfo b/textproc/go-text/distinfo deleted file mode 100644 index 2c723e3997a8..000000000000 --- a/textproc/go-text/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (go-text-20130911.tar.gz) = 492f3836921e0613fa177fffda8d10371a468a6bf891976cd7595023f7977ee8 -SIZE (go-text-20130911.tar.gz) = 5680 diff --git a/textproc/go-text/pkg-descr b/textproc/go-text/pkg-descr deleted file mode 100644 index 5a050cfbede4..000000000000 --- a/textproc/go-text/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Go package which provides rudimentary functions for manipulating text -in paragraphs. - -WWW: https://github.com/kr/text diff --git a/textproc/go-text/pkg-plist b/textproc/go-text/pkg-plist deleted file mode 100644 index 8d1381aaf3f9..000000000000 --- a/textproc/go-text/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -%%GO_LIBDIR%%/%%GO_PKGNAME%%.a -%%GO_SRCDIR%%/%%GO_PKGNAME%%/License -%%GO_SRCDIR%%/%%GO_PKGNAME%%/Readme -%%GO_SRCDIR%%/%%GO_PKGNAME%%/colwriter/Readme -%%GO_SRCDIR%%/%%GO_PKGNAME%%/colwriter/column.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/colwriter/column_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/doc.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/indent.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/indent_test.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/mc/Readme -%%GO_SRCDIR%%/%%GO_PKGNAME%%/mc/mc.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/wrap.go -%%GO_SRCDIR%%/%%GO_PKGNAME%%/wrap_test.go diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile deleted file mode 100644 index 4028abcb6299..000000000000 --- a/textproc/p5-XML-XSH/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Lev Serebryakov <lev@serebryakov.spb.ru> -# $FreeBSD$ - -PORTNAME= XML-XSH -PORTVERSION= 1.8.4 -CATEGORIES= textproc perl5 -MASTER_SITES= CPAN -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= This is xsh - an XML Editing Shell - -LICENSE= ART10 GPLv2 -LICENSE_COMB= dual -LICENSE_FILE_ART10= ${WRKSRC}/Artistic -LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= p5-XML-LibXML>=0:textproc/p5-XML-LibXML \ - p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT \ - p5-XML-LibXML-Iterator>=0:textproc/p5-XML-LibXML-Iterator \ - p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \ - p5-XML-XUpdate-LibXML>=0:textproc/p5-XML-XUpdate-LibXML -RUN_DEPENDS:= ${BUILD_DEPENDS} - -DEPRECATED= Deprecated by upstream -EXPIRATION_DATE=2017-03-31 - -NO_ARCH= yes -USES= perl5 -USE_PERL5= configure - -.include <bsd.port.mk> diff --git a/textproc/p5-XML-XSH/distinfo b/textproc/p5-XML-XSH/distinfo deleted file mode 100644 index bbbd0a153e23..000000000000 --- a/textproc/p5-XML-XSH/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1489236481 -SHA256 (XML-XSH-1.8.4.tar.gz) = 0c7ac7e6e3f271c3ee9e392fab25d8a86f0fa19b268ec4caf5d8b1d4d166f8fa -SIZE (XML-XSH-1.8.4.tar.gz) = 247379 diff --git a/textproc/p5-XML-XSH/pkg-descr b/textproc/p5-XML-XSH/pkg-descr deleted file mode 100644 index 0112f1bd39a5..000000000000 --- a/textproc/p5-XML-XSH/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -xsh is a powerfull command-line XML (DOM) editing tool/programming -language in the manner of Unix shell interpreters and line-oriented text -editors like ed. It can be used either interactively or for batch-mode -XML processing. - -WWW: http://xsh.sourceforge.net/ -WWW: http://search.cpan.org/dist/XML-XSH/ diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist deleted file mode 100644 index 7226612d02db..000000000000 --- a/textproc/p5-XML-XSH/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/xsh -%%SITE_PERL%%/Inline/XSH.pm -%%SITE_PERL%%/XML/XSH.pm -%%SITE_PERL%%/XML/XSH.pod -%%SITE_PERL%%/XML/XSH/Completion.pm -%%SITE_PERL%%/XML/XSH/CompletionList.pm -%%SITE_PERL%%/XML/XSH/DummyXPathContext.pm -%%SITE_PERL%%/XML/XSH/Functions.pm -%%SITE_PERL%%/XML/XSH/GDOMECompat.pm -%%SITE_PERL%%/XML/XSH/Grammar.pm -%%SITE_PERL%%/XML/XSH/Help.pm -%%SITE_PERL%%/XML/XSH/Iterators.pm -%%SITE_PERL%%/XML/XSH/LibXMLCompat.pm -%%SITE_PERL%%/XML/XSH/Parser.pm -%%PERL5_MAN1%%/xsh.1.gz -%%PERL5_MAN3%%/XSH.3.gz diff --git a/www/Makefile b/www/Makefile index 084fe402383b..cb3452eeccc0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -522,7 +522,6 @@ SUBDIR += monast SUBDIR += mongoose SUBDIR += mongrel2 - SUBDIR += moodle29 SUBDIR += moodle30 SUBDIR += moodle31 SUBDIR += moodle32 @@ -798,7 +797,6 @@ SUBDIR += p5-Catalyst-Plugin-Session-Store-Memcached SUBDIR += p5-Catalyst-Plugin-Session-Store-Memcached-Fast SUBDIR += p5-Catalyst-Plugin-Setenv - SUBDIR += p5-Catalyst-Plugin-Singleton SUBDIR += p5-Catalyst-Plugin-SmartURI SUBDIR += p5-Catalyst-Plugin-StackTrace SUBDIR += p5-Catalyst-Plugin-Static @@ -1999,7 +1997,6 @@ SUBDIR += rubygem-jekyll-watch SUBDIR += rubygem-journey SUBDIR += rubygem-jquery-atwho-rails - SUBDIR += rubygem-jquery-atwho-rails-rails4 SUBDIR += rubygem-jquery-rails SUBDIR += rubygem-jquery-scrollto-rails SUBDIR += rubygem-jquery-turbolinks diff --git a/www/moodle29/Makefile b/www/moodle29/Makefile deleted file mode 100644 index 1685c7c4d95c..000000000000 --- a/www/moodle29/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# Created by: Javier Martin Rueda <jmrueda@diatel.upm.es> -# $FreeBSD$ - -PORTNAME= moodle -PORTVERSION= 2.9.9 -CATEGORIES= www -MASTER_SITES= SF/moodle/Moodle/stable29/ -PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} - -MAINTAINER= wen@FreeBSD.org -COMMENT= Course management system based on social constructionism - -LICENSE= GPLv3 - -DEPRECATED= Upstream support EoL, please migrate to moodle32 -EXPIRATION_DATE= 2017-04-10 - -CONFLICTS= moodle32-3.2.[0-9]* moodle31-3.1.[0-9]* moodle30-3.0.[0-9]* - -USES= cpe tar:tgz -USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ - soap openssl simplexml spl dom json zip zlib hash opcache intl -WRKSRC= ${WRKDIR}/moodle - -OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= MYSQL PGSQL MSSQL -OPTIONS_DEFINE= LDAP MIMETEX -OPTIONS_DEFAULT= MYSQL -MIMETEX_DESC= mimeTeX filter functionality support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MMSSQL} -USE_PHP+= mssql -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MMIMETEX} -RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex -.endif - -NO_BUILD= yes -PLIST= ${WRKDIR}/plist -SUB_FILES= pkg-message -SUB_LIST= MOODLEDIR=${MOODLEDIR} \ - MOODLEDATADIR=${MOODLEDATADIR} - -MOODLEDIR?= www/moodle -MOODLEDATADIR?= moodledata - -pre-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} - @${ECHO_CMD} "@mode 755" >> ${PLIST} - @${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST} - @${ECHO_CMD} "@mode" >> ${PLIST} - @${ECHO_CMD} "@group" >> ${PLIST} - @${ECHO_CMD} "@owner" >> ${PLIST} - -# Here for safety I do not set moodle diretory 0755 permission -# It require user write config.php manually then. - @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST} - -do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR} - @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR} -.if ${PORT_OPTIONS:MMIMETEX} - ${LN} -sf ${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi \ - ${STAGEDIR}${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd -.endif - -.include <bsd.port.mk> diff --git a/www/moodle29/distinfo b/www/moodle29/distinfo deleted file mode 100644 index 28f9a8ba017f..000000000000 --- a/www/moodle29/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1479195691 -SHA256 (moodle-2.9.9.tgz) = c7aab8387f88111923dd1063964e70c88f1a883b2820f28f273ff572634f5c3b -SIZE (moodle-2.9.9.tgz) = 36587881 diff --git a/www/moodle29/files/pkg-message.in b/www/moodle29/files/pkg-message.in deleted file mode 100644 index 4e6924275bcc..000000000000 --- a/www/moodle29/files/pkg-message.in +++ /dev/null @@ -1,66 +0,0 @@ -POST-INSTALL CONFIGURATION FOR MOODLE -===================================== - -1) Create a user and a database for Moodle to store all - its tables in (or choose an existing database). - It doesn't matter what the database or user names are, - as this will be configured in a later step. - NOTE: this package assumes that either the phpX-pgsql, - phpX-mysql, or phpX-mssql packages are installed. - -2) Add the following to your Apache configuration file - httpd.conf, and restart the server: - - For Apache versions earlier than 2.4: - - Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/ - AcceptPathInfo On - <Directory %%PREFIX%%/%%MOODLEDIR%%> - AllowOverride None - Order Allow,Deny - Allow from all - </Directory> - - For Apache version 2.4.x or above: - - Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/ - AcceptPathInfo On - <Directory %%PREFIX%%/%%MOODLEDIR%%/> - AllowOverride None - Require all granted - </Directory> - -3) Visit your Moodle site with a browser (i.e., - http://your.server.com/moodle/), and you should - be taken to the install.php script, which will lead - you through creating a config.php file and then - setting up Moodle, creating an admin account, etc. - - At one step, you will get a message saying that the - installer script was not able to automatically create - the config.php file. Just download it and copy it to - %%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it - will contain the database password in cleartext, so - set up whatever file permissions you deem more adequate. - For instance, user=root, group=www, mask=640. - -4) Set up a cron task to invoke the file admin/cron.php - every five minutes or so. For instance: - */5 * * * * fetch http://your.server.com/moodle/admin/cron.php - -For more information, see the INSTALL DOCUMENTATION: - - http://docs.moodle.org/en/Installing_Moodle - -It may be worth reading the installation docs even if Moodle seems -to be working at first, to ensure your PHP settings and database -configuration will allow Moodle to operate properly. - -If you are upgrading from an earlier version of Moodle, check out -possible additional steps at: - - http://docs.moodle.org/en/Upgrading - http://docs.moodle.org/en/Upgrading_to_Moodle_2.0 - -If you have real trouble, please visit the Moodle course -"Using Moodle" on moodle.org. diff --git a/www/moodle29/pkg-descr b/www/moodle29/pkg-descr deleted file mode 100644 index fe30e0d25bab..000000000000 --- a/www/moodle29/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Moodle is a course management system (CMS) - a free, Open Source software -package designed using sound pedagogical principles, to help educators -create effective online learning communities. You can use it on any -computer you have handy (including webhosts), yet it can scale from a -single-teacher site to a 40,000-student University. - -WWW: http://www.moodle.org/ diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile deleted file mode 100644 index 30e84b32e9cf..000000000000 --- a/www/p5-Catalyst-Plugin-Singleton/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= Catalyst-Plugin-Singleton -PORTVERSION= 0.2 -PORTEPOCH= 1 -CATEGORIES= www perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CPAN:BOBTFISH -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= Singleton accessors to context - -LICENSE= ART10 GPLv1 -LICENSE_COMB= dual - -BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:www/p5-Catalyst-Runtime -RUN_DEPENDS:= ${BUILD_DEPENDS} - -DEPRECATED= Deprecated by upstream -EXPIRATION_DATE=2017-03-31 - -NO_ARCH= yes -USES= perl5 -USE_PERL5= modbuild - -.include <bsd.port.mk> - diff --git a/www/p5-Catalyst-Plugin-Singleton/distinfo b/www/p5-Catalyst-Plugin-Singleton/distinfo deleted file mode 100644 index fcd038097779..000000000000 --- a/www/p5-Catalyst-Plugin-Singleton/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1488262684 -SHA256 (Catalyst-Plugin-Singleton-0.2.tar.gz) = 8570cd397bfa7b9f9d76f827acbb7922b9231067a4b93a8ba2e709991ef07fc6 -SIZE (Catalyst-Plugin-Singleton-0.2.tar.gz) = 3008 diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-descr b/www/p5-Catalyst-Plugin-Singleton/pkg-descr deleted file mode 100644 index 9c50febee418..000000000000 --- a/www/p5-Catalyst-Plugin-Singleton/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Singleton accessors to context. - -WWW: http://search.cpan.org/dist/Catalyst-Plugin-Singleton/ diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-plist b/www/p5-Catalyst-Plugin-Singleton/pkg-plist deleted file mode 100644 index b4d25e5ad919..000000000000 --- a/www/p5-Catalyst-Plugin-Singleton/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -%%SITE_PERL%%/Catalyst/Plugin/Singleton.pm -%%PERL5_MAN3%%/Catalyst::Plugin::Singleton.3.gz diff --git a/www/rubygem-jquery-atwho-rails-rails4/Makefile b/www/rubygem-jquery-atwho-rails-rails4/Makefile deleted file mode 100644 index 3bcd866b3422..000000000000 --- a/www/rubygem-jquery-atwho-rails-rails4/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -PORTNAME= jquery-atwho-rails -PORTVERSION= 1.3.2 -CATEGORIES= www rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails4 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= jQuery plugin that implements GitHub-like mentions - -LICENSE= MIT - -DEPRECATED= Use www/rubygem-jquery-atwho-rails instead -EXPIRATION_DATE=2017-03-31 - -NO_ARCH= yes -USE_RUBY= yes -USES= gem - -.include <bsd.port.mk> diff --git a/www/rubygem-jquery-atwho-rails-rails4/distinfo b/www/rubygem-jquery-atwho-rails-rails4/distinfo deleted file mode 100644 index 38af742efd48..000000000000 --- a/www/rubygem-jquery-atwho-rails-rails4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rubygem/jquery-atwho-rails-1.3.2.gem) = 899ba0a2c7bca6d0be192ff9056994c79e991e530243604b4424fad6581a023d -SIZE (rubygem/jquery-atwho-rails-1.3.2.gem) = 20480 diff --git a/www/rubygem-jquery-atwho-rails-rails4/pkg-descr b/www/rubygem-jquery-atwho-rails-rails4/pkg-descr deleted file mode 100644 index 3d9d8254a78a..000000000000 --- a/www/rubygem-jquery-atwho-rails-rails4/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a jQuery plugin that implement Github-like mentions. - -WWW: https://github.com/ichord/jquery-atwho-rails diff --git a/x11/Makefile b/x11/Makefile index bf35daaf0b78..74f22fa3b3ce 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -208,7 +208,6 @@ SUBDIR += lsw SUBDIR += luit SUBDIR += lumina - SUBDIR += lumina-i18n SUBDIR += lupe SUBDIR += lxde-meta SUBDIR += lxhotkey diff --git a/x11/lumina-i18n/Makefile b/x11/lumina-i18n/Makefile deleted file mode 100644 index 2864bc780d28..000000000000 --- a/x11/lumina-i18n/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Ken Moore <ken@pcbsd.org> -# $FreeBSD$ - -PORTNAME= lumina-i18n -PORTVERSION= 1.0.0 -CATEGORIES= x11 - -MAINTAINER= kmoore@FreeBSD.org -COMMENT= Lumina desktop environment localization files - -BROKEN= fails to install, conflicts with its run depends -DEPRECATED= Obsolete, i18n files included in x11/lumina -EXPIRATION_DATE= 2017-04-01 - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= lumina>=0:x11/lumina - -NO_BUILD= yes -NO_ARCH= yes - -USE_GITHUB= yes -GH_ACCOUNT= trueos -GH_PROJECT= lumina-i18n -GH_TAGNAME= a96928d - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/lumina-desktop/i18n - ${TAR} xvf ${WRKSRC}/dist/${PORTNAME}.txz -C ${STAGEDIR}${PREFIX}/share/lumina-desktop/i18n - -.include <bsd.port.mk> diff --git a/x11/lumina-i18n/distinfo b/x11/lumina-i18n/distinfo deleted file mode 100644 index 3bd5da58f14a..000000000000 --- a/x11/lumina-i18n/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1479791845 -SHA256 (trueos-lumina-i18n-1.0.0-a96928d_GH0.tar.gz) = 5e77b04700c3bc2b0265a4811c5e778b612ea88efa98dbb43fe3cbca331ed9ba -SIZE (trueos-lumina-i18n-1.0.0-a96928d_GH0.tar.gz) = 1625800 diff --git a/x11/lumina-i18n/pkg-descr b/x11/lumina-i18n/pkg-descr deleted file mode 100644 index 429d234ead72..000000000000 --- a/x11/lumina-i18n/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Lumina Desktop Environment localization files - -WWW: http://lumina-desktop.org diff --git a/x11/lumina-i18n/pkg-plist b/x11/lumina-i18n/pkg-plist deleted file mode 100644 index ed4d426ccfa5..000000000000 --- a/x11/lumina-i18n/pkg-plist +++ /dev/null @@ -1,660 +0,0 @@ -share/lumina-desktop/i18n/lumina-config_af.qm -share/lumina-desktop/i18n/lumina-config_ar.qm -share/lumina-desktop/i18n/lumina-config_az.qm -share/lumina-desktop/i18n/lumina-config_bg.qm -share/lumina-desktop/i18n/lumina-config_bn.qm -share/lumina-desktop/i18n/lumina-config_bs.qm -share/lumina-desktop/i18n/lumina-config_ca.qm -share/lumina-desktop/i18n/lumina-config_cs.qm -share/lumina-desktop/i18n/lumina-config_cy.qm -share/lumina-desktop/i18n/lumina-config_da.qm -share/lumina-desktop/i18n/lumina-config_de.qm -share/lumina-desktop/i18n/lumina-config_el.qm -share/lumina-desktop/i18n/lumina-config_en_GB.qm -share/lumina-desktop/i18n/lumina-config_en_ZA.qm -share/lumina-desktop/i18n/lumina-config_es.qm -share/lumina-desktop/i18n/lumina-config_et.qm -share/lumina-desktop/i18n/lumina-config_eu.qm -share/lumina-desktop/i18n/lumina-config_fa.qm -share/lumina-desktop/i18n/lumina-config_fi.qm -share/lumina-desktop/i18n/lumina-config_fr.qm -share/lumina-desktop/i18n/lumina-config_fr_CA.qm -share/lumina-desktop/i18n/lumina-config_fur.qm -share/lumina-desktop/i18n/lumina-config_gl.qm -share/lumina-desktop/i18n/lumina-config_he.qm -share/lumina-desktop/i18n/lumina-config_hi.qm -share/lumina-desktop/i18n/lumina-config_hr.qm -share/lumina-desktop/i18n/lumina-config_hu.qm -share/lumina-desktop/i18n/lumina-config_id.qm -share/lumina-desktop/i18n/lumina-config_is.qm -share/lumina-desktop/i18n/lumina-config_it.qm -share/lumina-desktop/i18n/lumina-config_ja.qm -share/lumina-desktop/i18n/lumina-config_ka.qm -share/lumina-desktop/i18n/lumina-config_ko.qm -share/lumina-desktop/i18n/lumina-config_lt.qm -share/lumina-desktop/i18n/lumina-config_lv.qm -share/lumina-desktop/i18n/lumina-config_mk.qm -share/lumina-desktop/i18n/lumina-config_mn.qm -share/lumina-desktop/i18n/lumina-config_ms.qm -share/lumina-desktop/i18n/lumina-config_mt.qm -share/lumina-desktop/i18n/lumina-config_nb.qm -share/lumina-desktop/i18n/lumina-config_ne.qm -share/lumina-desktop/i18n/lumina-config_nl.qm -share/lumina-desktop/i18n/lumina-config_pa.qm -share/lumina-desktop/i18n/lumina-config_pl.qm -share/lumina-desktop/i18n/lumina-config_pt.qm -share/lumina-desktop/i18n/lumina-config_pt_BR.qm -share/lumina-desktop/i18n/lumina-config_ro.qm -share/lumina-desktop/i18n/lumina-config_ru.qm -share/lumina-desktop/i18n/lumina-config_sa.qm -share/lumina-desktop/i18n/lumina-config_sk.qm -share/lumina-desktop/i18n/lumina-config_sl.qm -share/lumina-desktop/i18n/lumina-config_sr.qm -share/lumina-desktop/i18n/lumina-config_sv.qm -share/lumina-desktop/i18n/lumina-config_sw.qm -share/lumina-desktop/i18n/lumina-config_ta.qm -share/lumina-desktop/i18n/lumina-config_tg.qm -share/lumina-desktop/i18n/lumina-config_th.qm -share/lumina-desktop/i18n/lumina-config_tr.qm -share/lumina-desktop/i18n/lumina-config_uk.qm -share/lumina-desktop/i18n/lumina-config_ur.qm -share/lumina-desktop/i18n/lumina-config_uz.qm -share/lumina-desktop/i18n/lumina-config_vi.qm -share/lumina-desktop/i18n/lumina-config_zh_CN.qm -share/lumina-desktop/i18n/lumina-config_zh_HK.qm -share/lumina-desktop/i18n/lumina-config_zh_TW.qm -share/lumina-desktop/i18n/lumina-config_zu.qm -share/lumina-desktop/i18n/lumina-desktop_af.qm -share/lumina-desktop/i18n/lumina-desktop_ar.qm -share/lumina-desktop/i18n/lumina-desktop_az.qm -share/lumina-desktop/i18n/lumina-desktop_bg.qm -share/lumina-desktop/i18n/lumina-desktop_bn.qm -share/lumina-desktop/i18n/lumina-desktop_bs.qm -share/lumina-desktop/i18n/lumina-desktop_ca.qm -share/lumina-desktop/i18n/lumina-desktop_cs.qm -share/lumina-desktop/i18n/lumina-desktop_cy.qm -share/lumina-desktop/i18n/lumina-desktop_da.qm -share/lumina-desktop/i18n/lumina-desktop_de.qm -share/lumina-desktop/i18n/lumina-desktop_el.qm -share/lumina-desktop/i18n/lumina-desktop_en_GB.qm -share/lumina-desktop/i18n/lumina-desktop_en_ZA.qm -share/lumina-desktop/i18n/lumina-desktop_es.qm -share/lumina-desktop/i18n/lumina-desktop_et.qm -share/lumina-desktop/i18n/lumina-desktop_eu.qm -share/lumina-desktop/i18n/lumina-desktop_fa.qm -share/lumina-desktop/i18n/lumina-desktop_fi.qm -share/lumina-desktop/i18n/lumina-desktop_fr.qm -share/lumina-desktop/i18n/lumina-desktop_fr_CA.qm -share/lumina-desktop/i18n/lumina-desktop_fur.qm -share/lumina-desktop/i18n/lumina-desktop_gl.qm -share/lumina-desktop/i18n/lumina-desktop_he.qm -share/lumina-desktop/i18n/lumina-desktop_hi.qm -share/lumina-desktop/i18n/lumina-desktop_hr.qm -share/lumina-desktop/i18n/lumina-desktop_hu.qm -share/lumina-desktop/i18n/lumina-desktop_id.qm -share/lumina-desktop/i18n/lumina-desktop_is.qm -share/lumina-desktop/i18n/lumina-desktop_it.qm -share/lumina-desktop/i18n/lumina-desktop_ja.qm -share/lumina-desktop/i18n/lumina-desktop_ka.qm -share/lumina-desktop/i18n/lumina-desktop_ko.qm -share/lumina-desktop/i18n/lumina-desktop_lt.qm -share/lumina-desktop/i18n/lumina-desktop_lv.qm -share/lumina-desktop/i18n/lumina-desktop_mk.qm -share/lumina-desktop/i18n/lumina-desktop_mn.qm -share/lumina-desktop/i18n/lumina-desktop_ms.qm -share/lumina-desktop/i18n/lumina-desktop_mt.qm -share/lumina-desktop/i18n/lumina-desktop_nb.qm -share/lumina-desktop/i18n/lumina-desktop_ne.qm -share/lumina-desktop/i18n/lumina-desktop_nl.qm -share/lumina-desktop/i18n/lumina-desktop_pa.qm -share/lumina-desktop/i18n/lumina-desktop_pl.qm -share/lumina-desktop/i18n/lumina-desktop_pt.qm -share/lumina-desktop/i18n/lumina-desktop_pt_BR.qm -share/lumina-desktop/i18n/lumina-desktop_ro.qm -share/lumina-desktop/i18n/lumina-desktop_ru.qm -share/lumina-desktop/i18n/lumina-desktop_sa.qm -share/lumina-desktop/i18n/lumina-desktop_sk.qm -share/lumina-desktop/i18n/lumina-desktop_sl.qm -share/lumina-desktop/i18n/lumina-desktop_sr.qm -share/lumina-desktop/i18n/lumina-desktop_sv.qm -share/lumina-desktop/i18n/lumina-desktop_sw.qm -share/lumina-desktop/i18n/lumina-desktop_ta.qm -share/lumina-desktop/i18n/lumina-desktop_tg.qm -share/lumina-desktop/i18n/lumina-desktop_th.qm -share/lumina-desktop/i18n/lumina-desktop_tr.qm -share/lumina-desktop/i18n/lumina-desktop_uk.qm -share/lumina-desktop/i18n/lumina-desktop_ur.qm -share/lumina-desktop/i18n/lumina-desktop_uz.qm -share/lumina-desktop/i18n/lumina-desktop_vi.qm -share/lumina-desktop/i18n/lumina-desktop_zh_CN.qm -share/lumina-desktop/i18n/lumina-desktop_zh_HK.qm -share/lumina-desktop/i18n/lumina-desktop_zh_TW.qm -share/lumina-desktop/i18n/lumina-desktop_zu.qm -share/lumina-desktop/i18n/lumina-fileinfo_af.qm -share/lumina-desktop/i18n/lumina-fileinfo_ar.qm -share/lumina-desktop/i18n/lumina-fileinfo_az.qm -share/lumina-desktop/i18n/lumina-fileinfo_bg.qm -share/lumina-desktop/i18n/lumina-fileinfo_bn.qm -share/lumina-desktop/i18n/lumina-fileinfo_bs.qm -share/lumina-desktop/i18n/lumina-fileinfo_ca.qm -share/lumina-desktop/i18n/lumina-fileinfo_cs.qm -share/lumina-desktop/i18n/lumina-fileinfo_cy.qm -share/lumina-desktop/i18n/lumina-fileinfo_da.qm -share/lumina-desktop/i18n/lumina-fileinfo_de.qm -share/lumina-desktop/i18n/lumina-fileinfo_el.qm -share/lumina-desktop/i18n/lumina-fileinfo_en_GB.qm -share/lumina-desktop/i18n/lumina-fileinfo_en_ZA.qm -share/lumina-desktop/i18n/lumina-fileinfo_es.qm -share/lumina-desktop/i18n/lumina-fileinfo_et.qm -share/lumina-desktop/i18n/lumina-fileinfo_eu.qm -share/lumina-desktop/i18n/lumina-fileinfo_fa.qm -share/lumina-desktop/i18n/lumina-fileinfo_fi.qm -share/lumina-desktop/i18n/lumina-fileinfo_fr.qm -share/lumina-desktop/i18n/lumina-fileinfo_fr_CA.qm -share/lumina-desktop/i18n/lumina-fileinfo_fur.qm -share/lumina-desktop/i18n/lumina-fileinfo_gl.qm -share/lumina-desktop/i18n/lumina-fileinfo_he.qm -share/lumina-desktop/i18n/lumina-fileinfo_hi.qm -share/lumina-desktop/i18n/lumina-fileinfo_hr.qm -share/lumina-desktop/i18n/lumina-fileinfo_hu.qm -share/lumina-desktop/i18n/lumina-fileinfo_id.qm -share/lumina-desktop/i18n/lumina-fileinfo_is.qm -share/lumina-desktop/i18n/lumina-fileinfo_it.qm -share/lumina-desktop/i18n/lumina-fileinfo_ja.qm -share/lumina-desktop/i18n/lumina-fileinfo_ka.qm -share/lumina-desktop/i18n/lumina-fileinfo_ko.qm -share/lumina-desktop/i18n/lumina-fileinfo_lt.qm -share/lumina-desktop/i18n/lumina-fileinfo_lv.qm -share/lumina-desktop/i18n/lumina-fileinfo_mk.qm -share/lumina-desktop/i18n/lumina-fileinfo_mn.qm -share/lumina-desktop/i18n/lumina-fileinfo_ms.qm -share/lumina-desktop/i18n/lumina-fileinfo_mt.qm -share/lumina-desktop/i18n/lumina-fileinfo_nb.qm -share/lumina-desktop/i18n/lumina-fileinfo_ne.qm -share/lumina-desktop/i18n/lumina-fileinfo_nl.qm -share/lumina-desktop/i18n/lumina-fileinfo_pa.qm -share/lumina-desktop/i18n/lumina-fileinfo_pl.qm -share/lumina-desktop/i18n/lumina-fileinfo_pt.qm -share/lumina-desktop/i18n/lumina-fileinfo_pt_BR.qm -share/lumina-desktop/i18n/lumina-fileinfo_ro.qm -share/lumina-desktop/i18n/lumina-fileinfo_ru.qm -share/lumina-desktop/i18n/lumina-fileinfo_sa.qm -share/lumina-desktop/i18n/lumina-fileinfo_sk.qm -share/lumina-desktop/i18n/lumina-fileinfo_sl.qm -share/lumina-desktop/i18n/lumina-fileinfo_sr.qm -share/lumina-desktop/i18n/lumina-fileinfo_sv.qm -share/lumina-desktop/i18n/lumina-fileinfo_sw.qm -share/lumina-desktop/i18n/lumina-fileinfo_ta.qm -share/lumina-desktop/i18n/lumina-fileinfo_tg.qm -share/lumina-desktop/i18n/lumina-fileinfo_th.qm -share/lumina-desktop/i18n/lumina-fileinfo_tr.qm -share/lumina-desktop/i18n/lumina-fileinfo_uk.qm -share/lumina-desktop/i18n/lumina-fileinfo_ur.qm -share/lumina-desktop/i18n/lumina-fileinfo_uz.qm -share/lumina-desktop/i18n/lumina-fileinfo_vi.qm -share/lumina-desktop/i18n/lumina-fileinfo_zh_CN.qm -share/lumina-desktop/i18n/lumina-fileinfo_zh_HK.qm -share/lumina-desktop/i18n/lumina-fileinfo_zh_TW.qm -share/lumina-desktop/i18n/lumina-fileinfo_zu.qm -share/lumina-desktop/i18n/lumina-fm_af.qm -share/lumina-desktop/i18n/lumina-fm_ar.qm -share/lumina-desktop/i18n/lumina-fm_az.qm -share/lumina-desktop/i18n/lumina-fm_bg.qm -share/lumina-desktop/i18n/lumina-fm_bn.qm -share/lumina-desktop/i18n/lumina-fm_bs.qm -share/lumina-desktop/i18n/lumina-fm_ca.qm -share/lumina-desktop/i18n/lumina-fm_cs.qm -share/lumina-desktop/i18n/lumina-fm_cy.qm -share/lumina-desktop/i18n/lumina-fm_da.qm -share/lumina-desktop/i18n/lumina-fm_de.qm -share/lumina-desktop/i18n/lumina-fm_el.qm -share/lumina-desktop/i18n/lumina-fm_en_GB.qm -share/lumina-desktop/i18n/lumina-fm_en_ZA.qm -share/lumina-desktop/i18n/lumina-fm_es.qm -share/lumina-desktop/i18n/lumina-fm_et.qm -share/lumina-desktop/i18n/lumina-fm_eu.qm -share/lumina-desktop/i18n/lumina-fm_fa.qm -share/lumina-desktop/i18n/lumina-fm_fi.qm -share/lumina-desktop/i18n/lumina-fm_fr.qm -share/lumina-desktop/i18n/lumina-fm_fr_CA.qm -share/lumina-desktop/i18n/lumina-fm_fur.qm -share/lumina-desktop/i18n/lumina-fm_gl.qm -share/lumina-desktop/i18n/lumina-fm_he.qm -share/lumina-desktop/i18n/lumina-fm_hi.qm -share/lumina-desktop/i18n/lumina-fm_hr.qm -share/lumina-desktop/i18n/lumina-fm_hu.qm -share/lumina-desktop/i18n/lumina-fm_id.qm -share/lumina-desktop/i18n/lumina-fm_is.qm -share/lumina-desktop/i18n/lumina-fm_it.qm -share/lumina-desktop/i18n/lumina-fm_ja.qm -share/lumina-desktop/i18n/lumina-fm_ka.qm -share/lumina-desktop/i18n/lumina-fm_ko.qm -share/lumina-desktop/i18n/lumina-fm_lt.qm -share/lumina-desktop/i18n/lumina-fm_lv.qm -share/lumina-desktop/i18n/lumina-fm_mk.qm -share/lumina-desktop/i18n/lumina-fm_mn.qm -share/lumina-desktop/i18n/lumina-fm_ms.qm -share/lumina-desktop/i18n/lumina-fm_mt.qm -share/lumina-desktop/i18n/lumina-fm_nb.qm -share/lumina-desktop/i18n/lumina-fm_ne.qm -share/lumina-desktop/i18n/lumina-fm_nl.qm -share/lumina-desktop/i18n/lumina-fm_pa.qm -share/lumina-desktop/i18n/lumina-fm_pl.qm -share/lumina-desktop/i18n/lumina-fm_pt.qm -share/lumina-desktop/i18n/lumina-fm_pt_BR.qm -share/lumina-desktop/i18n/lumina-fm_ro.qm -share/lumina-desktop/i18n/lumina-fm_ru.qm -share/lumina-desktop/i18n/lumina-fm_sa.qm -share/lumina-desktop/i18n/lumina-fm_sk.qm -share/lumina-desktop/i18n/lumina-fm_sl.qm -share/lumina-desktop/i18n/lumina-fm_sr.qm -share/lumina-desktop/i18n/lumina-fm_sv.qm -share/lumina-desktop/i18n/lumina-fm_sw.qm -share/lumina-desktop/i18n/lumina-fm_ta.qm -share/lumina-desktop/i18n/lumina-fm_tg.qm -share/lumina-desktop/i18n/lumina-fm_th.qm -share/lumina-desktop/i18n/lumina-fm_tr.qm -share/lumina-desktop/i18n/lumina-fm_uk.qm -share/lumina-desktop/i18n/lumina-fm_ur.qm -share/lumina-desktop/i18n/lumina-fm_uz.qm -share/lumina-desktop/i18n/lumina-fm_vi.qm -share/lumina-desktop/i18n/lumina-fm_zh_CN.qm -share/lumina-desktop/i18n/lumina-fm_zh_HK.qm -share/lumina-desktop/i18n/lumina-fm_zh_TW.qm -share/lumina-desktop/i18n/lumina-fm_zu.qm -share/lumina-desktop/i18n/lumina-info_af.qm -share/lumina-desktop/i18n/lumina-info_ar.qm -share/lumina-desktop/i18n/lumina-info_az.qm -share/lumina-desktop/i18n/lumina-info_bg.qm -share/lumina-desktop/i18n/lumina-info_bn.qm -share/lumina-desktop/i18n/lumina-info_bs.qm -share/lumina-desktop/i18n/lumina-info_ca.qm -share/lumina-desktop/i18n/lumina-info_cs.qm -share/lumina-desktop/i18n/lumina-info_cy.qm -share/lumina-desktop/i18n/lumina-info_da.qm -share/lumina-desktop/i18n/lumina-info_de.qm -share/lumina-desktop/i18n/lumina-info_el.qm -share/lumina-desktop/i18n/lumina-info_en_GB.qm -share/lumina-desktop/i18n/lumina-info_en_ZA.qm -share/lumina-desktop/i18n/lumina-info_es.qm -share/lumina-desktop/i18n/lumina-info_et.qm -share/lumina-desktop/i18n/lumina-info_eu.qm -share/lumina-desktop/i18n/lumina-info_fa.qm -share/lumina-desktop/i18n/lumina-info_fi.qm -share/lumina-desktop/i18n/lumina-info_fr.qm -share/lumina-desktop/i18n/lumina-info_fr_CA.qm -share/lumina-desktop/i18n/lumina-info_fur.qm -share/lumina-desktop/i18n/lumina-info_gl.qm -share/lumina-desktop/i18n/lumina-info_he.qm -share/lumina-desktop/i18n/lumina-info_hi.qm -share/lumina-desktop/i18n/lumina-info_hr.qm -share/lumina-desktop/i18n/lumina-info_hu.qm -share/lumina-desktop/i18n/lumina-info_id.qm -share/lumina-desktop/i18n/lumina-info_is.qm -share/lumina-desktop/i18n/lumina-info_it.qm -share/lumina-desktop/i18n/lumina-info_ja.qm -share/lumina-desktop/i18n/lumina-info_ka.qm -share/lumina-desktop/i18n/lumina-info_ko.qm -share/lumina-desktop/i18n/lumina-info_lt.qm -share/lumina-desktop/i18n/lumina-info_lv.qm -share/lumina-desktop/i18n/lumina-info_mk.qm -share/lumina-desktop/i18n/lumina-info_mn.qm -share/lumina-desktop/i18n/lumina-info_ms.qm -share/lumina-desktop/i18n/lumina-info_mt.qm -share/lumina-desktop/i18n/lumina-info_nb.qm -share/lumina-desktop/i18n/lumina-info_ne.qm -share/lumina-desktop/i18n/lumina-info_nl.qm -share/lumina-desktop/i18n/lumina-info_pa.qm -share/lumina-desktop/i18n/lumina-info_pl.qm -share/lumina-desktop/i18n/lumina-info_pt.qm -share/lumina-desktop/i18n/lumina-info_pt_BR.qm -share/lumina-desktop/i18n/lumina-info_ro.qm -share/lumina-desktop/i18n/lumina-info_ru.qm -share/lumina-desktop/i18n/lumina-info_sa.qm -share/lumina-desktop/i18n/lumina-info_sk.qm -share/lumina-desktop/i18n/lumina-info_sl.qm -share/lumina-desktop/i18n/lumina-info_sr.qm -share/lumina-desktop/i18n/lumina-info_sv.qm -share/lumina-desktop/i18n/lumina-info_sw.qm -share/lumina-desktop/i18n/lumina-info_ta.qm -share/lumina-desktop/i18n/lumina-info_tg.qm -share/lumina-desktop/i18n/lumina-info_th.qm -share/lumina-desktop/i18n/lumina-info_tr.qm -share/lumina-desktop/i18n/lumina-info_uk.qm -share/lumina-desktop/i18n/lumina-info_ur.qm -share/lumina-desktop/i18n/lumina-info_uz.qm -share/lumina-desktop/i18n/lumina-info_vi.qm -share/lumina-desktop/i18n/lumina-info_zh_CN.qm -share/lumina-desktop/i18n/lumina-info_zh_HK.qm -share/lumina-desktop/i18n/lumina-info_zh_TW.qm -share/lumina-desktop/i18n/lumina-info_zu.qm -share/lumina-desktop/i18n/lumina-open_af.qm -share/lumina-desktop/i18n/lumina-open_ar.qm -share/lumina-desktop/i18n/lumina-open_az.qm -share/lumina-desktop/i18n/lumina-open_bg.qm -share/lumina-desktop/i18n/lumina-open_bn.qm -share/lumina-desktop/i18n/lumina-open_bs.qm -share/lumina-desktop/i18n/lumina-open_ca.qm -share/lumina-desktop/i18n/lumina-open_cs.qm -share/lumina-desktop/i18n/lumina-open_cy.qm -share/lumina-desktop/i18n/lumina-open_da.qm -share/lumina-desktop/i18n/lumina-open_de.qm -share/lumina-desktop/i18n/lumina-open_el.qm -share/lumina-desktop/i18n/lumina-open_en_GB.qm -share/lumina-desktop/i18n/lumina-open_en_ZA.qm -share/lumina-desktop/i18n/lumina-open_es.qm -share/lumina-desktop/i18n/lumina-open_et.qm -share/lumina-desktop/i18n/lumina-open_eu.qm -share/lumina-desktop/i18n/lumina-open_fa.qm -share/lumina-desktop/i18n/lumina-open_fi.qm -share/lumina-desktop/i18n/lumina-open_fr.qm -share/lumina-desktop/i18n/lumina-open_fr_CA.qm -share/lumina-desktop/i18n/lumina-open_fur.qm -share/lumina-desktop/i18n/lumina-open_gl.qm -share/lumina-desktop/i18n/lumina-open_he.qm -share/lumina-desktop/i18n/lumina-open_hi.qm -share/lumina-desktop/i18n/lumina-open_hr.qm -share/lumina-desktop/i18n/lumina-open_hu.qm -share/lumina-desktop/i18n/lumina-open_id.qm -share/lumina-desktop/i18n/lumina-open_is.qm -share/lumina-desktop/i18n/lumina-open_it.qm -share/lumina-desktop/i18n/lumina-open_ja.qm -share/lumina-desktop/i18n/lumina-open_ka.qm -share/lumina-desktop/i18n/lumina-open_ko.qm -share/lumina-desktop/i18n/lumina-open_lt.qm -share/lumina-desktop/i18n/lumina-open_lv.qm -share/lumina-desktop/i18n/lumina-open_mk.qm -share/lumina-desktop/i18n/lumina-open_mn.qm -share/lumina-desktop/i18n/lumina-open_ms.qm -share/lumina-desktop/i18n/lumina-open_mt.qm -share/lumina-desktop/i18n/lumina-open_nb.qm -share/lumina-desktop/i18n/lumina-open_ne.qm -share/lumina-desktop/i18n/lumina-open_nl.qm -share/lumina-desktop/i18n/lumina-open_pa.qm -share/lumina-desktop/i18n/lumina-open_pl.qm -share/lumina-desktop/i18n/lumina-open_pt.qm -share/lumina-desktop/i18n/lumina-open_pt_BR.qm -share/lumina-desktop/i18n/lumina-open_ro.qm -share/lumina-desktop/i18n/lumina-open_ru.qm -share/lumina-desktop/i18n/lumina-open_sa.qm -share/lumina-desktop/i18n/lumina-open_sk.qm -share/lumina-desktop/i18n/lumina-open_sl.qm -share/lumina-desktop/i18n/lumina-open_sr.qm -share/lumina-desktop/i18n/lumina-open_sv.qm -share/lumina-desktop/i18n/lumina-open_sw.qm -share/lumina-desktop/i18n/lumina-open_ta.qm -share/lumina-desktop/i18n/lumina-open_tg.qm -share/lumina-desktop/i18n/lumina-open_th.qm -share/lumina-desktop/i18n/lumina-open_tr.qm -share/lumina-desktop/i18n/lumina-open_uk.qm -share/lumina-desktop/i18n/lumina-open_ur.qm -share/lumina-desktop/i18n/lumina-open_uz.qm -share/lumina-desktop/i18n/lumina-open_vi.qm -share/lumina-desktop/i18n/lumina-open_zh_CN.qm -share/lumina-desktop/i18n/lumina-open_zh_HK.qm -share/lumina-desktop/i18n/lumina-open_zh_TW.qm -share/lumina-desktop/i18n/lumina-open_zu.qm -share/lumina-desktop/i18n/lumina-screenshot_af.qm -share/lumina-desktop/i18n/lumina-screenshot_ar.qm -share/lumina-desktop/i18n/lumina-screenshot_az.qm -share/lumina-desktop/i18n/lumina-screenshot_bg.qm -share/lumina-desktop/i18n/lumina-screenshot_bn.qm -share/lumina-desktop/i18n/lumina-screenshot_bs.qm -share/lumina-desktop/i18n/lumina-screenshot_ca.qm -share/lumina-desktop/i18n/lumina-screenshot_cs.qm -share/lumina-desktop/i18n/lumina-screenshot_cy.qm -share/lumina-desktop/i18n/lumina-screenshot_da.qm -share/lumina-desktop/i18n/lumina-screenshot_de.qm -share/lumina-desktop/i18n/lumina-screenshot_el.qm -share/lumina-desktop/i18n/lumina-screenshot_en_GB.qm -share/lumina-desktop/i18n/lumina-screenshot_en_ZA.qm -share/lumina-desktop/i18n/lumina-screenshot_es.qm -share/lumina-desktop/i18n/lumina-screenshot_et.qm -share/lumina-desktop/i18n/lumina-screenshot_eu.qm -share/lumina-desktop/i18n/lumina-screenshot_fa.qm -share/lumina-desktop/i18n/lumina-screenshot_fi.qm -share/lumina-desktop/i18n/lumina-screenshot_fr.qm -share/lumina-desktop/i18n/lumina-screenshot_fr_CA.qm -share/lumina-desktop/i18n/lumina-screenshot_fur.qm -share/lumina-desktop/i18n/lumina-screenshot_gl.qm -share/lumina-desktop/i18n/lumina-screenshot_he.qm -share/lumina-desktop/i18n/lumina-screenshot_hi.qm -share/lumina-desktop/i18n/lumina-screenshot_hr.qm -share/lumina-desktop/i18n/lumina-screenshot_hu.qm -share/lumina-desktop/i18n/lumina-screenshot_id.qm -share/lumina-desktop/i18n/lumina-screenshot_is.qm -share/lumina-desktop/i18n/lumina-screenshot_it.qm -share/lumina-desktop/i18n/lumina-screenshot_ja.qm -share/lumina-desktop/i18n/lumina-screenshot_ka.qm -share/lumina-desktop/i18n/lumina-screenshot_ko.qm -share/lumina-desktop/i18n/lumina-screenshot_lt.qm -share/lumina-desktop/i18n/lumina-screenshot_lv.qm -share/lumina-desktop/i18n/lumina-screenshot_mk.qm -share/lumina-desktop/i18n/lumina-screenshot_mn.qm -share/lumina-desktop/i18n/lumina-screenshot_ms.qm -share/lumina-desktop/i18n/lumina-screenshot_mt.qm -share/lumina-desktop/i18n/lumina-screenshot_nb.qm -share/lumina-desktop/i18n/lumina-screenshot_ne.qm -share/lumina-desktop/i18n/lumina-screenshot_nl.qm -share/lumina-desktop/i18n/lumina-screenshot_pa.qm -share/lumina-desktop/i18n/lumina-screenshot_pl.qm -share/lumina-desktop/i18n/lumina-screenshot_pt.qm -share/lumina-desktop/i18n/lumina-screenshot_pt_BR.qm -share/lumina-desktop/i18n/lumina-screenshot_ro.qm -share/lumina-desktop/i18n/lumina-screenshot_ru.qm -share/lumina-desktop/i18n/lumina-screenshot_sa.qm -share/lumina-desktop/i18n/lumina-screenshot_sk.qm -share/lumina-desktop/i18n/lumina-screenshot_sl.qm -share/lumina-desktop/i18n/lumina-screenshot_sr.qm -share/lumina-desktop/i18n/lumina-screenshot_sv.qm -share/lumina-desktop/i18n/lumina-screenshot_sw.qm -share/lumina-desktop/i18n/lumina-screenshot_ta.qm -share/lumina-desktop/i18n/lumina-screenshot_tg.qm -share/lumina-desktop/i18n/lumina-screenshot_th.qm -share/lumina-desktop/i18n/lumina-screenshot_tr.qm -share/lumina-desktop/i18n/lumina-screenshot_uk.qm -share/lumina-desktop/i18n/lumina-screenshot_ur.qm -share/lumina-desktop/i18n/lumina-screenshot_uz.qm -share/lumina-desktop/i18n/lumina-screenshot_vi.qm -share/lumina-desktop/i18n/lumina-screenshot_zh_CN.qm -share/lumina-desktop/i18n/lumina-screenshot_zh_HK.qm -share/lumina-desktop/i18n/lumina-screenshot_zh_TW.qm -share/lumina-desktop/i18n/lumina-screenshot_zu.qm -share/lumina-desktop/i18n/lumina-search_af.qm -share/lumina-desktop/i18n/lumina-search_ar.qm -share/lumina-desktop/i18n/lumina-search_az.qm -share/lumina-desktop/i18n/lumina-search_bg.qm -share/lumina-desktop/i18n/lumina-search_bn.qm -share/lumina-desktop/i18n/lumina-search_bs.qm -share/lumina-desktop/i18n/lumina-search_ca.qm -share/lumina-desktop/i18n/lumina-search_cs.qm -share/lumina-desktop/i18n/lumina-search_cy.qm -share/lumina-desktop/i18n/lumina-search_da.qm -share/lumina-desktop/i18n/lumina-search_de.qm -share/lumina-desktop/i18n/lumina-search_el.qm -share/lumina-desktop/i18n/lumina-search_en_GB.qm -share/lumina-desktop/i18n/lumina-search_en_ZA.qm -share/lumina-desktop/i18n/lumina-search_es.qm -share/lumina-desktop/i18n/lumina-search_et.qm -share/lumina-desktop/i18n/lumina-search_eu.qm -share/lumina-desktop/i18n/lumina-search_fa.qm -share/lumina-desktop/i18n/lumina-search_fi.qm -share/lumina-desktop/i18n/lumina-search_fr.qm -share/lumina-desktop/i18n/lumina-search_fr_CA.qm -share/lumina-desktop/i18n/lumina-search_fur.qm -share/lumina-desktop/i18n/lumina-search_gl.qm -share/lumina-desktop/i18n/lumina-search_he.qm -share/lumina-desktop/i18n/lumina-search_hi.qm -share/lumina-desktop/i18n/lumina-search_hr.qm -share/lumina-desktop/i18n/lumina-search_hu.qm -share/lumina-desktop/i18n/lumina-search_id.qm -share/lumina-desktop/i18n/lumina-search_is.qm -share/lumina-desktop/i18n/lumina-search_it.qm -share/lumina-desktop/i18n/lumina-search_ja.qm -share/lumina-desktop/i18n/lumina-search_ka.qm -share/lumina-desktop/i18n/lumina-search_ko.qm -share/lumina-desktop/i18n/lumina-search_lt.qm -share/lumina-desktop/i18n/lumina-search_lv.qm -share/lumina-desktop/i18n/lumina-search_mk.qm -share/lumina-desktop/i18n/lumina-search_mn.qm -share/lumina-desktop/i18n/lumina-search_ms.qm -share/lumina-desktop/i18n/lumina-search_mt.qm -share/lumina-desktop/i18n/lumina-search_nb.qm -share/lumina-desktop/i18n/lumina-search_ne.qm -share/lumina-desktop/i18n/lumina-search_nl.qm -share/lumina-desktop/i18n/lumina-search_pa.qm -share/lumina-desktop/i18n/lumina-search_pl.qm -share/lumina-desktop/i18n/lumina-search_pt.qm -share/lumina-desktop/i18n/lumina-search_pt_BR.qm -share/lumina-desktop/i18n/lumina-search_ro.qm -share/lumina-desktop/i18n/lumina-search_ru.qm -share/lumina-desktop/i18n/lumina-search_sa.qm -share/lumina-desktop/i18n/lumina-search_sk.qm -share/lumina-desktop/i18n/lumina-search_sl.qm -share/lumina-desktop/i18n/lumina-search_sr.qm -share/lumina-desktop/i18n/lumina-search_sv.qm -share/lumina-desktop/i18n/lumina-search_sw.qm -share/lumina-desktop/i18n/lumina-search_ta.qm -share/lumina-desktop/i18n/lumina-search_tg.qm -share/lumina-desktop/i18n/lumina-search_th.qm -share/lumina-desktop/i18n/lumina-search_tr.qm -share/lumina-desktop/i18n/lumina-search_uk.qm -share/lumina-desktop/i18n/lumina-search_ur.qm -share/lumina-desktop/i18n/lumina-search_uz.qm -share/lumina-desktop/i18n/lumina-search_vi.qm -share/lumina-desktop/i18n/lumina-search_zh_CN.qm -share/lumina-desktop/i18n/lumina-search_zh_HK.qm -share/lumina-desktop/i18n/lumina-search_zh_TW.qm -share/lumina-desktop/i18n/lumina-search_zu.qm -share/lumina-desktop/i18n/lumina-textedit_af.qm -share/lumina-desktop/i18n/lumina-textedit_ar.qm -share/lumina-desktop/i18n/lumina-textedit_az.qm -share/lumina-desktop/i18n/lumina-textedit_bg.qm -share/lumina-desktop/i18n/lumina-textedit_bn.qm -share/lumina-desktop/i18n/lumina-textedit_bs.qm -share/lumina-desktop/i18n/lumina-textedit_ca.qm -share/lumina-desktop/i18n/lumina-textedit_cs.qm -share/lumina-desktop/i18n/lumina-textedit_cy.qm -share/lumina-desktop/i18n/lumina-textedit_da.qm -share/lumina-desktop/i18n/lumina-textedit_de.qm -share/lumina-desktop/i18n/lumina-textedit_el.qm -share/lumina-desktop/i18n/lumina-textedit_en_GB.qm -share/lumina-desktop/i18n/lumina-textedit_en_ZA.qm -share/lumina-desktop/i18n/lumina-textedit_es.qm -share/lumina-desktop/i18n/lumina-textedit_et.qm -share/lumina-desktop/i18n/lumina-textedit_eu.qm -share/lumina-desktop/i18n/lumina-textedit_fa.qm -share/lumina-desktop/i18n/lumina-textedit_fi.qm -share/lumina-desktop/i18n/lumina-textedit_fr.qm -share/lumina-desktop/i18n/lumina-textedit_fr_CA.qm -share/lumina-desktop/i18n/lumina-textedit_fur.qm -share/lumina-desktop/i18n/lumina-textedit_gl.qm -share/lumina-desktop/i18n/lumina-textedit_he.qm -share/lumina-desktop/i18n/lumina-textedit_hi.qm -share/lumina-desktop/i18n/lumina-textedit_hr.qm -share/lumina-desktop/i18n/lumina-textedit_hu.qm -share/lumina-desktop/i18n/lumina-textedit_id.qm -share/lumina-desktop/i18n/lumina-textedit_is.qm -share/lumina-desktop/i18n/lumina-textedit_it.qm -share/lumina-desktop/i18n/lumina-textedit_ja.qm -share/lumina-desktop/i18n/lumina-textedit_ka.qm -share/lumina-desktop/i18n/lumina-textedit_ko.qm -share/lumina-desktop/i18n/lumina-textedit_lt.qm -share/lumina-desktop/i18n/lumina-textedit_lv.qm -share/lumina-desktop/i18n/lumina-textedit_mk.qm -share/lumina-desktop/i18n/lumina-textedit_mn.qm -share/lumina-desktop/i18n/lumina-textedit_ms.qm -share/lumina-desktop/i18n/lumina-textedit_mt.qm -share/lumina-desktop/i18n/lumina-textedit_nb.qm -share/lumina-desktop/i18n/lumina-textedit_ne.qm -share/lumina-desktop/i18n/lumina-textedit_nl.qm -share/lumina-desktop/i18n/lumina-textedit_pa.qm -share/lumina-desktop/i18n/lumina-textedit_pl.qm -share/lumina-desktop/i18n/lumina-textedit_pt.qm -share/lumina-desktop/i18n/lumina-textedit_pt_BR.qm -share/lumina-desktop/i18n/lumina-textedit_ro.qm -share/lumina-desktop/i18n/lumina-textedit_ru.qm -share/lumina-desktop/i18n/lumina-textedit_sa.qm -share/lumina-desktop/i18n/lumina-textedit_sk.qm -share/lumina-desktop/i18n/lumina-textedit_sl.qm -share/lumina-desktop/i18n/lumina-textedit_sr.qm -share/lumina-desktop/i18n/lumina-textedit_sv.qm -share/lumina-desktop/i18n/lumina-textedit_sw.qm -share/lumina-desktop/i18n/lumina-textedit_ta.qm -share/lumina-desktop/i18n/lumina-textedit_tg.qm -share/lumina-desktop/i18n/lumina-textedit_th.qm -share/lumina-desktop/i18n/lumina-textedit_tr.qm -share/lumina-desktop/i18n/lumina-textedit_uk.qm -share/lumina-desktop/i18n/lumina-textedit_ur.qm -share/lumina-desktop/i18n/lumina-textedit_uz.qm -share/lumina-desktop/i18n/lumina-textedit_vi.qm -share/lumina-desktop/i18n/lumina-textedit_zh_CN.qm -share/lumina-desktop/i18n/lumina-textedit_zh_HK.qm -share/lumina-desktop/i18n/lumina-textedit_zh_TW.qm -share/lumina-desktop/i18n/lumina-textedit_zu.qm -share/lumina-desktop/i18n/lumina-xconfig_af.qm -share/lumina-desktop/i18n/lumina-xconfig_ar.qm -share/lumina-desktop/i18n/lumina-xconfig_az.qm -share/lumina-desktop/i18n/lumina-xconfig_bg.qm -share/lumina-desktop/i18n/lumina-xconfig_bn.qm -share/lumina-desktop/i18n/lumina-xconfig_bs.qm -share/lumina-desktop/i18n/lumina-xconfig_ca.qm -share/lumina-desktop/i18n/lumina-xconfig_cs.qm -share/lumina-desktop/i18n/lumina-xconfig_cy.qm -share/lumina-desktop/i18n/lumina-xconfig_da.qm -share/lumina-desktop/i18n/lumina-xconfig_de.qm -share/lumina-desktop/i18n/lumina-xconfig_el.qm -share/lumina-desktop/i18n/lumina-xconfig_en_GB.qm -share/lumina-desktop/i18n/lumina-xconfig_en_ZA.qm -share/lumina-desktop/i18n/lumina-xconfig_es.qm -share/lumina-desktop/i18n/lumina-xconfig_et.qm -share/lumina-desktop/i18n/lumina-xconfig_eu.qm -share/lumina-desktop/i18n/lumina-xconfig_fa.qm -share/lumina-desktop/i18n/lumina-xconfig_fi.qm -share/lumina-desktop/i18n/lumina-xconfig_fr.qm -share/lumina-desktop/i18n/lumina-xconfig_fr_CA.qm -share/lumina-desktop/i18n/lumina-xconfig_fur.qm -share/lumina-desktop/i18n/lumina-xconfig_gl.qm -share/lumina-desktop/i18n/lumina-xconfig_he.qm -share/lumina-desktop/i18n/lumina-xconfig_hi.qm -share/lumina-desktop/i18n/lumina-xconfig_hr.qm -share/lumina-desktop/i18n/lumina-xconfig_hu.qm -share/lumina-desktop/i18n/lumina-xconfig_id.qm -share/lumina-desktop/i18n/lumina-xconfig_is.qm -share/lumina-desktop/i18n/lumina-xconfig_it.qm -share/lumina-desktop/i18n/lumina-xconfig_ja.qm -share/lumina-desktop/i18n/lumina-xconfig_ka.qm -share/lumina-desktop/i18n/lumina-xconfig_ko.qm -share/lumina-desktop/i18n/lumina-xconfig_lt.qm -share/lumina-desktop/i18n/lumina-xconfig_lv.qm -share/lumina-desktop/i18n/lumina-xconfig_mk.qm -share/lumina-desktop/i18n/lumina-xconfig_mn.qm -share/lumina-desktop/i18n/lumina-xconfig_ms.qm -share/lumina-desktop/i18n/lumina-xconfig_mt.qm -share/lumina-desktop/i18n/lumina-xconfig_nb.qm -share/lumina-desktop/i18n/lumina-xconfig_ne.qm -share/lumina-desktop/i18n/lumina-xconfig_nl.qm -share/lumina-desktop/i18n/lumina-xconfig_pa.qm -share/lumina-desktop/i18n/lumina-xconfig_pl.qm -share/lumina-desktop/i18n/lumina-xconfig_pt.qm -share/lumina-desktop/i18n/lumina-xconfig_pt_BR.qm -share/lumina-desktop/i18n/lumina-xconfig_ro.qm -share/lumina-desktop/i18n/lumina-xconfig_ru.qm -share/lumina-desktop/i18n/lumina-xconfig_sa.qm -share/lumina-desktop/i18n/lumina-xconfig_sk.qm -share/lumina-desktop/i18n/lumina-xconfig_sl.qm -share/lumina-desktop/i18n/lumina-xconfig_sr.qm -share/lumina-desktop/i18n/lumina-xconfig_sv.qm -share/lumina-desktop/i18n/lumina-xconfig_sw.qm -share/lumina-desktop/i18n/lumina-xconfig_ta.qm -share/lumina-desktop/i18n/lumina-xconfig_tg.qm -share/lumina-desktop/i18n/lumina-xconfig_th.qm -share/lumina-desktop/i18n/lumina-xconfig_tr.qm -share/lumina-desktop/i18n/lumina-xconfig_uk.qm -share/lumina-desktop/i18n/lumina-xconfig_ur.qm -share/lumina-desktop/i18n/lumina-xconfig_uz.qm -share/lumina-desktop/i18n/lumina-xconfig_vi.qm -share/lumina-desktop/i18n/lumina-xconfig_zh_CN.qm -share/lumina-desktop/i18n/lumina-xconfig_zh_HK.qm -share/lumina-desktop/i18n/lumina-xconfig_zh_TW.qm -share/lumina-desktop/i18n/lumina-xconfig_zu.qm |