*/*: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2023-05-16 08:38:03 +02:00
parent 9bac5f8f0d
commit c7327688d1
149 changed files with 3712 additions and 1986 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= pt2-clone
PORTVERSION= 1.57
PORTVERSION= 1.58
DISTVERSIONPREFIX= v
CATEGORIES= audio
MASTER_SITES= LOCAL/ehaupt:extras

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1675767643
TIMESTAMP = 1684157390
SHA256 (pt2-clone-extras-2.tar.gz) = ddbac01034022f27860d85f4627b07223f9fd8f02a4ddefdc36467f2e3cacd0b
SIZE (pt2-clone-extras-2.tar.gz) = 742
SHA256 (8bitbubsy-pt2-clone-v1.57_GH0.tar.gz) = 3bddc1f446251a1ed582cf1b9bb3bc7d4714ed838e76583b34026e5b3a6573fa
SIZE (8bitbubsy-pt2-clone-v1.57_GH0.tar.gz) = 8882994
SHA256 (8bitbubsy-pt2-clone-v1.58_GH0.tar.gz) = 87f659006594575604d8a1b0ad34a1bdf5b5d16fe658a933a073ffa375b6afbe
SIZE (8bitbubsy-pt2-clone-v1.58_GH0.tar.gz) = 10851057

View File

@ -15,7 +15,7 @@ LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \
libfreetype.so:print/freetype2
RUN_DEPENDS= bash:shells/bash
USES= gmake gnome gl localbase python:3.6+,build shebangfix tk:tea tar:tgz xorg
USES= gmake gnome gl localbase:ldflags python:3.6+,build shebangfix tk:tea tar:tgz xorg
USE_GNOME= cairo
USE_XORG= ice x11 xext xi xmu
USE_GL= gl glu
@ -28,8 +28,6 @@ CONFIGURE_WRKSRC= ${WRKSRC}/scripts
ALL_TARGET= tcllibrary
CFLAGS+= -Wno-return-type # workaround for https://github.com/RTimothyEdwards/magic/issues/67
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
@ -37,6 +35,12 @@ PORTSCOUT= limit:^8\.
BINARY_ALIAS= python3=${PYTHON_CMD} # this is needed, see https://github.com/RTimothyEdwards/magic/issues/173#issuecomment-1200065429
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=int-conversion
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim
@ -59,4 +63,4 @@ pre-build:
post-install:
@cd ${STAGEDIR}${PREFIX}/lib/magic/tcl && ${STRIP_CMD} magicexec magicdnull tclmagic.so
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,16 +1,16 @@
PORTNAME= cassandra
DISTVERSION= 4.0-beta2
DISTVERSION= 4.0.8
CATEGORIES= databases java
MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
LOCAL/mikael:repo
https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
PKGNAMESUFFIX= 4
DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src
DISTFILES= ${DISTNAME}.tar.gz:apache \
${ZSTD_DISTFILE} \
apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
${MAVEN_CACHE_FILE}:prefetch
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}.tar.gz \
apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz
${MAVEN_CACHE_FILE}
MAINTAINER= language.devel@gmail.com
COMMENT= Highly scalable distributed database
@ -19,19 +19,21 @@ WWW= https://cassandra.apache.org/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
FETCH_DEPENDS= ant:devel/apache-ant
RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \
netty>0:java/netty
USES= cpe python:3.7+
USES= cpe python:3.7+ shebangfix
USE_JAVA= yes
USE_ANT= yes
USE_RC_SUBR= cassandra
SHEBANG_FILES= bin/cqlsh.py pylib/setup.py
TEST_TARGET= test
CPE_VENDOR= apache
CONFLICTS= cassandra3
JAVA_VERSION= 8+
JAVA_VERSION= 8 11
JAVA_VENDOR= openjdk
SUB_LIST= JAVA_HOME=${JAVA_HOME}
@ -67,7 +69,7 @@ SCRIPT_FILES= cassandra \
sstableutil \
sstableverify
ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T}
ZSTDJNI_VERSION= ${MASTER_SITES:M*\:maven:H:T}
PLIST_SUB= DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
OPTIONS_DEFINE= SIGAR DOCS
@ -82,14 +84,36 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_F
PORTDOCS= *
MAVEN_CACHE_FILE= apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz
.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
pre-fetch:
${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
${MKDIR} ${WRKSRC}/.build
${MKDIR} ${WRKSRC}/src/java
${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
-e 's:time=[0-9.]*:time=0.000000000:' \
-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
-e 's:flags=.*:flags=none:' \
-e 's:^\.:./repository:' \
> maven-offline-cache.mtree
cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
@maven-offline-cache.mtree
${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
.endif
do-build:
@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
do-build-DOCS-on:
cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
do-build-DOCS-off:
cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage
cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
post-build:
.for f in ${SCRIPT_FILES}
@ -121,6 +145,8 @@ do-install:
cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
.for f in ${SCRIPT_FILES}
${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
@ -128,12 +154,12 @@ do-install:
${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
do-test:
@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
.include <bsd.port.pre.mk>
.if ${JAVA_PORT_VERSION} == 11
USEJDK11= -Duse.jdk11=true
USEJDK11= -Duse.jdk11=true -Drat.skip=true
.endif
.if ${ARCH} == amd64
@ -156,7 +182,7 @@ ZSTD_DISTFILE=
post-install:
${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
.if ${ARCH} == amd64 || ${ARCH} == i386
${CP} ${DISTDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
.endif
post-install-DOCS-on:

View File

@ -1,9 +1,9 @@
TIMESTAMP = 1601573969
SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5
SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277
SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc
SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671
SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648
SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462
SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f
SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955
TIMESTAMP = 1679924890
SHA256 (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 98da97d7fe850a0a24eb2aef212e982f73205cbd63955d2915b4ad02e28dae9c
SIZE (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 12953548
SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = b653460b6ff374db2c01f39a7b7cdb44008c9efd55dc96ae5f869abe9f58d180
SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = 670993
SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 1bcb75c5837e42d10ec0193ba9df099874792f0829b0ce8dd3412303c6454595
SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 604557
SHA256 (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 807a108e3639f247dafa3ce4ebc4744b93668cf463915edf7b654d317d1abaff
SIZE (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 78148020

View File

@ -23,13 +23,12 @@ load_rc_config $name
: ${cassandra_enable:=NO}
: ${cassandra_user:=cassandra}
command=%%PREFIX%%/bin/cassandra
command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
start_precmd="${name}_prestart"
procname=%%JAVA_HOME%%/bin/java
pidfile=/var/run/cassandra/cassandra.pid
command=/usr/sbin/daemon
command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f"
start_precmd="${name}_prestart"
cassandra_prestart()
{
export JAVA_HOME=%%JAVA_HOME%%

View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project basedir="." name="apache-cassandra-owasp-tasks">
<property name="dependency-check.version" value="6.3.2"/>
<property name="dependency-check.home" value="${build.dir}/dependency-check-ant-${dependency-check.version}"/>
<condition property="is.dependency.check.jar">
<available file="${dependency-check.home}/dependency-check-ant/dependency-check-ant.jar" type="file" />
</condition>
<target name="dependency-check-download"
depends="build"
description="Fetch OWASP Dependency checker"
unless="is.dependency.check.jar">
<echo>Downloading OWASP Dependency checks ...</echo>
<mkdir dir="${dependency-check.home}"/>
<get src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check.version}/dependency-check-ant-${dependency-check.version}-release.zip"
dest="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip"/>
<unzip src="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip" dest="${dependency-check.home}"/>
</target>
<target name="dependency-check" description="Dependency-Check Analysis" depends="dependency-check-download,resolver-dist-lib">
<path id="dependency-check.path">
<fileset dir="${dependency-check.home}/dependency-check-ant/lib">
<include name="*.jar"/>
</fileset>
</path>
<taskdef resource="dependency-check-taskdefs.properties">
<classpath refid="dependency-check.path" />
</taskdef>
<!--
default value for cveValidForHours is 4 after which sync is done again
skipping using two specific caches at the end is solving (1)
failBuildOnCVSS is by default 11 so build would never fail,
the table categorising vulnerabilities is here (2), so by setting
"failBuildOnCVSS" to 1, we will fail the build on any CVE found
if it is not suppressed already dependency-check-suppressions.xml
If a vendor provides no details about a vulnerability,
NVD will score that vulnerability as 10.0 (the highest rating translating to critical).
(1) https://github.com/jeremylong/DependencyCheck/issues/2166
(2) https://nvd.nist.gov/vuln-metrics/cvss
-->
<dependency-check projectname="Apache Cassandra"
reportoutputdirectory="${basedir}/build"
reportformat="HTML"
prettyPrint="true"
cveValidForHours="1"
centralAnalyzerUseCache="false"
nodeAuditAnalyzerUseCache="false"
failBuildOnCVSS="1"
assemblyAnalyzerEnabled="false"
dataDirectory="${dependency-check.home}/data"
suppressionFile="${basedir}/.build/dependency-check-suppressions.xml">
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
</dependency-check>
</target>
</project>

View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project basedir="." name="apache-cassandra--rat-tasks"
xmlns:rat="antlib:org.apache.rat.anttasks">
<!--
License audit tool
-->
<target name="_rat_init" depends="resolver-init">
<typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
</target>
<target name="_build_ratinclude" depends="_rat_init">
<exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="build/.versioned_files">
<arg line="ls-tree -r HEAD --name-only"/>
</exec>
<condition property="rat.skip" value="true">
<not>
<equals arg1="${git.success}" arg2="0"/>
</not>
</condition>
<copy file="build/.versioned_files" tofile="build/.ratinclude">
<filterchain>
<linecontainsregexp>
<regexp pattern=".*\.(java|py|sh|xml|spec|md|iml|bat|btm|cql|css|g|html|jflex|jks|mod|name|pom|textile|yml|yaml|MIDRES|HIGHRES|LOWRES)$"/>
</linecontainsregexp>
</filterchain>
</copy>
</target>
<target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}" description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt">
<fileset dir="." includesfile="build/.ratinclude">
<!-- Config files with not much creativity -->
<exclude name="**/ide/**/*"/>
<exclude name="**/metrics-reporter-config-sample.yaml"/>
<exclude name="**/cassandra.yaml"/>
<exclude name="**/cassandra-murmur.yaml"/>
<exclude name="**/cassandra-seeds.yaml"/>
<exclude NAME="**/doc/antora.yml"/>
<exclude name="**/test/conf/cassandra.yaml"/>
<exclude name="**/test/conf/cassandra_deprecated_parameters_names.yaml"/>
<exclude name="**/test/conf/cassandra_encryption.yaml"/>
<exclude name="**/test/conf/cdc.yaml"/>
<exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
<exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
<exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
<exclude name="**/test/conf/sstableloader_with_encryption.yaml"/>
<exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
<exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
<exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
<exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
<exclude name="**/tools/cqlstress-counter-example.yaml"/>
<exclude name="**/tools/cqlstress-example.yaml"/>
<exclude name="**/tools/cqlstress-insanity-example.yaml"/>
<exclude name="**/tools/cqlstress-lwt-example.yaml"/>
<!-- Documentation files -->
<exclude NAME="**/doc/modules/**/*"/>
<!-- NOTICE files -->
<exclude NAME="**/NOTICE.md"/>
<!-- LICENSE files -->
<exclude NAME="**/LICENSE.md"/>
</fileset>
</rat:report>
<exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
<arg line="-A5 'Unapproved licenses' ${build.dir}/rat.txt"/>
</exec>
<fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details! \n ${rat.failed.files}">
<condition>
<and>
<not>
<resourcecontains resource="${build.dir}/rat.txt" substring="0 Unknown Licenses" casesensitive="false" />
</not>
</and>
</condition>
</fail>
</target>
<target name="_assert_rat_output">
<fail message="The rat report at build/rat.txt was not generated. Please ensure that the rat-check task is able to run successfully. For dev builds only, touch build/rat.txt to skip this check">
<condition>
<not>
<available file="build/rat.txt" />
</not>
</condition>
</fail>
</target>
</project>

View File

@ -0,0 +1,262 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project basedir="." name="apache-cassandra--resolver-tasks"
xmlns:resolver="antlib:org.apache.maven.resolver.ant"
xmlns:if="ant:if"
xmlns:unless="ant:unless">
<!-- details of what version of Resolver ANT Tasks to fetch -->
<property name="resolver-ant-tasks.version" value="1.3.0" />
<property name="resolver-ant-tasks.local" value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
<property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
<condition property="resolver-ant-tasks.jar.exists">
<available file="${resolver-ant-tasks.local}" />
</condition>
<property name="artifact.python.pypi" value="https://files.pythonhosted.org/packages" />
<property name="artifact.github.release" value="https://github.com" />
<!-- some artifacts are fetched from github as blobs; these are all in the cassandra project, but in an older commit -->
<property name="lib.download.sha" value="1371883db3d8bf7d7c54e0baaca89c6c2d2a5abe"/>
<property name="lib.download.base.url" value="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}" />
<property name="lib.download.url.postfix" value="" />
<path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}" />
<!--
Fetch Resolver Ant Tasks and Cassandra's dependencies.
-->
<target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
<echo>Downloading Resolver ANT Tasks...</echo>
<mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
<get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
</target>
<target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized" description="Initialize Resolver ANT Tasks">
<typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="resolver-ant-tasks.classpath" />
<resolver:remoterepos id="all">
<remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
<remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
</resolver:remoterepos>
<macrodef name="resolve">
<!--
maven-resolver-ant-tasks's resolve logic doesn't have retry logic and does not respect settings.xml,
this causes issues when overriding maven central is required (such as when behind a corporate firewall);
it is critical to always provide the 'all' remoterepos to override resolve's default hard coded logic.
This macro simplifies this logic by centralizing retries and forcing the remoterepo 'all' to be used.
-->
<attribute name="failonmissingattachments" default="true"/>
<element name="elements" implicit="yes"/>
<sequential>
<retry retrycount="3">
<resolver:resolve failonmissingattachments="@{failonmissingattachments}">
<resolver:remoterepos refid="all"/>
<elements/>
</resolver:resolve>
</retry>
</sequential>
</macrodef>
<macrodef name="resolvepom">
<attribute name="file"/>
<attribute name="id"/>
<element name="elements" implicit="yes" optional="yes"/>
<sequential>
<retry retrycount="3">
<resolver:pom file="@{file}" id="@{id}">
<remoterepos refid="all"/>
<elements/>
</resolver:pom>
</retry>
</sequential>
</macrodef>
<resolve>
<dependencies>
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
</dependencies>
<path refid="wikitext.classpath" classpath="runtime"/>
</resolve>
<resolve>
<dependencies>
<dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
</dependencies>
<path refid="rat.classpath" classpath="runtime"/>
</resolve>
<resolve>
<dependencies>
<dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" />
</dependencies>
<path refid="jacocoant.classpath" classpath="runtime"/>
</resolve>
<resolve>
<dependencies>
<dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/>
<dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/>
<dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
</dependencies>
<path refid="cql3-grammar.classpath" classpath="runtime"/>
</resolve>
<resolve>
<dependencies>
<dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}" />
</dependencies>
<path refid="jflex.classpath" classpath="runtime"/>
</resolve>
<macrodef name="install">
<attribute name="pomFile"/>
<attribute name="file"/>
<attribute name="classifier" default=""/>
<attribute name="packaging" default="jar"/>
<sequential>
<exec dir="." executable="sh">
<arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
</exec>
</sequential>
</macrodef>
<macrodef name="deploy">
<attribute name="pomFile"/>
<attribute name="file"/>
<attribute name="classifier" default=""/>
<attribute name="packaging" default="jar"/>
<sequential>
<exec dir="." executable="sh">
<arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
</exec>
</sequential>
</macrodef>
<macrodef name="sign-dist">
<attribute name="file"/>
<sequential>
<echo message="gpg signing @{file}" />
<exec dir="." executable="sh">
<!-- dummy out the deploy parameters, only the signing is required here -->
<arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'" />
</exec>
</sequential>
</macrodef>
<property name="resolver-ant-tasks.initialized" value="true"/>
</target>
<target name="resolver-retrieve-build" depends="resolver-init,write-poms">
<resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
<resolvepom file="${build.dir}/tmp-${final.name}-deps.pom" id="pom-deps" />
<resolve>
<dependencies pomRef="all-pom"/>
<files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
</resolve>
<resolve>
<dependencies pomRef="pom-deps"/>
<files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/>
</resolve>
<!-- jacoco agent jar comes wrapped in a jar -->
<unzip src="${local.repository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
<patternset>
<include name="*.jar"/>
</patternset>
<mapper type="flatten"/>
</unzip>
</target>
<target name="resolver-dist-lib" depends="resolver-retrieve-build,write-poms">
<resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
<resolve failOnMissingAttachments="true">
<dependencies pomRef="all-pom"/>
<files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
</resolve>
<mkdir dir="${local.repository}/org/apache/cassandra/deps/sigar-bin"/>
<mkdir dir="${build.lib}/sigar-bin"/>
<!-- files.pythonhosted.org -->
<get src="${artifact.python.pypi}/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<get src="${artifact.python.pypi}/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<!-- apache/cassandra/lib -->
<get src="${lib.download.base.url}/lib/geomet-0.1.0.zip" dest="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-freebsd-6.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-solaris.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-hpux-11.sl"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-pa-hpux-11.sl"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-aix-5.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-aix-5.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64le-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-s390x-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc-solaris.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc64-solaris.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal-macosx.dylib"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal64-macosx.dylib"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-5.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-6.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
<url url="${lib.download.base.url}/lib/sigar-bin/sigar-amd64-winnt.dll"/>
<url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.dll"/>
<url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.lib"/>
</get>
<copy todir="${build.lib}" quiet="true">
<file file="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
<file file="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip"/>
<file file="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip"/>
</copy>
<copy todir="${build.lib}/sigar-bin/" quiet="true">
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64le-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
</copy>
</target>
</project>

View File

@ -0,0 +1,4 @@
# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
artifact.remoteRepository.central: https://repo1.maven.org/maven2
artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,11 @@
--- bin/cqlsh.orig 2022-05-06 16:40:06 UTC
+++ bin/cqlsh
@@ -88,7 +88,7 @@ if [ "$USER_SPECIFIED_PYTHON" != "" ]; then
# run a user specified Python interpreter
run_if_supported_version "$USER_SPECIFIED_PYTHON" "$@"
else
- for interpreter in python3 python python2.7; do
+ for interpreter in python3 python3.9 python3.8 python3.7 python3.6 python python2.7; do
run_if_supported_version "$interpreter" "$@"
done
fi

View File

@ -1,14 +1,14 @@
--- build.xml.orig 2020-08-28 13:55:55 UTC
--- build.xml.orig 2022-07-12 10:18:13 UTC
+++ build.xml
@@ -23,6 +23,7 @@
@@ -31,6 +31,7 @@
<property file="build.properties" />
<property file="build.properties.default" />
<property name="debuglevel" value="source,lines,vars"/>
+ <property name="pycmd" value="python"/>
<!-- default version and SCM information -->
<property name="base.version" value="4.0-beta2"/>
@@ -74,14 +75,14 @@
<property name="base.version" value="4.0.5"/>
@@ -81,7 +82,7 @@
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@ -17,101 +17,59 @@
<property name="version.properties.dir"
value="${build.src.resources}/org/apache/cassandra/config/" />
<property name="final.name" value="${ant.project.name}-${version}"/>
<!-- details of what version of Maven ANT Tasks to fetch -->
<property name="maven-ant-tasks.version" value="2.1.3" />
- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
<property name="maven-ant-tasks.url"
value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
<!-- details of how and which Maven repository we publish to -->
@@ -271,7 +272,7 @@
</path>
<path id="cassandra.classpath.test">
<file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
- <fileset dir="${build.lib}">
+ <fileset dir="${stagedlib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
@@ -288,6 +289,24 @@
<exclude name="**/ant-*.jar"/>
@@ -291,7 +292,7 @@
</fileset>
</path>
+ <path id="cassandra.classpath.staged">
+ <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
+ <fileset dir="${stagedlib}">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="${build.dir.lib}">
+ <include name="**/assertj-core-3.15.0.jar" />
+ <include name="**/byteman*.jar" />
+ <include name="**/commons-lang-2.4.jar" />
+ <include name="**/commons-collections-3.2.1.jar" />
+ <include name="**/ohc-core-0.5.1.jar" />
+ <include name="**/ohc-core-j8-0.5.1.jar" />
+ </fileset>
+ <fileset dir="${test.lib}/jars">
+ <include name="**/*.jar" />
+ <exclude name="**/ant-*.jar"/>
+ </fileset>
+ </path>
<macrodef name="create-javadoc">
<attribute name="destdir"/>
@@ -297,7 +316,7 @@
windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
bottom="Copyright &amp;copy; 2009-2020 The Apache Software Foundation"
bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
useexternalfile="yes" encoding="UTF-8" failonerror="false"
- maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+ maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
<filesets/>
</javadoc>
<fail message="javadoc failed">
@@ -416,8 +417,7 @@
<artifact:dependencies pathId="wikitext.classpath">
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
- <remoteRepository refid="central"/>
- <remoteRepository refid="apache"/>
+ <localRepository path="${localm2}"/>
</artifact:dependencies>
<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
<wikitext-to-html markupLanguage="Textile">
@@ -430,6 +430,8 @@
<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
@@ -438,6 +457,8 @@
<target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
<exec executable="make" osfamily="unix" dir="${doc.dir}">
<arg value="html"/>
+ <arg value="PYTHON_CMD=${pycmd}"/>
+ <arg value="PYTHON_VER=${pyver}"/>
</exec>
<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
<arg value="/c"/>
@@ -472,10 +474,6 @@
description="Initialize Maven ANT Tasks">
<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
</target>
- <!-- define the remote repositories we use -->
- <artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>
- <artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>
-
<macrodef name="install">
<attribute name="pomFile"/>
<attribute name="file"/>
@@ -889,16 +887,14 @@
filesetId="build-dependency-jars"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
- <remoteRepository refid="central"/>
- <remoteRepository refid="apache"/>
+ <localRepository path="${localm2}"/>
</artifact:dependencies>
<!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
<artifact:dependencies pomRefId="build-deps-pom-sources"
sourcesFilesetId="build-dependency-sources"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
- <remoteRepository refid="central"/>
- <remoteRepository refid="apache"/>
+ <localRepository path="${localm2}"/>
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
@@ -911,7 +907,7 @@
<!-- code coverage tools -->
<artifact:dependencies pomRefId="coverage-deps-pom"
filesetId="coverage-dependency-jars">
- <remoteRepository refid="central"/>
+ <localRepository path="${localm2}"/>
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="coverage-dependency-jars"/>
@@ -940,8 +936,7 @@
sourcesFilesetId="test-dependency-sources"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
- <remoteRepository refid="apache"/>
- <remoteRepository refid="central"/>
+ <localRepository path="${localm2}"/>
</artifact:dependencies>
<copy todir="${test.lib}/jars">
<fileset refid="test-dependency-jars"/>
@@ -1251,6 +1246,87 @@
@@ -896,7 +917,7 @@
</javac>
</target>
- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
+ <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! -->
@@ -1147,6 +1168,89 @@
</copy>
</target>
@ -127,7 +85,7 @@
+ <exclude name="netty-all*.jar"/>
+ <exclude name="ohc*.jar"/>
+ <exclude name="licenses/snappy*.txt"/>
+ <exclude name="licenses/netty-4*.txt"/>
+ <exclude name="licenses/netty-all*.txt"/>
+ <exclude name="licenses/ohc*.txt"/>
+ </fileset>
+ <fileset dir="${build.dir}">
@ -152,6 +110,8 @@
+ <include name="**" />
+ <exclude name="**/*.pyc" />
+ <exclude name="Dockerfile.ubuntu.*" />
+ <exclude name="cqlshlib/test/**" />
+ <exclude name="cassandra-cqlsh-tests.sh" />
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}/">
@ -197,36 +157,23 @@
+ </target>
+
<!-- creates release tarballs -->
<target name="artifacts" depends="_artifacts-init"
<target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
description="Create Cassandra release artifacts">
@@ -1371,6 +1447,7 @@
<target name="_build-test">
<javac
fork="true"
+ memorymaximumsize="512M"
compiler="modern"
debug="true"
debuglevel="${debuglevel}"
@@ -1960,8 +2037,8 @@
<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
<arg value="--all"/>
</exec>
- <!-- support for Mac OS X -->
- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+ <!-- support for Mac OS X and FreeBSD -->
+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.ncpu"/>
</exec>
@@ -1981,6 +2058,11 @@
<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.memsize"/>
+ </exec>
+ <!-- support for FreeBSD -->
+ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
+ <arg value="-n"/>
+ <arg value="hw.physmem"/>
</exec>
<echo message="Mem size : ${mem.size}"/>
@@ -1397,7 +1501,7 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${stress.build.classes}"/>
<pathelement location="${fqltool.build.classes}"/>
- <path refid="cassandra.classpath.test" />
+ <path refid="cassandra.classpath.staged" />
<pathelement location="${test.classes}"/>
<pathelement location="${stress.test.classes}"/>
<pathelement location="${fqltool.test.classes}"/>
@@ -2089,7 +2193,7 @@
</target>
<!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
- <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
+ <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
<property name="ecj.log.dir" value="${build.dir}/ecj" />
<property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
<mkdir dir="${ecj.log.dir}" />

View File

@ -1,6 +1,6 @@
--- conf/cassandra.yaml.orig 2020-07-17 21:24:30 UTC
--- conf/cassandra.yaml.orig 2022-05-06 16:40:06 UTC
+++ conf/cassandra.yaml
@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2
@@ -77,7 +77,7 @@ max_hints_delivery_threads: 2
# Directory where Cassandra should store hints.
# If not set, the default directory is $CASSANDRA_HOME/data/hints.
@ -9,7 +9,7 @@
# How often hints should be flushed from the internal buffers to disk.
# Will *not* trigger fsync.
@@ -200,13 +200,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
@@ -204,8 +204,8 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
# directories are specified, Cassandra will spread data evenly across
# them by partitioning the token ranges.
# If not set, the default directory is $CASSANDRA_HOME/data/data.
@ -18,6 +18,9 @@
+data_file_directories:
+ - /var/db/cassandra/data
# Directory were Cassandra should store the data of the local system keyspaces.
# By default Cassandra will store the data of the local system keyspaces in the first of the data directories specified
@@ -217,7 +217,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
# commit log. when running on magnetic HDD, this should be a
# separate spindle than the data directories.
# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
@ -26,7 +29,7 @@
# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
# for write path allocation rejection (standard: never reject. cdc: reject Mutation
@@ -217,7 +217,7 @@ cdc_enabled: false
@@ -228,7 +228,7 @@ cdc_enabled: false
# segment contains mutations for a CDC-enabled table. This should be placed on a
# separate spindle than the data directories. If not set, the default directory is
# $CASSANDRA_HOME/data/cdc_raw.
@ -35,7 +38,7 @@
# Policy for data disk failures:
#
@@ -309,20 +309,12 @@ key_cache_save_period: 14400
@@ -320,20 +320,12 @@ key_cache_save_period: 14400
# Row cache implementation class name. Available implementations:
#
@ -57,12 +60,12 @@
#
# Default value is 0, to disable row caching.
row_cache_size_in_mb: 0
@@ -369,7 +361,7 @@ counter_cache_save_period: 7200
@@ -380,7 +372,7 @@ counter_cache_save_period: 7200
# saved caches
# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
-# saved_caches_directory: /var/lib/cassandra/saved_caches
+saved_caches_directory: /var/db/cassandra/saved_caches
# commitlog_sync may be either "periodic", "group", or "batch."
#
# Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
# the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup

View File

@ -1,23 +0,0 @@
--- doc/Makefile.orig 2020-01-30 17:34:31 UTC
+++ doc/Makefile
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD = sphinx-build-${PYTHON_VER}
PAPER =
BUILDDIR = build
@@ -17,9 +17,9 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
YAML_DOC_INPUT=../conf/cassandra.yaml
YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
-MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
-GENERATE_NODETOOL_DOCS = python gen-nodetool-docs.py
+GENERATE_NODETOOL_DOCS = ${PYTHON_CMD} gen-nodetool-docs.py
WEB_SITE_PRESENCE_FILE='source/.build_for_website'

View File

@ -1,17 +0,0 @@
--- doc/source/_templates/indexcontent.html.orig 2020-08-28 13:55:55 UTC
+++ doc/source/_templates/indexcontent.html
@@ -1,5 +1,12 @@
-{% extends "defindex.html" %}
-{% block tables %}
+{% extends "layout.html" %}
+{%- block htmltitle -%}
+<title>{{ html_title }}</title>
+{%- endblock -%}
+{% block body %}
+ <h1>{{ docstitle|e }}</h1>
+ <p>
+ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
+ </p>
<div id="wipwarning">This documentation is a work-in-progress.
<a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>

View File

@ -1,10 +0,0 @@
--- doc/source/_util/cql.py.orig 2020-10-03 15:05:17 UTC
+++ doc/source/_util/cql.py
@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
from pygments.token import Punctuation, Whitespace, Error, \
Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
from pygments.lexers import get_lexer_by_name, ClassNotFound
-from pygments.util import iteritems
__all__ = [ 'CQLLexer' ]

View File

@ -1,6 +1,6 @@
--- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC
--- src/java/org/apache/cassandra/config/Config.java.orig 2022-05-06 16:40:06 UTC
+++ src/java/org/apache/cassandra/config/Config.java
@@ -290,7 +290,7 @@ public class Config
@@ -304,7 +304,7 @@ public class Config
public volatile int key_cache_save_period = 14400;
public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;

View File

@ -1,6 +1,6 @@
--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-04-01 19:54:51 UTC
--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-12-18 17:35:13 UTC
+++ src/java/org/apache/cassandra/service/NativeTransportService.java
@@ -143,12 +143,15 @@ public class NativeTransportService
@@ -159,12 +159,15 @@ public class NativeTransportService
*/
public static boolean useEpoll()
{

View File

@ -1,4 +1,4 @@
--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC
--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2021-03-26 19:57:28 UTC
+++ src/java/org/apache/cassandra/service/StartupChecks.java
@@ -281,7 +281,14 @@ public class StartupChecks
{

View File

@ -1,6 +1,6 @@
--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-03-30 16:37:37 UTC
--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-12-18 17:35:13 UTC
+++ src/java/org/apache/cassandra/utils/FastByteOperations.java
@@ -191,6 +191,20 @@ public class FastByteOperations
@@ -205,6 +205,20 @@ public class FastByteOperations
static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
@ -21,7 +21,7 @@
public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
{
return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
@@ -214,7 +228,7 @@ public class FastByteOperations
@@ -228,7 +242,7 @@ public class FastByteOperations
else
{
obj1 = null;
@ -30,7 +30,7 @@
}
return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
@@ -230,7 +244,7 @@ public class FastByteOperations
@@ -249,7 +263,7 @@ public class FastByteOperations
if (src.hasArray())
System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
else
@ -38,8 +38,8 @@
+ copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
}
public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length)
@@ -245,7 +259,7 @@ public class FastByteOperations
public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length)
@@ -272,7 +286,7 @@ public class FastByteOperations
else
{
src = null;
@ -48,7 +48,7 @@
}
copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
}
@@ -255,7 +269,7 @@ public class FastByteOperations
@@ -282,7 +296,7 @@ public class FastByteOperations
if (trgBuf.hasArray())
copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
else
@ -57,7 +57,7 @@
}
public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
@@ -263,7 +277,7 @@ public class FastByteOperations
@@ -290,7 +304,7 @@ public class FastByteOperations
if (length <= MIN_COPY_THRESHOLD)
{
for (int i = 0 ; i < length ; i++)
@ -66,7 +66,7 @@
}
else
{
@@ -302,7 +316,7 @@ public class FastByteOperations
@@ -329,7 +343,7 @@ public class FastByteOperations
else
{
obj1 = null;
@ -75,7 +75,7 @@
}
offset1 += buffer1.position();
length1 = buffer1.remaining();
@@ -325,7 +339,7 @@ public class FastByteOperations
@@ -352,7 +366,7 @@ public class FastByteOperations
else
{
obj2 = null;
@ -84,7 +84,7 @@
}
int length2 = limit - position;
offset2 += position;
@@ -358,8 +372,8 @@ public class FastByteOperations
@@ -385,8 +399,8 @@ public class FastByteOperations
int wordComparisons = minLength & ~7;
for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
{
@ -95,7 +95,7 @@
if (lw != rw)
{
@@ -372,8 +386,8 @@ public class FastByteOperations
@@ -399,8 +413,8 @@ public class FastByteOperations
for (int i = wordComparisons ; i < minLength ; i++)
{

View File

@ -0,0 +1,10 @@
--- test/conf/cassandra-murmur.yaml.orig 2021-05-25 15:24:22 UTC
+++ test/conf/cassandra-murmur.yaml
@@ -36,7 +36,6 @@ server_encryption_options:
incremental_backups: true
concurrent_compactors: 4
compaction_throughput_mb_per_sec: 0
-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
row_cache_size_in_mb: 16
enable_user_defined_functions: true
enable_scripted_user_defined_functions: true

View File

@ -0,0 +1,10 @@
--- test/conf/cassandra-seeds.yaml.orig 2021-05-25 15:24:52 UTC
+++ test/conf/cassandra-seeds.yaml
@@ -37,7 +37,6 @@ server_encryption_options:
incremental_backups: true
concurrent_compactors: 4
compaction_throughput_mb_per_sec: 0
-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
row_cache_size_in_mb: 16
enable_user_defined_functions: true
enable_scripted_user_defined_functions: true

View File

@ -0,0 +1,10 @@
--- test/conf/unit-test-conf/test-native-port.yaml.orig 2021-05-25 15:19:42 UTC
+++ test/conf/unit-test-conf/test-native-port.yaml
@@ -40,7 +40,6 @@ server_encryption_options:
incremental_backups: true
concurrent_compactors: 4
compaction_throughput_mb_per_sec: 0
-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
row_cache_size_in_mb: 16
enable_user_defined_functions: true
enable_scripted_user_defined_functions: true

View File

@ -15,14 +15,14 @@
%%DATADIR%%/lib/antlr-runtime-3.5.2.jar
%%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar
%%DATADIR%%/lib/asm-7.1.jar
%%DATADIR%%/lib/caffeine-2.3.5.jar
%%DATADIR%%/lib/cassandra-driver-core-3.9.0-shaded.jar
%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar
%%DATADIR%%/lib/chronicle-core-1.16.4.jar
%%DATADIR%%/lib/chronicle-queue-4.16.3.jar
%%DATADIR%%/lib/chronicle-threads-1.16.0.jar
%%DATADIR%%/lib/chronicle-wire-1.16.1.jar
%%DATADIR%%/lib/caffeine-2.5.6.jar
%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar
%%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip
%%DATADIR%%/lib/chronicle-bytes-2.20.111.jar
%%DATADIR%%/lib/chronicle-core-2.20.126.jar
%%DATADIR%%/lib/chronicle-queue-5.20.123.jar
%%DATADIR%%/lib/chronicle-threads-2.20.111.jar
%%DATADIR%%/lib/chronicle-wire-2.20.117.jar
%%DATADIR%%/lib/commons-cli-1.1.jar
%%DATADIR%%/lib/commons-codec-1.9.jar
%%DATADIR%%/lib/commons-lang3-3.11.jar
@ -36,85 +36,30 @@
%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
%%DATADIR%%/lib/hppc-0.8.1.jar
%%DATADIR%%/lib/j2objc-annotations-1.3.jar
%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
%%DATADIR%%/lib/jackson-core-2.9.10.jar
%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar
%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
%%DATADIR%%/lib/jackson-core-2.13.2.jar
%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
%%DATADIR%%/lib/jamm-0.3.2.jar
%%DATADIR%%/lib/javax.inject.jar
%%DATADIR%%/lib/jbcrypt-0.3m.jar
%%DATADIR%%/lib/java-cup-runtime-11b-20160615.jar
%%DATADIR%%/lib/javax.inject-1.jar
%%DATADIR%%/lib/jbcrypt-0.4.jar
%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
%%DATADIR%%/lib/jcommander-1.30.jar
%%DATADIR%%/lib/jctools-core-1.2.1.jar
%%DATADIR%%/lib/jflex-1.6.0.jar
%%DATADIR%%/lib/jna-4.2.2.jar
%%DATADIR%%/lib/jctools-core-3.1.0.jar
%%DATADIR%%/lib/jflex-1.8.2.jar
%%DATADIR%%/lib/jna-5.6.0.jar
%%DATADIR%%/lib/json-simple-1.1.jar
%%DATADIR%%/lib/jstackjunit-0.0.1.jar
%%DATADIR%%/lib/jvm-attach-api-1.5.jar
%%DATADIR%%/lib/licenses/airline-0.8.txt
%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
%%DATADIR%%/lib/licenses/asm-6.2.txt
%%DATADIR%%/lib/licenses/caffeine-2.3.5.txt
%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
%%DATADIR%%/lib/licenses/chronicle-bytes-1.16.3.txt
%%DATADIR%%/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt
%%DATADIR%%/lib/licenses/chronicle-queue-4.16.3.txt
%%DATADIR%%/lib/licenses/chronicle-threads-1.16.0.txt
%%DATADIR%%/lib/licenses/chronicle-wire-1.16.1.txt
%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
%%DATADIR%%/lib/licenses/ecj-4.6.1.txt
%%DATADIR%%/lib/licenses/futures-2.1.6.txt
%%DATADIR%%/lib/licenses/geom-0.1.0.txt
%%DATADIR%%/lib/licenses/guava-23.3-jre.txt
%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
%%DATADIR%%/lib/licenses/j2objc-annotations-1.3.txt
%%DATADIR%%/lib/licenses/jackson-annotations-2.9.5.txt
%%DATADIR%%/lib/licenses/jackson-core-2.9.5.txt
%%DATADIR%%/lib/licenses/jackson-databind-2.9.5.txt
%%DATADIR%%/lib/licenses/jamm-0.3.2.txt
%%DATADIR%%/lib/licenses/javax.inject.txt
%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.25.txt
%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
%%DATADIR%%/lib/licenses/jna-4.2.2.txt
%%DATADIR%%/lib/licenses/joda-time-2.4.txt
%%DATADIR%%/lib/licenses/json-simple-1.1.txt
%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
%%DATADIR%%/lib/licenses/LICENSE-2.0.txt
%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.25.txt
%%DATADIR%%/lib/licenses/logback-classic-1.2.3.txt
%%DATADIR%%/lib/licenses/logback-core-1.2.3.txt
%%DATADIR%%/lib/licenses/lz4-1.4.0.txt
%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt
%%DATADIR%%/lib/licenses/psjava-0.1.19.txt
%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
%%DATADIR%%/lib/licenses/six-1.7.3.txt
%%DATADIR%%/lib/licenses/slf4j-api-1.7.25.txt
%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
%%DATADIR%%/lib/licenses/stream-2.5.2.txt
%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
%%DATADIR%%/lib/logback-classic-1.2.3.jar
%%DATADIR%%/lib/logback-core-1.2.3.jar
%%DATADIR%%/lib/lz4-java-1.7.1.jar
%%DATADIR%%/lib/logback-classic-1.2.9.jar
%%DATADIR%%/lib/logback-core-1.2.9.jar
%%DATADIR%%/lib/lz4-java-1.8.0.jar
%%DATADIR%%/lib/metrics-core-3.1.5.jar
%%DATADIR%%/lib/metrics-jvm-3.1.5.jar
%%DATADIR%%/lib/metrics-logback-3.1.5.jar
%%DATADIR%%/lib/mxdump-0.14.jar
%%DATADIR%%/lib/netty.jar
%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.31.Final.jar
%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar
%%DATADIR%%/lib/psjava-0.1.19.jar
%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
%%DATADIR%%/lib/reporter-config3-3.0.3.jar
@ -124,7 +69,7 @@
%%DATADIR%%/lib/sjk-json-0.14.jar
%%DATADIR%%/lib/sjk-stacktrace-0.14.jar
%%DATADIR%%/lib/slf4j-api-1.7.25.jar
%%DATADIR%%/lib/snakeyaml-1.11.jar
%%DATADIR%%/lib/snakeyaml-1.26.jar
%%DATADIR%%/lib/snappy-java.jar
%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
%%DATADIR%%/lib/ST4-4.0.8.jar
@ -134,7 +79,6 @@
%%DATADIR%%/LICENSE.txt
%%DATADIR%%/NEWS.txt
%%DATADIR%%/NOTICE.txt
%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh
%%DATADIR%%/pylib/cqlshlib/__init__.py
%%DATADIR%%/pylib/cqlshlib/copyutil.py
%%DATADIR%%/pylib/cqlshlib/cql3handling.py
@ -147,21 +91,11 @@
%%DATADIR%%/pylib/cqlshlib/saferscanner.py
%%DATADIR%%/pylib/cqlshlib/setup.cfg
%%DATADIR%%/pylib/cqlshlib/sslhandling.py
%%DATADIR%%/pylib/cqlshlib/test/__init__.py
%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
%%DATADIR%%/pylib/cqlshlib/test/basecase.py
%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
%%DATADIR%%/pylib/cqlshlib/test/test_copyutil.py
%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
%%DATADIR%%/pylib/cqlshlib/test/winpty.py
%%DATADIR%%/pylib/cqlshlib/tracing.py
%%DATADIR%%/pylib/cqlshlib/util.py
%%DATADIR%%/pylib/cqlshlib/wcwidth.py
%%DATADIR%%/pylib/README.asc
%%DATADIR%%/pylib/pytest.ini
%%DATADIR%%/pylib/requirements.txt
%%DATADIR%%/pylib/setup.py
%%DATADIR%%/tools/bin/auditlogviewer
@ -170,6 +104,8 @@
%%DATADIR%%/tools/bin/cassandra.in.sh
%%DATADIR%%/tools/bin/compaction-stress
%%DATADIR%%/tools/bin/fqltool
%%DATADIR%%/tools/bin/generatetokens
%%DATADIR%%/tools/bin/jmxtool
%%DATADIR%%/tools/bin/sstabledump
%%DATADIR%%/tools/bin/sstableexpiredblockers
%%DATADIR%%/tools/bin/sstablelevelreset

View File

@ -7181,7 +7181,6 @@
SUBDIR += rubygem-ruby-macho
SUBDIR += rubygem-ruby-magic
SUBDIR += rubygem-ruby-ole
SUBDIR += rubygem-ruby-openai
SUBDIR += rubygem-ruby-prof
SUBDIR += rubygem-ruby-progressbar
SUBDIR += rubygem-ruby-statistics

View File

@ -1,6 +1,7 @@
PORTNAME= cli
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,7 +1,7 @@
PORTNAME= cpp-netlib
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 0.13.0
PORTREVISION= 4
PORTREVISION= 5
DISTVERSIONSUFFIX= -final
CATEGORIES= devel

View File

@ -217,7 +217,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
YARN_TIMESTAMP= 1683530525
YARN_TIMESTAMP= 1684050401
.include "Makefile.version"
.include <bsd.port.pre.mk>

View File

@ -1,2 +1,2 @@
ELECTRON_VER= 24.2.0
ELECTRON_VER= 24.3.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

View File

@ -1,12 +1,12 @@
TIMESTAMP = 1683530977
TIMESTAMP = 1684050898
SHA256 (electron/chromium-112.0.5615.165.tar.xz) = 168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd
SIZE (electron/chromium-112.0.5615.165.tar.xz) = 1730146076
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
SHA256 (electron/electron-yarn-cache-24.2.0.tar.xz) = 0cff4a0cf97d30a735e9efce8a341f9948e778d70da8542da9b8d0c972b5cf33
SIZE (electron/electron-yarn-cache-24.2.0.tar.xz) = 39365676
SHA256 (electron/electron-electron-v24.2.0_GH0.tar.gz) = 0dd1434ff9e6ff8f266d82ff42d922414088b4940f0dfca4d5d22062ff94d3d6
SIZE (electron/electron-electron-v24.2.0_GH0.tar.gz) = 10457860
SHA256 (electron/electron-yarn-cache-24.3.0.tar.xz) = a0c07ddcade9bd20746585e3c1ca4aba3dbfb99dbfcc621c4403cf550394dd03
SIZE (electron/electron-yarn-cache-24.3.0.tar.xz) = 39365592
SHA256 (electron/electron-electron-v24.3.0_GH0.tar.gz) = 3359336061436701b6eebc589559753d240bd8fb8c92d5c944563d2cbf0f6762
SIZE (electron/electron-electron-v24.3.0_GH0.tar.gz) = 10458047
SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829
SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39

View File

@ -1,6 +1,6 @@
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-04-03 22:25:21 UTC
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-05-09 16:07:54 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -152,11 +152,11 @@
@@ -151,11 +151,11 @@
#include "ui/base/cocoa/defaults_utils.h"
#endif
@ -14,7 +14,7 @@
#include "ui/gfx/font_render_params.h"
#endif
@@ -400,7 +400,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
@@ -494,7 +494,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
ui::TextInsertionCaretBlinkPeriodFromDefaults());
if (system_value)
return *system_value;
@ -23,7 +23,7 @@
if (auto* linux_ui = ui::LinuxUi::instance())
return linux_ui->GetCursorBlinkInterval();
#elif BUILDFLAG(IS_WIN)
@@ -854,7 +854,7 @@ void WebContents::InitWithSessionAndOptions(
@@ -948,7 +948,7 @@ void WebContents::InitWithSessionAndOptions(
accept_languages.pop_back();
prefs->accept_languages = accept_languages;
@ -32,7 +32,7 @@
// Update font settings.
static const gfx::FontRenderParams params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
@@ -2394,7 +2394,7 @@ void WebContents::ForcefullyCrashRenderer() {
@@ -2488,7 +2488,7 @@ void WebContents::ForcefullyCrashRenderer() {
content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
@ -41,7 +41,7 @@
// A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
// Instead we send an explicit IPC to crash on the renderer's IO thread.
rph->ForceCrash();
@@ -3037,7 +3037,7 @@ void WebContents::CopyImageAt(int x, int y) {
@@ -3131,7 +3131,7 @@ void WebContents::CopyImageAt(int x, int y) {
void WebContents::Focus() {
// Focusing on WebContents does not automatically focus the window on macOS
// and Linux, do it manually to match the behavior on Windows.
@ -50,7 +50,7 @@
if (owner_window())
owner_window()->Focus(true);
#endif
@@ -3843,7 +3843,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
@@ -3937,7 +3937,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif

View File

@ -1,6 +1,6 @@
PORTNAME= hpx
DISTVERSION= 1.8.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,6 +1,7 @@
PORTNAME= opendht
DISTVERSIONPREFIX= v
DISTVERSION= 2.5.1
PORTREVISION= 1
CATEGORIES= devel net
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,5 +1,6 @@
PORTNAME= donut-shellcode
DISTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -10,7 +11,9 @@ WWW= https://github.com/TheWover/donut
LICENSE= BSD3CLAUSE
USES= python:3.6+
USES= dos2unix python:3.6+
USE_PYTHON= distutils autoplist
DOS2UNIX_GLOB= *.py
.include <bsd.port.mk>

View File

@ -0,0 +1,22 @@
--- setup.py.orig 2023-05-16 05:00:53 UTC
+++ setup.py
@@ -1,10 +1,18 @@
from setuptools import Extension, setup
import sys
+import platform
with open("README.md", "r") as fh:
long_description = fh.read()
-static_libraries = ['aplib64']
+if platform.system() == 'FreeBSD':
+ if platform.machine() == 'i386':
+ static_libraries = ['aplib32']
+ elif platform.machine() == 'amd64':
+ static_libraries = ['aplib64']
+else:
+ static_libraries = ['aplib64']
+
static_lib_dir = 'lib'
libraries = []
library_dirs = ['lib']

View File

@ -1,5 +1,5 @@
PORTNAME= sentry-sdk
DISTVERSION= 1.5.12
DISTVERSION= 1.21.1
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -12,13 +12,15 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}urllib3>=1.10.0,1:net/py-urllib3@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.11,1:net/py-urllib3@${PY_FLAVOR}
# Some dependencies are still missing from the ports collection.
# TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
# ${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
# ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
USES= python:3.6+
USES= cpe python:3.6+
CPE_VENDOR= sentry
CPE_PRODUCT= sentry_software_development_kit
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1652510644
SHA256 (sentry-sdk-1.5.12.tar.gz) = 259535ba66933eacf85ab46524188c84dcb4c39f40348455ce15e2c0aca68863
SIZE (sentry-sdk-1.5.12.tar.gz) = 112372
TIMESTAMP = 1682793580
SHA256 (sentry-sdk-1.21.1.tar.gz) = 99c15556a23621be9f18c2955f7ce63321713bf1c0ad396b27b61399bac5f458
SIZE (sentry-sdk-1.21.1.tar.gz) = 176965

View File

@ -1,7 +1,6 @@
PORTNAME= nextdns
PORTVERSION= 1.37.11
PORTVERSION= 1.39.4
DISTVERSIONPREFIX= v
PORTREVISION= 14
CATEGORIES= dns security
MAINTAINER= rs@nextdns.io

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1679528608
SHA256 (nextdns-nextdns-v1.37.11_GH0.tar.gz) = f70cb424b0ae47456c8579d3910b486f75afde34572f28f8cf6eb1222e59b88b
SIZE (nextdns-nextdns-v1.37.11_GH0.tar.gz) = 198085
TIMESTAMP = 1683921582
SHA256 (nextdns-nextdns-v1.39.4_GH0.tar.gz) = e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac
SIZE (nextdns-nextdns-v1.39.4_GH0.tar.gz) = 198958
SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
SHA256 (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 0a01d2b131419cb2b9f7d910a2c90b824449bd91005b47efb235dc707665337a

View File

@ -1,9 +0,0 @@
#!/bin/sh
if [ x"$2" != x"DEINSTALL" ]; then
exit 0
fi
${PKG_PREFIX}/nextdns uninstall >/dev/null 2>/dev/null
exit 0

View File

@ -0,0 +1,5 @@
#!/bin/sh
${PKG_PREFIX}/sbin/nextdns uninstall >/dev/null 2>/dev/null
exit 0

View File

@ -1,6 +1,6 @@
PORTNAME= abiword
PORTVERSION= 3.0.5
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR= AbiWord

View File

@ -1,5 +1,5 @@
PORTNAME= cudatext
PORTVERSION= 1.191.5
PORTVERSION= 1.194.0
CATEGORIES= editors
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
@ -17,12 +17,12 @@ GH_ACCOUNT= Alexey-T
GH_PROJECT= CudaText
GH_TUPLE= bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \
Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \
Alexey-T:ATFlatControls:c5c59dd:atflatcontrols/atflatcontrols \
Alexey-T:ATSynEdit:2712a42:atsynedit/atsynedit \
Alexey-T:ATFlatControls:112543f:atflatcontrols/atflatcontrols \
Alexey-T:ATSynEdit:18c7a88:atsynedit/atsynedit \
Alexey-T:Emmet-Pascal:6143720:emmet/emmet \
Alexey-T:EControl:a8e6d41:econtrol/econtrol \
Alexey-T:ATSynEdit_Ex:02c13b7:atsyneditex/atsyneditex \
Alexey-T:ATSynEdit_Cmp:c7f8c9a:atsyneditcmp/atsyneditcmp \
Alexey-T:ATSynEdit_Ex:9f41d09:atsyneditex/atsyneditex \
Alexey-T:ATSynEdit_Cmp:99f0636:atsyneditcmp/atsyneditcmp \
Alexey-T:ATBinHex-Lazarus:c63346b:atbinhex/atbinhex \
Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
Alexey-T:EncConv:401cdb6:encconv/encconv

View File

@ -1,22 +1,22 @@
TIMESTAMP = 1682360296
SHA256 (Alexey-T-CudaText-1.191.5_GH0.tar.gz) = 39ffdccf8893320b88c373d900946a498bbb08a86b9a403cadf2b31e8b0138ab
SIZE (Alexey-T-CudaText-1.191.5_GH0.tar.gz) = 6185396
TIMESTAMP = 1684178434
SHA256 (Alexey-T-CudaText-1.194.0_GH0.tar.gz) = de8499bf69e01b673f725f045e18865f1a1b69cd3d0ea28cf795bb5bc37944fe
SIZE (Alexey-T-CudaText-1.194.0_GH0.tar.gz) = 6191775
SHA256 (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = ae3f28596c2a5f44bc468f6c3380fc1ceb27e95afea579f09b1d340c781bbef2
SIZE (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = 6983967
SHA256 (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 5ee4a511e6c4cbd8d5105203acbcb04fbeb180160b9cdff7dac2ce0e3cce04f4
SIZE (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 94717
SHA256 (Alexey-T-ATFlatControls-c5c59dd_GH0.tar.gz) = 6d027842e3f165e0d08c1fb5d82ccc1a53b2a32b57fa028d580297981d2117bd
SIZE (Alexey-T-ATFlatControls-c5c59dd_GH0.tar.gz) = 535515
SHA256 (Alexey-T-ATSynEdit-2712a42_GH0.tar.gz) = c9a4dc2fd767b0d329f98bbbd293cc547440c42d24a0ccd6a0af4eae0a21d7e1
SIZE (Alexey-T-ATSynEdit-2712a42_GH0.tar.gz) = 1382936
SHA256 (Alexey-T-ATFlatControls-112543f_GH0.tar.gz) = 003eaf6e255d8f51a14a90f4718f8330e73a77972fb4c740fbd1ea637497e5aa
SIZE (Alexey-T-ATFlatControls-112543f_GH0.tar.gz) = 535766
SHA256 (Alexey-T-ATSynEdit-18c7a88_GH0.tar.gz) = 1b0173e578e778239bcfe68c5b87416b4223248446f5e733c4005f275a1c7dbb
SIZE (Alexey-T-ATSynEdit-18c7a88_GH0.tar.gz) = 1383551
SHA256 (Alexey-T-Emmet-Pascal-6143720_GH0.tar.gz) = 57c3618a7233255a37864a89649084c69f9f4fb62650a9210774c06196ea87bc
SIZE (Alexey-T-Emmet-Pascal-6143720_GH0.tar.gz) = 83486
SHA256 (Alexey-T-EControl-a8e6d41_GH0.tar.gz) = 204fd5e36bf43071966485c3ae18166140c5ccba119ede939dfb5041ed40ab16
SIZE (Alexey-T-EControl-a8e6d41_GH0.tar.gz) = 68217
SHA256 (Alexey-T-ATSynEdit_Ex-02c13b7_GH0.tar.gz) = ab4c1e15e6c83007104e5c284b58c25ca242c30380d5debb7d1687c2dee0691a
SIZE (Alexey-T-ATSynEdit_Ex-02c13b7_GH0.tar.gz) = 46117
SHA256 (Alexey-T-ATSynEdit_Cmp-c7f8c9a_GH0.tar.gz) = 12c4d60b65c1fa2a8e6523404aedee1526844ca593355a2afc814daa6144717a
SIZE (Alexey-T-ATSynEdit_Cmp-c7f8c9a_GH0.tar.gz) = 26094
SHA256 (Alexey-T-ATSynEdit_Ex-9f41d09_GH0.tar.gz) = 6cc5cb78b2548fafeae6e5925f1c5d93d9a5264350d40affe139c91e912db8a1
SIZE (Alexey-T-ATSynEdit_Ex-9f41d09_GH0.tar.gz) = 46141
SHA256 (Alexey-T-ATSynEdit_Cmp-99f0636_GH0.tar.gz) = 81a3348b1c85b28707ae1f6036ae4e814c17bd64856ff695e09f2528ee4f0f91
SIZE (Alexey-T-ATSynEdit_Cmp-99f0636_GH0.tar.gz) = 26414
SHA256 (Alexey-T-ATBinHex-Lazarus-c63346b_GH0.tar.gz) = e37ccd44148a7a1e9af8d6588b8f199e53efb271938b8a7d5514c2183ceb172a
SIZE (Alexey-T-ATBinHex-Lazarus-c63346b_GH0.tar.gz) = 149520
SHA256 (Alexey-T-UniqueInstance-753f823_GH0.tar.gz) = 2af99af3ac2696d5e143b67bb5af82dd86649377bf81ac084bd205e77646b3d9

View File

@ -39,7 +39,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libmbedtls.so:security/mbedtls \
libtre.so:textproc/libtre
USES= cmake desktop-file-utils gl gnome pkgconfig python:3.8+ xorg
USES= cmake desktop-file-utils gl gnome llvm:min=16,build pkgconfig python:3.8+ xorg
USE_GL= gl glu
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_XORG= x11 xcb xau xdmcp
@ -69,6 +69,8 @@ GH_TAG_NATIVEFILEDIALOG= 7909f55
GH_TAG_PATTERN_LANGUAGE= 68210bd
GH_TAG_YARA= 96790e5
CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON \
-DIMHEX_STRIP_RELEASE=OFF -DIMHEX_PLUGINS_IN_SHARE=ON \
-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_USE_GTK_FILE_PICKER=ON

View File

@ -16,12 +16,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}python-lhafile>0:archivers/py-python-lhafile@${PY_FLAVOR}
USES= gettext gmake gnome pathfix pyqt:5 python:3.4+
USE_PYTHON= distutils autoplist noflavors
USE_PYQT= pyqt5 sip
MAKE_ARGS+= DESTDIR=${STAGEDIR} prefix=${PREFIX} PYTHON=${PYTHON_CMD}
MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD}
PYDISTUTILS_INSTALLARGS+= --install-lib=${PYTHON_SITELIBDIR}
OPTIONS_DEFINE= DOCS

View File

@ -5,7 +5,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.zeograd.com/download/ \
http://www.sourcefiles.org/Emulators/Videogames/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= PC Engine (TurboGrafx 16) emulator
WWW= https://www.zeograd.com/
@ -14,52 +14,42 @@ LICENSE_COMB= multi
LIB_DEPENDS= libargp.so:devel/argp-standalone
OPTIONS_DEFINE= GTK2 DOCS NETPLAY SDL_MIXER
OPTIONS_DEFAULT=GTK2
OPTIONS_SUB= yes
NETPLAY_DESC= Netplay support
SDL_MIXER_DESC= SDL_mixer support
USES= gmake pkgconfig sdl
USE_SDL= sdl
USES= gmake localbase:ldflags pkgconfig sdl
USE_CSTD= gnu89
USE_SDL= sdl
GNU_CONFIGURE= yes
CFLAGS+= -Wno-return-type
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFLICTS_INSTALL= gohugo
.include <bsd.port.options.mk>
OPTIONS_DEFINE= GTK2 DOCS NETPLAY SDL_MIXER
OPTIONS_DEFAULT=GTK2
OPTIONS_SUB= yes
.if empty(PORT_OPTIONS:MGTK2) && ${PORT_OPTIONS:MNETPLAY}
IGNORE= NETPLAY support requires GTK2 support
.endif
NETPLAY_DESC= Netplay support
SDL_MIXER_DESC= SDL_mixer support
.if ${PORT_OPTIONS:MGTK2}
LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES+= gnome
USE_GNOME= gtk20 cairo gdkpixbuf2
.else
CONFIGURE_ARGS+= --disable-gui --disable-gtktest
.endif
.if ${PORT_OPTIONS:MNETPLAY}
USE_SDL+= net
.else
CONFIGURE_ENV+= ac_cv_lib_SDL_net_main=no
.endif
.if ${PORT_OPTIONS:MSDL_MIXER}
LIB_DEPENDS+= libvorbis.so:audio/libvorbis
USE_SDL+= mixer
CFLAGS+= -DOGG_SUPPORT
.else
CONFIGURE_ENV+= ac_cv_lib_SDL_mixer_main=no \
GTK2_USES= gnome
GTK2_USE= GNOME=gtk20 cairo gdkpixbuf2
GTK2_CONFIGURE_OFF= --disable-gui --disable-gtktest
NETPLAY_IMPLIES= GTK2
NETPLAY_USE= SDL=net
NETPLAY_CONFIGURE_ENV_OFF= ac_cv_lib_SDL_net_main=no
SDL_MIXER_LIB_DEPENDS= libvorbis.so:audio/libvorbis
SDL_MIXER_USE= SDL=mixer
SDL_MIXER_CONFIGURE_ENV_OFF= ac_cv_lib_SDL_mixer_main=no \
ac_cv_lib_vorbis_main=no \
ac_cv_lib_vorbisfile_main=no
SDL_MIXER_CFLAGS= -DOGG_SUPPORT
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=int-conversion
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Tue Apr 5 15:23:11 2005
+++ Makefile.in Fri May 19 02:40:30 2006
@@ -444,7 +444,7 @@
--- Makefile.in.orig 2005-04-05 20:23:11 UTC
+++ Makefile.in
@@ -444,7 +444,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
hugo$(EXEEXT): $(hugo_OBJECTS) $(hugo_DEPENDENCIES)
@rm -f hugo$(EXEEXT)
@ -9,14 +9,12 @@
hugod$(EXEEXT): $(hugod_OBJECTS) $(hugod_DEPENDENCIES)
@rm -f hugod$(EXEEXT)
$(LINK) $(hugod_LDFLAGS) $(hugod_OBJECTS) $(hugod_LDADD) $(LIBS)
@@ -813,11 +813,11 @@
fi \
@@ -814,10 +814,10 @@ install-data-local:
done \
fi && \
- if test -d $(srcdir)/doc; then \
if test -d $(srcdir)/doc; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
- for doc in $(srcdir)/doc/*.{html,txt,css}; do \
+ if test -d $(srcdir)/doc; then \
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/hugo; \
+ for doc in $(srcdir)/doc/*.html $(srcdir)/doc/*.txt $(srcdir)/doc/*.css; do \
if test -f $$doc; then \

View File

@ -1,6 +1,6 @@
--- configure.orig 2005-04-05 14:28:53.000000000 -0500
+++ configure 2007-10-09 21:55:43.000000000 -0500
@@ -3256,7 +3256,7 @@
--- configure.orig 2005-04-05 19:28:53 UTC
+++ configure
@@ -3256,7 +3256,7 @@ if test "${ac_cv_lib_SDL_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -3312,7 +3312,7 @@
@@ -3312,7 +3312,7 @@ if test $ac_cv_lib_SDL_main = yes; then
#define HAVE_LIBSDL 1
_ACEOF
@ -18,7 +18,7 @@
fi
#,,[AC_MSG_ERROR([need SDL. See #http://www.libsdl.org])])
@@ -7877,7 +7877,7 @@
@@ -7877,7 +7877,7 @@ _ACEOF
echo "$as_me:$LINENO: checking whether netplay support was asked" >&5
echo $ECHO_N "checking whether netplay support was asked... $ECHO_C" >&6
@ -27,7 +27,7 @@
then
@@ -8657,13 +8657,13 @@
@@ -8657,13 +8657,13 @@ fi
fi
;;
@ -44,10 +44,11 @@
@@ -8675,6 +8675,35 @@
@@ -8674,6 +8674,35 @@ else
SDL_FREEBSD_TRUE='#'
SDL_FREEBSD_FALSE=
fi
+
+
+ if test "$USE_SDL_mixer" = "yes"; then
+ LIBS="$LIBS -lSDL_mixer "
@ -76,7 +77,6 @@
+fi
+ # ZE_: needs to be processed after SDL_MIXER_LINUX...
+ fi
+
;;
sun4u-SunOS)
echo "Solaris build enabled"

View File

@ -1,6 +1,6 @@
--- osd_freebsd_cd.c.orig Fri May 19 01:33:50 2006
+++ osd_freebsd_cd.c Fri May 19 01:36:44 2006
@@ -38,7 +38,7 @@
--- osd_freebsd_cd.c.orig 2003-10-12 21:45:03 UTC
+++ osd_freebsd_cd.c
@@ -38,7 +38,7 @@ void osd_cd_close()
}
@ -9,7 +9,7 @@
{
/*
int retries = 0;
@@ -236,15 +236,3 @@
@@ -236,15 +236,3 @@ void osd_cd_play_audio_range(UChar min_from, UChar sec
perror("play_audio_range");
*/
}

View File

@ -1,6 +1,6 @@
--- pce.c.orig 2005-03-28 08:17:45.000000000 -0600
+++ pce.c 2007-10-09 21:32:50.000000000 -0500
@@ -358,7 +358,7 @@
--- pce.c.orig 2005-03-28 14:17:45 UTC
+++ pce.c
@@ -358,7 +358,7 @@ UInt32 timer_60 = 0;
int UPeriod = 0;
// Number of frame to skip

View File

@ -1,7 +1,7 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.27-14986 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -gdb7f84f9f8
DISTVERSION= 0.0.27-15003 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -gf11770b88b
CATEGORIES= emulators wayland
MAINTAINER= jbeich@FreeBSD.org
@ -51,7 +51,7 @@ ELF_FEATURES= +noaslr,wxneeded:bin/${PORTNAME}
.if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch)
PATCH_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6
PATCHFILES+= 1ca0470f02b2.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
PATCHFILES+= 6c51424a704d.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
PKGNAMESUFFIX= -${FLAVOR}
USES:= ${USES:S/qt:5/qt:6/}
USE_QT= base multimedia svg

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1683712854
SHA256 (RPCS3-rpcs3-v0.0.27-14986-gdb7f84f9f8_GH0.tar.gz) = f82ff51be93d1f1c787bf270a2c23e79c751bd6f8bf2793857a503839d8a2f9c
SIZE (RPCS3-rpcs3-v0.0.27-14986-gdb7f84f9f8_GH0.tar.gz) = 8811599
TIMESTAMP = 1684167647
SHA256 (RPCS3-rpcs3-v0.0.27-15003-gf11770b88b_GH0.tar.gz) = 22d413e8ef12c4b7c2f77e42985d6fb7bc3ff2a428efcf69ab70b721965d1f4e
SIZE (RPCS3-rpcs3-v0.0.27-15003-gf11770b88b_GH0.tar.gz) = 8814858
SHA256 (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = a45fdf93aeb913407f0e707769b3ee7ac58bef6d44e299065ea1df038261ac1c
SIZE (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = 245283
SHA256 (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 56863dbed27510742ed4ced54e9a5fba8658bcbfbb1cc5cdb978d7d537a3a874
@ -21,5 +21,5 @@ SHA256 (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 166277d9c1b8d8241cc6bfaa
SIZE (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 454853
SHA256 (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = c1e689e21a17aa9b838e67a37c3eadfa578c8e260f8c77fb028c0316309f0636
SIZE (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = 21998970
SHA256 (1ca0470f02b2.patch) = 20bddafca8afd62acfd68ee0869cc54a3ee77488bd745aa2c1ca05a4b050168b
SIZE (1ca0470f02b2.patch) = 110744
SHA256 (6c51424a704d.patch) = 849402ce35a92e4aedcf42c7977c2f5f2c7c944614cb92edc6114b8ec69b1a75
SIZE (6c51424a704d.patch) = 113317

View File

@ -1,6 +1,5 @@
PORTNAME= virtualbox-ose
PORTVERSION= 6.1.36
PORTREVISION= 1
PORTVERSION= 6.1.44
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX= -kmod

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1658298869
SHA256 (VirtualBox-6.1.36.tar.bz2) = e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047
SIZE (VirtualBox-6.1.36.tar.bz2) = 165685382
TIMESTAMP = 1683653444
SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421

View File

@ -1,6 +1,5 @@
PORTNAME= virtualbox-ose
PORTVERSION= 6.1.36
PORTREVISION= 2
PORTVERSION= 6.1.44
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1658298869
SHA256 (VirtualBox-6.1.36.tar.bz2) = e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047
SIZE (VirtualBox-6.1.36.tar.bz2) = 165685382
SHA256 (VBoxGuestAdditions_6.1.36.iso) = c987cdc8c08c579f56d921c85269aeeac3faf636babd01d9461ce579c9362cdd
SIZE (VBoxGuestAdditions_6.1.36.iso) = 63803392
TIMESTAMP = 1683653391
SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
SHA256 (VBoxGuestAdditions_6.1.44.iso) = a88d947b0055ae0f08962fa1b5788247272903b6bca3f1a9ad0cb6bc8706ecf8
SIZE (VBoxGuestAdditions_6.1.44.iso) = 63952896

View File

@ -552,6 +552,7 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt
%%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_ka.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm
@ -590,6 +591,7 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt
%%NLS%%%%DATADIR%%/nls/qt_id.qm
%%NLS%%%%DATADIR%%/nls/qt_it.qm
%%NLS%%%%DATADIR%%/nls/qt_ja.qm
%%NLS%%%%DATADIR%%/nls/qt_ka.qm
%%NLS%%%%DATADIR%%/nls/qt_km_KH.qm
%%NLS%%%%DATADIR%%/nls/qt_ko.qm
%%NLS%%%%DATADIR%%/nls/qt_lt.qm

View File

@ -1,5 +1,5 @@
PORTNAME= yuzu
PORTVERSION= s20230512
PORTVERSION= s20230515
CATEGORIES= emulators wayland
.if make(makesum)
MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@ -46,7 +46,7 @@ qt6_OPTIONS_EXCLUDE= QT5
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= 021e503cc
GH_TAGNAME= bbb6b58aa
GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \
yuzu-emu:sirit:ab75463:sirit/externals/sirit \
KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \

View File

@ -1,8 +1,8 @@
TIMESTAMP = 1683934937
SHA256 (yuzu-s20230512/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
SIZE (yuzu-s20230512/compatibility_list.json) = 1801327
SHA256 (yuzu-emu-yuzu-s20230512-021e503cc_GH0.tar.gz) = c6958f3f51f2fef1c5c75377ecf4025fcaaeee3ce2601187a6d12810ddca41f6
SIZE (yuzu-emu-yuzu-s20230512-021e503cc_GH0.tar.gz) = 5631841
TIMESTAMP = 1684166724
SHA256 (yuzu-s20230515/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
SIZE (yuzu-s20230515/compatibility_list.json) = 1801327
SHA256 (yuzu-emu-yuzu-s20230515-bbb6b58aa_GH0.tar.gz) = 05bdfe6d429e001bbc37791cf28e06b4e78ef552d3f3c147404a0567f2dda824
SIZE (yuzu-emu-yuzu-s20230515-bbb6b58aa_GH0.tar.gz) = 5634269
SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450
SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189
SHA256 (yuzu-emu-sirit-ab75463_GH0.tar.gz) = 6b61e265be182b7a78075fc1b98ccf80fd33008343205dd0e22a10a439c45319

View File

@ -1,7 +1,7 @@
PORTNAME= fineftp-server
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= ftp
MAINTAINER= yuri@FreeBSD.org

View File

@ -2,7 +2,7 @@ PORTNAME= libretro-mame2000
PORTVERSION= 0.20220405
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= MAME (0.37b5) for libretro
WWW= https://github.com/libretro/mame2000-libretro
@ -12,17 +12,22 @@ BROKEN_aarch64= fails to build: src/libretro/libretro-common/libco/aarch64.c:25:
USES= compiler:c++11-lib dos2unix gmake
DOS2UNIX_FILES= src/cpu/tms9900/99xxstat.h
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= libretro
GH_PROJECT= mame2000-libretro
GH_TAGNAME= f35db38
USE_LDCONFIG= yes
PLIST_FILES= lib/libretro/mame2000_libretro.so
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=int-conversion
.endif
do-install:
${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
${INSTALL_LIB} ${WRKSRC}/mame2000_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -2,7 +2,7 @@ PORTNAME= libretro-mame2003_plus
PORTVERSION= 0.20220406
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= Updated MAME 0.78 for libretro with added game support
WWW= https://github.com/libretro/mame2003-plus-libretro
@ -18,8 +18,14 @@ GH_TAGNAME= 9ab273f
PLIST_FILES= lib/libretro/mame2003_plus_libretro.so
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=int-conversion
.endif
do-install:
${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
${INSTALL_LIB} ${WRKSRC}/mame2003_plus_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,7 +1,7 @@
PORTNAME= widelands
DISTVERSIONPREFIX= v
DISTVERSION= 1.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -12,14 +12,12 @@ LICENSE= GPLv2
LIB_DEPENDS= libnetpbm.so:graphics/netpbm
USES= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-netpbm=${LOCALBASE}
MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} DESTDIR=${DESTDIR}
MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX}
PLIST_FILES= bin/gocr \
man/man1/gocr.1.gz
PORTDOCS= *
DOCSRCDIR1= ${WRKSRC}
@ -39,7 +37,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in
post-patch-X11-off:
@${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e '/gocr\.tcl/d' ${WRKSRC}/src/Makefile.in
post-patch-X11-on:
@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/bin/gocr.tcl

View File

@ -1,5 +1,5 @@
PORTNAME= jpegoptim
PORTVERSION= 1.5.3
PORTVERSION= 1.5.4
DISTVERSIONPREFIX= v
CATEGORIES= graphics

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1680280715
SHA256 (tjko-jpegoptim-v1.5.3_GH0.tar.gz) = 2600d1c84cee714b69d88944c0b90f93ef3eac7010c96dadabf32ea90d67e33e
SIZE (tjko-jpegoptim-v1.5.3_GH0.tar.gz) = 121006
TIMESTAMP = 1684157521
SHA256 (tjko-jpegoptim-v1.5.4_GH0.tar.gz) = 8fc7537f722d533ea8b45966ab80c83e3342d088d5a690fdadfb05b7c9cba47f
SIZE (tjko-jpegoptim-v1.5.4_GH0.tar.gz) = 124040

View File

@ -1,6 +1,6 @@
PORTNAME= mesa
DISTVERSION= 23.1-branchpoint-1347
DISTVERSIONSUFFIX= -g4621a6db508
DISTVERSION= 23.1-branchpoint-1457
DISTVERSIONSUFFIX= -g38fab8a1da3
CATEGORIES= graphics
PKGNAMESUFFIX= -devel

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1683932500
SHA256 (mesa3d-mesa-23.1-branchpoint-1347-g4621a6db508_GH0.tar.gz) = 08ff6c34a8e3171619fe4498171b69217d3fe92472b780aa4f2a25560176ad8b
SIZE (mesa3d-mesa-23.1-branchpoint-1347-g4621a6db508_GH0.tar.gz) = 29208720
TIMESTAMP = 1684194083
SHA256 (mesa3d-mesa-23.1-branchpoint-1457-g38fab8a1da3_GH0.tar.gz) = f34d54f0ee9eb8723d8090ecd1de4143dcea8c61ef04cf37d182cc82606f991c
SIZE (mesa3d-mesa-23.1-branchpoint-1457-g38fab8a1da3_GH0.tar.gz) = 29223902
SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
SIZE (700efacda59c.patch) = 983
SHA256 (3043f16d66bf.patch) = 7afdba18fc3041dc6e30bdb1409f5214e451e7e5ceaa3b21991d6b2f793d9c85

View File

@ -1,5 +1,5 @@
PORTNAME= gcc
PORTVERSION= 14.0.0.s20230507
PORTVERSION= 14.0.0.s20230514
CATEGORIES= lang
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1683530874
SHA256 (gcc-14-20230507.tar.xz) = 79cf73c709744d8e334141ae0ce2cc0fe2dab9944fd7fd1a4492d85aab87dfb8
SIZE (gcc-14-20230507.tar.xz) = 84069364
TIMESTAMP = 1684135638
SHA256 (gcc-14-20230514.tar.xz) = e72a048782d00d774f98c72aa6f6027d01b18bcae6ab9d46e31f806786c2f66e
SIZE (gcc-14-20230514.tar.xz) = 84081088

View File

@ -0,0 +1,20 @@
Enable support for .init_array and .fini_array, which FreeBSD supports
since commit 83aa9cc00c2d83d05a0efe7a1496d8aab4a153bb in the src
repository.
There __FreeBSD_version is 1000009, so we start enabling the support
from __FreeBSD_version == 1000010.
--- gcc/configure.orig 2023-05-04 17:36:54 UTC
+++ gcc/configure
@@ -24214,6 +24214,11 @@ EOF
#else
# if defined __sun__ && defined __svr4__
/* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8. */
+# elif defined __FreeBSD__
+# include <sys/param.h>
+# if __FreeBSD_version >= 1000010
+ /* FreeBSD supports .init_array/.fini_array since FreeBSD 10. */
+# endif
# else
# error The C library not known to support .init_array/.fini_array
# endif

View File

@ -1,6 +1,6 @@
PORTNAME= janet
DISTVERSIONPREFIX= v
DISTVERSION= 1.27.0
DISTVERSION= 1.28.0
CATEGORIES= lang
MAINTAINER= hsw@bitmark.com

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1678153451
SHA256 (janet-lang-janet-v1.27.0_GH0.tar.gz) = a81c8750844323eb73aea064db9c467aa3361a03fc6f251d3e19a473b147082d
SIZE (janet-lang-janet-v1.27.0_GH0.tar.gz) = 525780
TIMESTAMP = 1684115233
SHA256 (janet-lang-janet-v1.28.0_GH0.tar.gz) = d78a4c367f1b2c9f95897fa13fc788b36ce49cfcc18083b0810e86b2dd1285bb
SIZE (janet-lang-janet-v1.28.0_GH0.tar.gz) = 531528

View File

@ -19,7 +19,6 @@ SHEBANG_FILES= example/Atua*
SHEBANG_LANG= retro
MAKE_ENV= DATADIR=${DATADIR} \
DESTDIR=${DESTDIR} \
DOCSDIR=${DOCSDIR} \
EXAMPLESDIR=${EXAMPLESDIR} \
PREFIX=${PREFIX}

View File

@ -5,7 +5,7 @@ CATEGORIES= mail gnustep
MASTER_SITES= SAVANNAH/gnustep-nonfsf/
DISTNAME= GNUMail-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= GNUstep mail client
WWW= https://www.nongnu.org/gnustep-nonfsf/gnumail/
@ -15,9 +15,31 @@ LIB_DEPENDS= libPantomime.so:mail/pantomime \
libAddresses.so:mail/addresses
USES= cpe gnustep
CPE_VENDOR= gnu
USE_GNUSTEP= back build gui base
USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=int-conversion
.endif
post-stage:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/1/libGNUMail.so.1.4.0
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/Colors
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Import.bundle/Import
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/PGP
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/Sending
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Emoticon
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/Account
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GNUMail.app/GNUMail
.include <bsd.port.post.mk>

View File

@ -1,5 +1,5 @@
PORTNAME= neomutt
PORTVERSION= 20230407
PORTVERSION= 20230512
CATEGORIES= mail
MAINTAINER= bapt@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1682345655
SHA256 (neomutt-neomutt-20230407_GH0.tar.gz) = 9c1167984337d136368fbca56be8c04a550060a2fdd33c96538910ea13ba6d4f
SIZE (neomutt-neomutt-20230407_GH0.tar.gz) = 3725060
TIMESTAMP = 1684145379
SHA256 (neomutt-neomutt-20230512_GH0.tar.gz) = 44a6c9d8e6f58c6a3b21b6af5f044ffd0ed2deb1a7cdc6bdda14669917bd09c4
SIZE (neomutt-neomutt-20230512_GH0.tar.gz) = 3791505

View File

@ -1,58 +0,0 @@
commit 90871d3963ee739c7d52425c77ea4e619b94732c
Author: Pietro Cerutti (@gahr) <gahr@gahr.ch>
Date: Tue Apr 11 06:25:27 2023 +0000
Remove use of lmap in auto.def, provide lkill alternative
diff --git auto.def.orig auto.def
index 00d8839c9..27419a5d8 100644
--- auto.def.orig
+++ auto.def
@@ -288,6 +288,17 @@ if {1} {
return 0
}
}
+
+ # lkill l p is the list of the elements in l that don't match p
+ proc lkill {l p} {
+ set res [list]
+ foreach elem $l {
+ if {![apply $p $elem]} {
+ lappend res $elem
+ }
+ }
+ set res
+ }
}
###############################################################################
@@ -1138,9 +1149,7 @@ set conststrings "\
unsigned char cc_cflags\[\] = {[text2c [expr {
[get-define want-include-path-in-cflags]
? [get-define CFLAGS]
- : [lmap x [get-define CFLAGS] {
- expr {[string equal -length 2 $x {-I}] ? [continue] : $x}
- }]
+ : [lkill [get-define CFLAGS] {{x} {string equal -length 2 $x {-I}}}]
}]]};\n\
unsigned char configure_options\[\] = {[text2c $conf_options]};\n"
if {[catch {set fd [open conststrings.c w]
@@ -1225,16 +1234,8 @@ make-config-header config.h -auto $auto_rep -bare $bare_rep -str $str_rep
###############################################################################
# Generate .clang_complete
-proc cflags-for-clang-complete {} {
- lmap x [get-define CFLAGS] {
- if {[string match "-MJ*" $x]} {
- continue
- } else {
- set x
- }
- }
-}
-define cflags-one-per-line [string map {" " "\n"} [cflags-for-clang-complete]]
+define cflags-one-per-line [string map {" " "\n"} \
+ [lkill [get-define CFLAGS] {{x} {string equal -length 3 $x "-MJ"}}]]
make-template .clang_complete.in
###############################################################################

View File

@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-xlt --without-sciplot
# With -O2 configure hangs at "checking for working mktime..."
CONFIGURE_ENV= CFLAGS="${CFLAGS:C/-O2//} -fwrapv"
MAKE_ARGS+= DESTDIR="${STAGEDIR}"
BINARY_ALIAS= makeinfo=false # disable detecting local makeinfo

View File

@ -1,4 +1,4 @@
DISTVERSION= 4.8.0.34
DISTVERSION= 4.8.0.35
PORTREVISION= 0
PKGNAMESUFFIX= -devel

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1683301471
SHA256 (emby-server-devel/emby-server-freebsd13_4.8.0.34_amd64.tar.xz) = 0be45ad40ac0d16b541245ad226003593ce8baf1f97aa4005a263cf03b9679f0
SIZE (emby-server-devel/emby-server-freebsd13_4.8.0.34_amd64.tar.xz) = 37228764
TIMESTAMP = 1684167958
SHA256 (emby-server-devel/emby-server-freebsd13_4.8.0.35_amd64.tar.xz) = 17468001424e4a0507f09e91dc380d9e2cfd9f139e9b75b162b6716973b516db
SIZE (emby-server-devel/emby-server-freebsd13_4.8.0.35_amd64.tar.xz) = 37307500
SHA256 (emby-server-devel/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 88e82f76e5e82568bdd7800ec5c6d5c05d33c4c951dae0712d078112cee80e64
SIZE (emby-server-devel/ffdetect-2022_05_07-x64_freebsd13.tar.xz) = 75308
SHA256 (emby-server-devel/ffmpeg-2022_05_07.tar.gz) = 44506c7c4fa41c721819f9b530b021e11921ea2a1332ce947d8af5a06a2df01e

View File

@ -1,6 +1,6 @@
PORTNAME= musikcube
DISTVERSION= 0.99.8
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= multimedia audio
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,7 +1,7 @@
PORTNAME= snapcast
DISTVERSIONPREFIX= v
DISTVERSION= 0.27.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia audio
MAINTAINER= yuri@FreeBSD.org

View File

@ -30,8 +30,8 @@ SLAVEDIRS= net-mgmt/netmagis-common \
net-mgmt/netmagis-www
# Variables used in netmagis Makefiles
MAKE_ARGS+= DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX}
MAKE_ARGS+= TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh
MAKE_ARGS+= PREFIX=${PREFIX} TCLSH=${TCLSH} \
TCLCONF=${TCL_LIBDIR}/tclConfig.sh
.if ${PKGNAMESUFFIX} == -topo || ${PKGNAMESUFFIX} == -www
ALL_TARGET=build${PKGNAMESUFFIX?=}

View File

@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= net-p2p
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= C/C++ implementation of Ethash and ProgPoW
WWW= https://github.com/chfast/ethash
@ -20,4 +20,12 @@ GH_ACCOUNT= chfast
CMAKE_OFF= HUNTER_ENABLED
.include <bsd.port.mk>
CFLAGS+= -Wno-error=deprecated-declarations
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CFLAGS+= -Wno-error=strict-prototypes
.endif
.include <bsd.port.post.mk>

View File

@ -1,5 +1,6 @@
PORTNAME= xbt
PORTVERSION= g20221002
PORTREVISION= 1
CATEGORIES= net-p2p
MAINTAINER= danfe@FreeBSD.org

View File

@ -1,6 +1,7 @@
PORTNAME= arataga
PORTVERSION= 0.5.4
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/sobjectizer/oess/oess-2:oess
DISTFILES= oess-2.2.3-full.tar.bz2:oess

View File

@ -1,5 +1,5 @@
PORTNAME= asio
DISTVERSION= 1.24.0
DISTVERSION= 1.28.0
CATEGORIES= net devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1660734008
SHA256 (asio-1.24.0.tar.bz2) = 8976812c24a118600f6fcf071a20606630a69afe4c0abee3b0dea528e682c585
SIZE (asio-1.24.0.tar.bz2) = 3150924
TIMESTAMP = 1684184177
SHA256 (asio-1.28.0.tar.bz2) = d0ddc2361abd2f4c823e970aaf8e28b4b31ab21b1a68af16b114fc093661e232
SIZE (asio-1.28.0.tar.bz2) = 3387977

View File

@ -1,10 +1,13 @@
include/asio.hpp
include/asio/any_completion_executor.hpp
include/asio/any_completion_handler.hpp
include/asio/any_io_executor.hpp
include/asio/append.hpp
include/asio/as_tuple.hpp
include/asio/associated_allocator.hpp
include/asio/associated_cancellation_slot.hpp
include/asio/associated_executor.hpp
include/asio/associated_immediate_executor.hpp
include/asio/associator.hpp
include/asio/async_result.hpp
include/asio/awaitable.hpp
@ -31,6 +34,7 @@ include/asio/basic_writable_pipe.hpp
include/asio/bind_allocator.hpp
include/asio/bind_cancellation_slot.hpp
include/asio/bind_executor.hpp
include/asio/bind_immediate_executor.hpp
include/asio/buffer.hpp
include/asio/buffer_registration.hpp
include/asio/buffered_read_stream.hpp
@ -48,6 +52,7 @@ include/asio/completion_condition.hpp
include/asio/compose.hpp
include/asio/connect.hpp
include/asio/connect_pipe.hpp
include/asio/consign.hpp
include/asio/coroutine.hpp
include/asio/deadline_timer.hpp
include/asio/defer.hpp
@ -69,6 +74,7 @@ include/asio/detail/call_stack.hpp
include/asio/detail/chrono.hpp
include/asio/detail/chrono_time_traits.hpp
include/asio/detail/completion_handler.hpp
include/asio/detail/composed_work.hpp
include/asio/detail/concurrency_hint.hpp
include/asio/detail/conditionally_enabled_event.hpp
include/asio/detail/conditionally_enabled_mutex.hpp
@ -162,6 +168,9 @@ include/asio/detail/impl/winrt_ssocket_service_base.ipp
include/asio/detail/impl/winrt_timer_scheduler.hpp
include/asio/detail/impl/winrt_timer_scheduler.ipp
include/asio/detail/impl/winsock_init.ipp
include/asio/detail/initiate_defer.hpp
include/asio/detail/initiate_dispatch.hpp
include/asio/detail/initiate_post.hpp
include/asio/detail/io_control.hpp
include/asio/detail/io_object_impl.hpp
include/asio/detail/io_uring_descriptor_read_at_op.hpp
@ -390,6 +399,7 @@ include/asio/experimental/cancellation_condition.hpp
include/asio/experimental/channel.hpp
include/asio/experimental/channel_error.hpp
include/asio/experimental/channel_traits.hpp
include/asio/experimental/co_composed.hpp
include/asio/experimental/co_spawn.hpp
include/asio/experimental/concurrent_channel.hpp
include/asio/experimental/coro.hpp
@ -403,21 +413,24 @@ include/asio/experimental/detail/channel_receive_op.hpp
include/asio/experimental/detail/channel_send_functions.hpp
include/asio/experimental/detail/channel_send_op.hpp
include/asio/experimental/detail/channel_service.hpp
include/asio/experimental/detail/completion_handler_erasure.hpp
include/asio/experimental/detail/coro_completion_handler.hpp
include/asio/experimental/detail/coro_promise_allocator.hpp
include/asio/experimental/detail/has_signature.hpp
include/asio/experimental/detail/impl/channel_service.hpp
include/asio/experimental/detail/partial_promise.hpp
include/asio/experimental/impl/as_single.hpp
include/asio/experimental/impl/channel_error.ipp
include/asio/experimental/impl/co_composed.hpp
include/asio/experimental/impl/coro.hpp
include/asio/experimental/impl/parallel_group.hpp
include/asio/experimental/impl/promise.hpp
include/asio/experimental/impl/use_coro.hpp
include/asio/experimental/impl/use_promise.hpp
include/asio/experimental/parallel_group.hpp
include/asio/experimental/prepend.hpp
include/asio/experimental/promise.hpp
include/asio/experimental/use_coro.hpp
include/asio/experimental/use_promise.hpp
include/asio/file_base.hpp
include/asio/generic/basic_endpoint.hpp
include/asio/generic/datagram_protocol.hpp
@ -430,6 +443,7 @@ include/asio/handler_alloc_hook.hpp
include/asio/handler_continuation_hook.hpp
include/asio/handler_invoke_hook.hpp
include/asio/high_resolution_timer.hpp
include/asio/impl/any_completion_executor.ipp
include/asio/impl/any_io_executor.ipp
include/asio/impl/append.hpp
include/asio/impl/as_tuple.hpp
@ -441,10 +455,9 @@ include/asio/impl/co_spawn.hpp
include/asio/impl/connect.hpp
include/asio/impl/connect_pipe.hpp
include/asio/impl/connect_pipe.ipp
include/asio/impl/defer.hpp
include/asio/impl/consign.hpp
include/asio/impl/deferred.hpp
include/asio/impl/detached.hpp
include/asio/impl/dispatch.hpp
include/asio/impl/error.ipp
include/asio/impl/error_code.ipp
include/asio/impl/execution_context.hpp
@ -455,7 +468,6 @@ include/asio/impl/handler_alloc_hook.ipp
include/asio/impl/io_context.hpp
include/asio/impl/io_context.ipp
include/asio/impl/multiple_exceptions.ipp
include/asio/impl/post.hpp
include/asio/impl/prepend.hpp
include/asio/impl/read.hpp
include/asio/impl/read_at.hpp
@ -528,6 +540,7 @@ include/asio/local/connect_pair.hpp
include/asio/local/datagram_protocol.hpp
include/asio/local/detail/endpoint.hpp
include/asio/local/detail/impl/endpoint.ipp
include/asio/local/seq_packet_protocol.hpp
include/asio/local/stream_protocol.hpp
include/asio/multiple_exceptions.hpp
include/asio/packaged_task.hpp
@ -554,6 +567,7 @@ include/asio/require_concept.hpp
include/asio/serial_port.hpp
include/asio/serial_port_base.hpp
include/asio/signal_set.hpp
include/asio/signal_set_base.hpp
include/asio/socket_base.hpp
include/asio/spawn.hpp
include/asio/ssl.hpp

View File

@ -19,8 +19,7 @@ PORTDOCS= ChangeLog FAQ TODO
PORTEXAMPLES= cvsync.conf cvsyncd-FreeBSD.conf \
cvsyncd-NetBSD.conf cvsyncd-OpenBSD.conf
MAKE_ENV+= DESTDIR="${STAGEDIR}" \
PTHREAD_LIBS="-lpthread" \
MAKE_ENV= PTHREAD_LIBS="-lpthread" \
INSTALL= \
INSTALL_BIN_OPTS="${INSTALL_PROGRAM}" \
INSTALL_MAN_OPTS="${INSTALL_MAN}"

View File

@ -1,5 +1,5 @@
PORTNAME= ${GH_PROJECT:tl}
PORTVERSION= 3.0.3
PORTVERSION= 3.0.5
DISTVERSIONPREFIX= v
CATEGORIES= net

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1680382911
SHA256 (setvisible-DownZemAll-v3.0.3_GH0.tar.gz) = f9b1ad2d2a43c0e39606085b35d8eeb2fc147afd32cef2d34eb1fc119bcb6a98
SIZE (setvisible-DownZemAll-v3.0.3_GH0.tar.gz) = 42449624
TIMESTAMP = 1683701540
SHA256 (setvisible-DownZemAll-v3.0.5_GH0.tar.gz) = a293392f743d6b4e240f5ee262f13cac377b2741d66009c72b88b4c0b170b99a
SIZE (setvisible-DownZemAll-v3.0.5_GH0.tar.gz) = 42458808

View File

@ -1,7 +1,7 @@
PORTNAME= ecal
DISTVERSIONPREFIX= v
DISTVERSION= 5.11.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net devel
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,5 +1,5 @@
PORTNAME= tcping
PORTVERSION= 1.21.2
PORTVERSION= 1.22.1
DISTVERSIONPREFIX= v
CATEGORIES= net
PKGNAMEPREFIX= go-

View File

@ -1,7 +1,7 @@
TIMESTAMP = 1683615021
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/v1.21.2.mod) = 7341c17b746843a373604aa5f6c16cc171af22f14350f89b45d3d9256a79418e
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/v1.21.2.mod) = 520
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/v1.21.2.zip) = 29bee444ba3e4a90888582633af57a0a55b953a9c7006dd85792b718f8b1854a
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/v1.21.2.zip) = 3676813
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/pouriyajamshidi-tcping-v1.21.2_GH0.tar.gz) = 7280d8b51fec982f8d2874ffce710e40f67f877f175c580a46cfba5749ac6fb7
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.21.2_GH0/pouriyajamshidi-tcping-v1.21.2_GH0.tar.gz) = 3665963
TIMESTAMP = 1684157144
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/v1.22.1.mod) = b5b64f8a29f2aa526a1384d080f001ce07fb8d6f6047b8166e78052a4d518e5b
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/v1.22.1.mod) = 520
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/v1.22.1.zip) = 2949654856c7b7b25ba515a5c4c26da2b7cfef27eb44d6795ec39207b47d8e58
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/v1.22.1.zip) = 4079114
SHA256 (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/pouriyajamshidi-tcping-v1.22.1_GH0.tar.gz) = 2783ea7454694761828eaba2e4cc34314f4269ec2c46e0e52e3aef9940bca141
SIZE (go/net_go-tcping/pouriyajamshidi-tcping-v1.22.1_GH0/pouriyajamshidi-tcping-v1.22.1_GH0.tar.gz) = 4068682

View File

@ -36,6 +36,10 @@ CONFIGURE_ARGS+= --without-python
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
CPPFLAGS+= -Wno-error=int-conversion
.endif
.if !defined(WITH_PYTHON)
pre-everything::
@${ECHO_MSG} "===>"

View File

@ -1,15 +1,18 @@
PORTNAME= jwhois
PORTVERSION= 4.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= GNU
MASTER_SITES= GNU \
https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/j/:srpm
DISTFILES= ${DISTNAME}.tar.gz jwhois-4.0-73.fc38.src.rpm:srpm
MAINTAINER= ports@FreeBSD.org
MAINTAINER= terry-freebsd@glaver.org
COMMENT= Improved WHOIS client capable of selecting server to query
WWW= https://www.gnu.org/software/jwhois/
LICENSE= GPLv3
RUN_DEPENDS= lynx:www/lynx
LIB_DEPENDS= libidn.so:dns/libidn
GNU_CONFIGURE= yes
@ -21,19 +24,28 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/jwhois
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
NLS_CONFIGURE_OFF= --disable-nls --without-libiconv-prefix
NLS_CONFIGURE_OFF= --disable-nls \
--without-libiconv-prefix
INSTALL_TARGET= install-strip
INFO= jwhois
INFO= jwhois
.include <bsd.port.pre.mk>
.if exists(${FILESDIR}/jwhois.conf)
JWHOIS_CONF_SRC=${FILESDIR}/jwhois.conf
.else
JWHOIS_CONF_SRC=${WRKSRC}/example/jwhois.conf
.endif
JWHOIS_CONF_SRC= ${WRKDIR}/jwhois.conf
pre-patch:
.for p in jwhois-4.0-connect.patch jwhois-4.0-ipv6match.patch jwhois-4.0-fclose.patch \
jwhois-4.0-select.patch jwhois-4.0-multi-homed.patch jwhois-4.0-libidn2.patch \
jwhois-4.0-idna.patch jwhois-4.0-idnfail.patch jwhois-4.0-ipv4_ipv6.patch \
jwhois-configure-c99.patch jwhois-c99.patch
(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${p})
.endfor
post-patch:
${REINPLACE_CMD} 's|browser-pathname = "/usr/bin|browser-pathname = "${LOCALBASE}/bin|' \
${WRKDIR}/jwhois.conf
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/var/jwhois

Some files were not shown because too many files have changed in this diff Show More