*/*: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-07-23 08:07:47 +02:00
parent 5496d93d25
commit 9f9dcc6bde
158 changed files with 1904 additions and 1207 deletions

View File

@ -4,7 +4,7 @@ PORTNAME= ncmpcpp
DISTVERSION= 0.8.2
PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://ncmpcpp.rybczak.net/stable/
MASTER_SITES= https://ncmpcpp.rybczak.net/stable/
MAINTAINER= yamagi@yamagi.org
COMMENT= Ncurses mpd client, clone of ncmpc with some new features

View File

@ -18,6 +18,7 @@
SUBDIR += cascade
SUBDIR += chipvault
SUBDIR += cura-engine
SUBDIR += digital
SUBDIR += dinotrace
SUBDIR += dxf2fig
SUBDIR += electric

64
cad/digital/Makefile Normal file
View File

@ -0,0 +1,64 @@
# $FreeBSD$
PORTNAME= digital
DISTVERSIONPREFIX= v
DISTVERSION= 0.22-250
DISTVERSIONSUFFIX= -gebc913a3
CATEGORIES= cad java
MAINTAINER= yuri@FreeBSD.org
COMMENT= Digital logic designer and circuit simulator
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= mvn:devel/maven
USE_JAVA= yes
USE_GITHUB= yes
GH_ACCOUNT= hneemann
GH_PROJECT= Digital
NO_ARCH= yes
# to rebuild the deps archive:
# 1. set DEV_UPDATE_MODE=yes
# 2. make makesum build
# 3. upload the *-deps archive
# 4. set DEV_UPDATE_MODE=no
# 5. make clean makesum
DEV_UPDATE_MODE= no
.if (${DEV_UPDATE_MODE} == "yes")
post-build:
@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} .m2
@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
.else
MASTER_SITES+= LOCAL/yuri/:maven
DISTFILES+= ${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
MVN_ARGS= --offline
.endif
DESKTOP_ENTRIES= "Digital logic designer" "Digital logic designer and circuit simulator" "" "${PORTNAME}" "Electronics;" ""
PLIST_FILES= bin/${PORTNAME} \
${JAVAJARDIR}/Digital.jar
do-build:
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${LOCALBASE}/bin/mvn ${MVN_ARGS} \
-fae install \
-Dmaven.test.skip=true \
-Duser.home=${WRKDIR} \
-P no-git-rev -Dgit.commit.id.describe=${DISTVERSIONFULL} \
package
do-install:
${INSTALL_DATA} ${WRKSRC}/target/Digital.jar ${STAGEDIR}${JAVAJARDIR}
@(echo "#!/bin/sh"; \
echo ""; \
echo "${JAVA} -jar ${JAVAJARDIR}/Digital.jar \""$$"@\"" \
) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.include <bsd.port.mk>

5
cad/digital/distinfo Normal file
View File

@ -0,0 +1,5 @@
TIMESTAMP = 1563814257
SHA256 (digital-0.22-250-deps.tar.gz) = d11bc092d516dc30095a2b007a943c375929859638f0fa104f1fb51628438896
SIZE (digital-0.22-250-deps.tar.gz) = 53749701
SHA256 (hneemann-Digital-v0.22-250-gebc913a3_GH0.tar.gz) = 10a03eae5e4c6175d2aec5b759eb2cb8a1fecd26e683c6c9e04766c25456e22c
SIZE (hneemann-Digital-v0.22-250-gebc913a3_GH0.tar.gz) = 4676883

24
cad/digital/pkg-descr Normal file
View File

@ -0,0 +1,24 @@
Features:
* Visualization of signal states with measurement graphs.
* Single gate mode to analyze oscillations.
* Analysis and synthesis of combinatorial and sequential circuits.
* Simple testing of circuits: You can create test cases and execute them to
verify your design.
* Includes a simple editor for finite state machines (FSM). A FSM can then be
converted to a state transition table and a circuit implementing the FSM.
* Contains a library with the most commonly used 74xx series integrated circuits
* Supports generic circuits. This allows the creation of circuits that can be
parameterized when used. In this way, it is possible, for e.g., to create a
barrel shifter with a selectable bit width.
* Supports large circuits: The "Conway's Game of Life" example consists of about
2400 active components and works just fine.
* It is possible to use custom components which are implemented in Java and
packed in a jar file. See this example for details.
* Simple remote TCP interface which e.g. allows an assembler IDE to control the
simulator.
* Components can be described using VHDL or Verilog. The open source VHDL
simulator ghdl needs to be installed to simulate a VHDL defined component, and
the open source Verilog simulator Icarus Verilog is required to simulate a
Verilog defined component.
WWW: https://github.com/hneemann/Digital

View File

@ -62,7 +62,7 @@ CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \
-DKICAD_SKIP_BOOST=YES \
-DKICAD_SPICE=ON \
-DKICAD_USE_OCE=OFF \

View File

@ -1,2 +1,2 @@
GIT_SRC_HASH= b5c80fe689786ad53a25b7d1f992d894bf75f200
GIT_SRC_DATE= 20190526091203
GIT_SRC_HASH= 1808d8bd400876bdb39ed038f4fafa17cabcf30c
GIT_SRC_DATE= 20190722052111

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1558872235
SHA256 (kicad/KiCad-kicad-source-mirror-r20190526091203-b5c80fe689786ad53a25b7d1f992d894bf75f200_GH0.tar.gz) = bbb1379827d4c1d172703f9886b0782f30259830878f45c7e8f9df3aefa54a4f
SIZE (kicad/KiCad-kicad-source-mirror-r20190526091203-b5c80fe689786ad53a25b7d1f992d894bf75f200_GH0.tar.gz) = 23813867
TIMESTAMP = 1563796016
SHA256 (kicad/KiCad-kicad-source-mirror-r20190722052111-1808d8bd400876bdb39ed038f4fafa17cabcf30c_GH0.tar.gz) = 1f7f56fdaf77a63662e66412f1f261ae0d466ce0cb15cf743d53659c22eaafd4
SIZE (kicad/KiCad-kicad-source-mirror-r20190722052111-1808d8bd400876bdb39ed038f4fafa17cabcf30c_GH0.tar.gz) = 23618822

View File

@ -1,33 +1,36 @@
# $FreeBSD$
PORTNAME= direwolf
PORTVERSION= 1.4
PORTREVISION= 1
DISTVERSION= 1.5
CATEGORIES= comms hamradio
MAINTAINER= kevans@FreeBSD.org
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Software "soundcard" modem/TNC and APRS encoder/decoder
LICENSE= GPLv2
LIB_DEPENDS= libhamlib.so:comms/hamlib \
LIB_DEPENDS= libasound.so:audio/alsa-lib\
libhamlib.so:comms/hamlib \
libgps.so:astro/gpsd
USES= gmake python shebangfix
USE_GITHUB= yes
GH_ACCOUNT= wb2osz
GH_TAGNAME= 6207e2e
USES= dos2unix gmake python shebangfix
GH_TAGNAME= 1.5
SHEBANG_FILES= telemetry-toolkit/telem-bits.pl telemetry-toolkit/telem-parm.pl\
telemetry-toolkit/telem-eqns.pl dwespeak.sh \
telemetry-toolkit/telem-volts.py telemetry-toolkit/telem-data.pl \
telemetry-toolkit/telem-data91.pl \
telemetry-toolkit/telem-unit.pl telemetry-toolkit/telem-balloon.pl
telemetry-toolkit/telem-unit.pl telemetry-toolkit/telem-balloon.pl\
dw-start.sh
OPTIONS_DEFINE= DOCS
OPTIONS_DEFINE= DOCS EXAMPLES
MAKEFILE= Makefile.linux
post-patch:
${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC}
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/dw-start.sh
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'\
-e 's|/var/tmp|/var/log|' ${WRKSRC}/dw-start.sh
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1494361181
SHA256 (wb2osz-direwolf-1.4-6207e2e_GH0.tar.gz) = d3a42b5207935e38bfa4902a76daf684269f9cb71bcc271d80508293e40ac6a9
SIZE (wb2osz-direwolf-1.4-6207e2e_GH0.tar.gz) = 13849018
TIMESTAMP = 1549716498
SHA256 (wb2osz-direwolf-1.5_GH0.tar.gz) = 2e263ea4fa75c342b620dee048436ac95486ea3f93599ad818e74dfd4aec8b48
SIZE (wb2osz-direwolf-1.5_GH0.tar.gz) = 17996557

View File

@ -1,549 +0,0 @@
#
# Makefile for FreeBSD version of Dire Wolf.
#
APPS := direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc
all : $(APPS) direwolf.desktop direwolf.conf
@echo " "
@echo "Next step - install with:"
@echo " "
@echo " sudo make install"
@echo " "
CFLAGS += -I${LOCALBASE}/include
CFLAGS += -pthread -Igeotranz
LDFLAGS := -lm -lpthread -L${LOCALBASE}/lib
#CFLAGS += -mfpu=neon
#CFLAGS += -DUSE_ALSA
#LDFLAGS += -lasound
enable_gpsd := $(wildcard /usr/local/include/gps.h)
ifneq ($(enable_gpsd),)
CFLAGS += -DENABLE_GPSD
LDFLAGS += -lgps
endif
# Uncomment following lines to enable hamlib support.
CFLAGS += -DUSE_HAMLIB
LDFLAGS += -lhamlib
# Name of current directory.
# Used to generate zip file name for distribution.
z := $(notdir ${CURDIR})
# -------------------------------- Main application -----------------------------------------
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_9600.o hdlc_rec.o \
hdlc_rec2.o multi_modem.o redecode.o rdq.o rrbb.o dlq.o \
fcs_calc.o ax25_pad.o \
decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
gen_tone.o audio.o audio_stats.o digipeater.o pfilter.o dedupe.o tq.o xmit.o morse.o \
ptt.o beacon.o encode_aprs.o latlong.o encode_aprs.o latlong.o textcolor.o \
dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o nmea.o serial_port.o log.o telemetry.o \
dwgps.o dwgpsnmea.o dwgpsd.o dtime_now.o \
geotranz.a
$(CC) -o $@ $^ $(LDFLAGS)
ifneq ($(enable_gpsd),)
@echo " "
@echo "This includes support for gpsd."
else
@echo " "
@echo "This does NOT include support for gpsd."
endif
# Optimization for slow processors.
demod.o : fsk_fast_filter.h
demod_afsk.o : fsk_fast_filter.h
fsk_fast_filter.h : demod_afsk.c
$(CC) $(CFLAGS) -o gen_fff -DGEN_FFF demod_afsk.c dsp.c textcolor.c $(LDFLAGS)
./gen_fff > fsk_fast_filter.h
# Separate application to decode raw data.
decode_aprs : decode_aprs.c dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o symbols.o ax25_pad.o textcolor.o fcs_calc.o latlong.o log.o telemetry.o tt_text.o
$(CC) $(CFLAGS) -DDECAMAIN -o $@ $^ $(LDFLAGS)
# Convert between text and touch tone representation.
text2tt : tt_text.c
$(CC) $(CFLAGS) -DENC_MAIN -o $@ $^ $(LDFLAGS)
tt2text : tt_text.c
$(CC) $(CFLAGS) -DDEC_MAIN -o $@ $^ $(LDFLAGS)
# Convert between Latitude/Longitude and UTM coordinates.
ll2utm : ll2utm.c geotranz.a textcolor.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
utm2ll : utm2ll.c geotranz.a textcolor.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
# Convert from log file to GPX.
log2gpx : log2gpx.c textcolor.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
# Test application to generate sound.
gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c textcolor.c dsp.c
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
# Unit test for AFSK demodulator
atest : atest.c demod.o demod_afsk.o demod_9600.o \
dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
fcs_calc.o ax25_pad.o decode_aprs.o dwgpsnmea.o \
dwgps.o dwgpsd.o serial_port.o telemetry.o latlong.o symbols.o tt_text.o textcolor.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
# Multiple AGWPE network or serial port clients to test TNCs side by side.
aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o
$(CC) $(CFLAGS) -g -o $@ $^
# Touch Tone to Speech sample application.
ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o
$(CC) $(CFLAGS) -g -o $@ $^
# ----------------------------------------- Libraries --------------------------------------------
# UTM, USNG, MGRS conversions.
geotranz.a : error_string.o mgrs.o polarst.o tranmerc.o ups.o usng.o utm.o
ar -cr $@ $^
error_string.o : geotranz/error_string.c
$(CC) $(CFLAGS) -c -o $@ $^
mgrs.o : geotranz/mgrs.c
$(CC) $(CFLAGS) -c -o $@ $^
polarst.o : geotranz/polarst.c
$(CC) $(CFLAGS) -c -o $@ $^
tranmerc.o : geotranz/tranmerc.c
$(CC) $(CFLAGS) -c -o $@ $^
ups.o : geotranz/ups.c
$(CC) $(CFLAGS) -c -o $@ $^
usng.o : geotranz/usng.c
$(CC) $(CFLAGS) -c -o $@ $^
utm.o : geotranz/utm.c
$(CC) $(CFLAGS) -c -o $@ $^
# ------------------------------------- Installation ----------------------------------
# Generate apprpriate sample configuration file for this platform.
# Originally, there was one sample for all platforms. It got too cluttered
# and confusing saying, this is for windows, and this is for Linux, and this ...
# Trying to maintain 3 different versions in parallel is error prone.
# We now have a single generic version which can be used to generate
# the various platform specific versions.
# generic.conf should be checked into source control.
# direwolf.conf should NOT. It is generated when compiling on the target platform.
direwolf.conf : generic.conf
egrep '^C|^L' generic.conf | cut -c2-999 > direwolf.conf
# Where should we install it?
# My understanding, of the convention, is that something you compile
# from source, that is not a standard part of the operating system,
# should go in /usr/local/bin.
# However, if you are preparing a "binary" DEB or RPM package, the
# installation location should be /usr/bin.
# This is a step in the right direction but not sufficient to use /usr instead.
# Eventually I'd like to have targets here to build the .DEB and .RPM packages.
INSTALLDIR := ${DESTDIR}${PREFIX}
SHAREDIR := ${INSTALLDIR}/share
# Command to "install" to system directories. Use "ginstall" for Mac.
INSTALL=install
# direwolf.desktop was previously handcrafted for the Raspberry Pi.
# It was hardcoded with lxterminal, /home/pi, and so on.
# In version 1.2, try to customize this to match other situations better.
# TODO: Test this better.
direwolf.desktop :
@echo "Generating customized direwolf.desktop ..."
@echo '[Desktop Entry]' > $@
@echo 'Type=Application' >> $@
ifneq ($(wildcard /usr/bin/lxterminal),)
@echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(PREFIX)/bin/direwolf\"" >> $@
else ifneq ($(wildcard /usr/local/bin/lxterm),)
@echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(PREFIX)/bin/direwolf\"" >> $@
else
@echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(PREFIX)/bin/direwolf\"" >> $@
endif
@echo 'Name=Dire Wolf' >> $@
@echo 'Comment=APRS Soundcard TNC' >> $@
@echo 'Icon=${PREFIX}/share/direwolf/dw-icon.png' >> $@
@echo "Path=$(HOME)" >> $@
@echo '#Terminal=true' >> $@
@echo 'Categories=HamRadio' >> $@
@echo 'Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25' >> $@
# Installation into /usr/local/...
# Needs to be run as root or with sudo.
.PHONY: install
install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
#
# Applications, not installed with package manager, normally go in /usr/local/bin.
# /usr/bin is used instead when installing from .DEB or .RPM package.
#
$(BSD_INSTALL_PROGRAM) direwolf $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) decode_aprs $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) text2tt $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) tt2text $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) ll2utm $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) utm2ll $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) aclients $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) log2gpx $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) gen_packets $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) atest $(INSTALLDIR)/bin
$(BSD_INSTALL_PROGRAM) ttcalc $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) dwespeak.sh $(INSTALLDIR)/bin
#
# Telemetry Toolkit executables. Other .conf and .txt files will go into doc directory.
#
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin
$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin
#
# Misc. data such as "tocall" to system mapping.
#
mkdir -p ${SHAREDIR}/direwolf
$(BSD_INSTALL_DATA) tocalls.txt ${SHAREDIR}/direwolf/tocalls.txt
$(BSD_INSTALL_DATA) symbols-new.txt ${SHAREDIR}/direwolf/symbols-new.txt
$(BSD_INSTALL_DATA) symbolsX.txt ${SHAREDIR}/direwolf/symbolsX.txt
$(BSD_INSTALL_DATA) dw-icon.png ${SHAREDIR}/direwolf/dw-icon.png
mkdir -p ${SHAREDIR}/applications
$(BSD_INSTALL_DATA) direwolf.desktop ${SHAREDIR}/applications/direwolf.desktop
#
# Documentation. Various plain text files and PDF.
# $(INSTALL) CHANGES.md $(INSTALLDIR)/share/doc/direwolf/CHANGES.md
mkdir -p ${INSTALLDIR}/share/doc/direwolf
mkdir -p ${INSTALLDIR}/share/direwolf
$(BSD_INSTALL_DATA) LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
$(BSD_INSTALL_DATA) LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
#
# ./README.md is an overview for the project main page.
# doc/README.md contains an overview of the PDF file contents and is more useful here.
#
$(BSD_INSTALL_DATA) doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
$(BSD_INSTALL_DATA) doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
$(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
$(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
$(BSD_INSTALL_DATA) doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
$(BSD_INSTALL_DATA) doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
$(BSD_INSTALL_DATA) doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
$(BSD_INSTALL_DATA) doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
$(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
$(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
#
# Various sample config and other files go into examples under the doc directory.
# When building from source, these can be put in home directory with "make install-conf".
# When installed from .DEB or .RPM package, the user will need to copy these to
# the home directory or other desired location.
#
mkdir -p ${INSTALLDIR}/share/doc/direwolf/examples
$(BSD_INSTALL_DATA) direwolf.conf $(INSTALLDIR)/share/doc/direwolf/examples/direwolf.conf
$(BSD_INSTALL_DATA) dw-start.sh $(INSTALLDIR)/share/doc/direwolf/examples/dw-start.sh
$(BSD_INSTALL_DATA) sdr.conf $(INSTALLDIR)/share/doc/direwolf/examples/sdr.conf
$(BSD_INSTALL_DATA) telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
$(BSD_INSTALL_DATA) telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-balloon.conf
$(BSD_INSTALL_DATA) telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-volts.conf
#
# "man" pages
#
$(BSD_INSTALL_MAN) man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1
$(BSD_INSTALL_MAN) man1/atest.1 $(INSTALLDIR)/man/man1/atest.1
$(BSD_INSTALL_MAN) man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1
$(BSD_INSTALL_MAN) man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1
$(BSD_INSTALL_MAN) man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1
$(BSD_INSTALL_MAN) man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1
$(BSD_INSTALL_MAN) man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1
$(BSD_INSTALL_MAN) man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1
$(BSD_INSTALL_MAN) man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1
$(BSD_INSTALL_MAN) man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1
#
@echo " "
@echo "If this is your first install, not an upgrade, type this to put a copy"
@echo "of the sample configuration file (direwolf.conf) in your home directory:"
@echo " "
@echo " make install-conf"
@echo " "
# These would be done as ordinary user.
# The Raspberry Pi has ~/Desktop but Ubuntu does not.
# TODO: Handle Linux variations correctly.
.PHONY: install-conf
install-conf : direwolf.conf
cp direwolf.conf ~
cp sdr.conf ~
cp telemetry-toolkit/telem-m0xer-3.txt ~
cp telemetry-toolkit/telem-*.conf ~
ifneq ($(wildcard $(HOME)/Desktop),)
@echo " "
@echo "This will add a desktop icon on some systems:"
@echo " "
@echo " make install-rpi"
@echo " "
endif
.PHONY: install-rpi
install-rpi : dw-start.sh
cp dw-start.sh ~
ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
# ---------------------------------- Automated Smoke Test --------------------------------
# Combine some unit tests into a single regression sanity check.
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest check-modem1200 check-modem300 check-modem9600
# Can we encode and decode at popular data rates?
check-modem1200 : gen_packets atest
./gen_packets -n 100 -o /tmp/test1.wav
./atest -F0 -PE -L70 -G71 /tmp/test1.wav
./atest -F1 -PE -L73 -G75 /tmp/test1.wav
#rm /tmp/test1.wav
check-modem300 : gen_packets atest
./gen_packets -B300 -n 100 -o /tmp/test3.wav
./atest -B300 -F0 -L68 -G69 /tmp/test3.wav
./atest -B300 -F1 -L73 -G75 /tmp/test3.wav
rm /tmp/test3.wav
check-modem9600 : gen_packets atest
./gen_packets -B9600 -n 100 -o /tmp/test9.wav
./atest -B9600 -F0 -L57 -G59 /tmp/test9.wav
./atest -B9600 -F1 -L66 -G67 /tmp/test9.wav
rm /tmp/test9.wav
# Unit test for inner digipeater algorithm
.PHONY : dtest
dtest : digipeater.c dedupe.c \
pfilter.o ax25_pad.o fcs_calc.o tq.o textcolor.o \
decode_aprs.o dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o latlong.o telemetry.o symbols.o tt_text.o
$(CC) $(CFLAGS) -DDIGITEST -o $@ $^ $(LDFLAGS)
./dtest
rm dtest
# Unit test for APRStt tone sequence parsing.
.PHONY : ttest
ttest : aprs_tt.c tt_text.c latlong.o textcolor.o geotranz.a
$(CC) $(CFLAGS) -DTT_MAIN -o $@ $^ $(LDFLAGS)
./ttest
rm ttest
# Unit test for APRStt tone sequence / text conversions.
.PHONY: tttexttest
tttexttest : tt_text.c textcolor.o
$(CC) $(CFLAGS) -DTTT_TEST -o $@ $^ $(LDFLAGS)
./tttexttest
rm tttexttest
# Unit test for Packet Filtering.
.PHONY: pftest
pftest : pfilter.c ax25_pad.o textcolor.o fcs_calc.o decode_aprs.o dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o latlong.o symbols.o telemetry.o tt_text.o
$(CC) $(CFLAGS) -DPFTEST -o $@ $^ $(LDFLAGS)
./pftest
rm pftest
# Unit test for telemetry decoding.
.PHONY: tlmtest
tlmtest : telemetry.c ax25_pad.o fcs_calc.o textcolor.o
$(CC) $(CFLAGS) -DTEST -o $@ $^ $(LDFLAGS)
./tlmtest
rm tlmtest
# Unit test for location coordinate conversion.
.PHONY: lltest
lltest : latlong.c textcolor.o
$(CC) $(CFLAGS) -DLLTEST -o $@ $^ $(LDFLAGS)
./lltest
rm lltest
# Unit test for encoding position & object report.
.PHONY: enctest
enctest : encode_aprs.c latlong.c textcolor.c
$(CC) $(CFLAGS) -DEN_MAIN -o $@ $^ $(LDFLAGS)
./enctest
rm enctest
# Unit test for KISS encapsulation.
.PHONY: kisstest
kisstest : kiss_frame.c
$(CC) $(CFLAGS) -DKISSTEST -o $@ $^ $(LDFLAGS)
./kisstest
rm kisstest
# ----------------------------- Manual tests and experiments ---------------------------
# These are not included in a normal build. Might be broken.
# Unit test for IGate
itest : igate.c textcolor.c ax25_pad.c fcs_calc.c textcolor.o
$(CC) $(CFLAGS) -DITEST -o $@ $^
./itest
# Unit test for UDP reception with AFSK demodulator.
# Temporary during development. Might not be useful anymore.
udptest : udp_test.c demod.o dsp.o demod_afsk.o demod_9600.o hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
fcs_calc.o ax25_pad.o decode_aprs.o symbols.o textcolor.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
./udptest
# For demodulator tweaking experiments.
# Dependencies of demod*.c, rather than .o, are intentional.
demod.o : tune.h
demod_afsk.o : tune.h
demod_9600.o : tune.h
testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
fcs_calc.o ax25_pad.o decode_aprs.o telemetry.o latlong.o symbols.o tune.h textcolor.o
$(CC) $(CFLAGS) -o atest $^ $(LDFLAGS)
./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
# ------------------------------- Source distribution ---------------------------------
# probably obsolete and can be removed after move to github.
.PHONY: dist-src
dist-src : README.md CHANGES.md
doc/User-Guide.pdf doc/Raspberry-Pi-APRS.pdf \
doc/Raspberry-Pi-APRS-Tracker.pdf doc/APRStt-Implementation-Notes.pdf \
dw-start.sh dwespeak.bat dwespeak.sh \
tocalls.txt symbols-new.txt symbolsX.txt direwolf.spec
rm -f fsk_fast_filter.h
echo " " > tune.h
rm -f ../$z-src.zip
(cd .. ; zip $z-src.zip \
$z/README.md \
$z/CHANGES.md \
$z/LICENSE* \
$z/doc/User-Guide.pdf \
$z/doc/Raspberry-Pi-APRS.pdf \
$z/doc/Raspberry-Pi-APRS-Tracker.pdf \
$z/doc/APRStt-Implementation-Notes.pdf \
$z/doc/APRS-Telemetry-Toolkit.pdf \
$z/Makefile* \
$z/*.c $z/*.h \
$z/regex/* $z/misc/* $z/geotranz/* \
$z/man1/* \
$z/generic.conf \
$z/tocalls.txt $z/symbols-new.txt $z/symbolsX.txt \
$z/dw-icon.png $z/dw-icon.rc $z/dw-icon.ico \
$z/dw-start.sh $z/direwolf.spec \
$z/dwespeak.bat $z/dwespeak.sh \
$z/telemetry-toolkit/* )
# -----------------------------------------------------------------------------------------
.PHONY: clean
clean :
rm -f $(APPS) fsk_fast_filter.h *.o *.a direwolf.desktop
echo " " > tune.h
depend : $(wildcard *.c)
makedepend -f $(lastword $(MAKEFILE_LIST)) -- $(CFLAGS) -- $^
#
# The following is updated by "make depend"
#
# DO NOT DELETE

View File

@ -1,17 +0,0 @@
--- Makefile.orig 2017-01-20 00:11:49 UTC
+++ Makefile
@@ -6,11 +6,14 @@
win := $(shell uname | grep CYGWIN)
dar := $(shell uname | grep Darwin)
+free := $(shell uname | grep FreeBSD)
ifneq ($(win),)
include Makefile.win
else ifeq ($(dar),Darwin)
include Makefile.macosx
+else ifeq ($(free),FreeBSD)
+ include Makefile.FreeBSD
else
include Makefile.linux
endif

View File

@ -0,0 +1,409 @@
--- Makefile.linux.orig 2018-10-08 14:15:21 UTC
+++ Makefile.linux
@@ -1,5 +1,5 @@
#
-# Makefile for Linux version of Dire Wolf.
+# Makefile for FreeBSD version of Dire Wolf.
#
@@ -13,7 +13,7 @@ all : $(APPS) direwolf.desktop direwolf
@echo " sudo make install"
@echo " "
-CC := gcc
+#CC := clang
# Just for fun, let's see how clang compares to gcc. First install like this:
# sudo apt-get update
@@ -32,14 +32,14 @@ CC := gcc
# we will inherit options already set in build environment.
# Explanation - https://github.com/wb2osz/direwolf/pull/38
-CFLAGS += -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 -Wall
+CFLAGS += -O3 -I${LOCALBASE}/include -pthread -Igeotranz -D_DEFAULT_SOURCE=1 -Wall
# That was fine for a recent Ubuntu and Raspbian Jessie.
# However, Raspbian wheezy was then missing declaration for strsep and definition of fd_set.
CFLAGS += -D_BSD_SOURCE
-LDFLAGS += -lm -lpthread -lrt
+LDFLAGS += -lm -lpthread -lrt -L${LOCALBASE}/lib
@@ -95,7 +95,7 @@ LDFLAGS += -lm -lpthread -lrt
# If the compiler is generating code for the i386 target, we can
# get much better results by telling it we have at least a Pentium 3.
-arch := $(shell echo | gcc -E -dM - | grep __i386__)
+arch := $(shell echo | ${CC} -E -dM - | grep __i386__)
ifneq ($(arch),)
CFLAGS += -march=pentium3
endif
@@ -152,7 +152,7 @@ endif
#
-useffast := $(shell gcc --help -v 2>/dev/null | grep ffast-math)
+useffast := $(shell ${CC} --help -v 2>/dev/null | grep ffast-math)
ifneq ($(useffast),)
CFLAGS += -ffast-math
endif
@@ -215,7 +215,7 @@ endif
# and the compiler target defaults.
#
-neon := $(shell cat /proc/cpuinfo | grep neon)
+#neon := $(shell cat /proc/cpuinfo | grep neon)
ifneq ($(neon),)
CFLAGS += -mfpu=neon
endif
@@ -257,7 +257,7 @@ endif
# ALSA (for Linux), comment out (or remove) the line below.
# TODO: Can we automate this somehow?
-alsa = 1
+#alsa = 1
ifeq ($(wildcard /usr/include/pthread.h),)
$(error /usr/include/pthread.h does not exist. Install it with "sudo apt-get install libc6-dev" or "sudo yum install glibc-headers" )
@@ -266,8 +266,8 @@ endif
ifneq ($(alsa),)
CFLAGS += -DUSE_ALSA
LDFLAGS += -lasound
-ifeq ($(wildcard /usr/include/alsa/asoundlib.h),)
-$(error /usr/include/alsa/asoundlib.h does not exist. Install it with "sudo apt-get install libasound2-dev" or "sudo yum install alsa-lib-devel" )
+ifeq ($(wildcard ${LOCALBASE}/include/alsa/asoundlib.h),)
+$(error ${LOCALBASE}/include/alsa/asoundlib.h does not exist. Install it with "sudo apt-get install libasound2-dev" or "sudo yum install alsa-lib-devel" )
endif
endif
@@ -276,20 +276,20 @@ endif
# Finding libgps.so* is more difficult because it
# is in different places on different operating systems.
-enable_gpsd := $(wildcard /usr/include/gps.h)
-ifneq ($(enable_gpsd),)
+#enable_gpsd := $(wildcard ${LOCALBASE}/include/gps.h)
+#ifneq ($(enable_gpsd),)
CFLAGS += -DENABLE_GPSD
LDFLAGS += -lgps
-endif
+#endif
# Enable hamlib support if header file is present.
-enable_hamlib := $(wildcard /usr/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
-ifneq ($(enable_hamlib),)
+#enable_hamlib := $(wildcard ${LOCALBASE}/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
+#ifneq ($(enable_hamlib),)
CFLAGS += -DUSE_HAMLIB
LDFLAGS += -lhamlib
-endif
+#endif
# Should enabling of this feature be strongly encouraged or
@@ -297,18 +297,18 @@ endif
# If, for some reason, can obtain the libudev-dev package, or
# don't want to install it, comment out the next 3 lines.
-#ifeq ($(wildcard /usr/include/libudev.h),)
-#$(error /usr/include/libudev.h does not exist. Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
+#ifeq ($(wildcard ${LOCALBASE}/include/libudev.h),)
+#$(error ${LOCALBASE}/include/libudev.h does not exist. Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
#endif
# Enable cm108 PTT support if libudev header file is present.
-enable_cm108 := $(wildcard /usr/include/libudev.h)
-ifneq ($(enable_cm108),)
-CFLAGS += -DUSE_CM108
-LDFLAGS += -ludev
-endif
+#enable_cm108 := $(wildcard ${LOCALBASE}/include/libudev.h)
+#ifneq ($(enable_cm108),)
+#CFLAGS += -DUSE_CM108
+#LDFLAGS += -ludev
+#endif
# Name of current directory.
@@ -333,20 +333,20 @@ direwolf : direwolf.o config.o recv.o de
misc.a geotranz.a
$(CC) -o $@ $^ $(LDFLAGS)
@echo " "
-ifneq ($(enable_gpsd),)
- @echo "\t>\tThis includes support for gpsd."
-else
- @echo "\t>\tThis does NOT include support for gpsd."
-endif
-ifneq ($(enable_hamlib),)
- @echo "\t>\tThis includes support for hamlib."
-else
- @echo "\t>\tThis does NOT include support for hamlib."
-endif
+#ifneq ($(enable_gpsd),)
+ @echo " > This includes support for gpsd."
+#else
+# @echo "\t>\tThis does NOT include support for gpsd."
+#endif
+#ifneq ($(enable_hamlib),)
+ @echo " > This includes support for hamlib."
+#else
+# @echo "\t>\tThis does NOT include support for hamlib."
+#endif
ifneq ($(enable_cm108),)
- @echo "\t>\tThis includes support for CM108/CM119 PTT."
+ @echo " > This includes support for CM108/CM119 PTT."
else
- @echo "\t>\tThis does NOT include support for CM108/CM119 PTT."
+ @echo " > This does NOT include support for CM108/CM119 PTT."
endif
@echo " "
@@ -535,12 +535,17 @@ direwolf.conf : generic.conf
# Something built from source and installed locally would normally go in /usr/local/...
# If not specified on the make command line, this is our default.
-DESTDIR ?= /usr/local
+INSTALLDIR ?= ${PREFIX}
+SHAREDIR ?= ${INSTALLDIR}/share
+DATADIR ?= ${SHAREDIR}/direwolf
+DOCSDIR ?= ${SHAREDIR}/doc/direwolf
+EXAMPLESDIR ?= ${SHAREDIR}/examples/direwolf
+MANDIR ?= ${INSTALLDIR}/man
# However, if you are preparing a "binary" DEB or RPM package, the installation location
# would normally be /usr/... instead. In this case, use a command line like this:
#
-# make DESTDIR=/usr install
+# make INSTALLDIR=/usr install
@@ -560,22 +565,22 @@ direwolf.desktop :
@echo '[Desktop Entry]' > $@
@echo 'Type=Application' >> $@
ifneq ($(wildcard /usr/bin/lxterminal),)
- @echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+ @echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
else ifneq ($(wildcard /usr/bin/lxterm),)
- @echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+ @echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
else
- @echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+ @echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
endif
@echo 'Name=Dire Wolf' >> $@
@echo 'Comment=APRS Soundcard TNC' >> $@
- @echo 'Icon=$(DESTDIR)/share/direwolf/pixmaps/dw-icon.png' >> $@
- @echo "Path=$(HOME)" >> $@
+ @echo 'Icon=$(DATADIR)/pixmaps/dw-icon.png' >> $@
+# @echo "Path=$(HOME)" >> $@
@echo '#Terminal=true' >> $@
@echo 'Categories=HamRadio' >> $@
@echo 'Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25' >> $@
-# Installation into $(DESTDIR), usually /usr/local/... or /usr/...
+# Installation into $(DESTDIR)$(INSTALLDIR), usually /usr/local/... or /usr/...
# Needs to be run as root or with sudo.
@@ -585,102 +590,107 @@ install : $(APPS) direwolf.conf tocalls.
# Applications, not installed with package manager, normally go in /usr/local/bin.
# /usr/bin is used instead when installing from .DEB or .RPM package.
#
- $(INSTALL) -D --mode=755 direwolf $(DESTDIR)/bin/direwolf
- $(INSTALL) -D --mode=755 decode_aprs $(DESTDIR)/bin/decode_aprs
- $(INSTALL) -D --mode=755 text2tt $(DESTDIR)/bin/text2tt
- $(INSTALL) -D --mode=755 tt2text $(DESTDIR)/bin/tt2text
- $(INSTALL) -D --mode=755 ll2utm $(DESTDIR)/bin/ll2utm
- $(INSTALL) -D --mode=755 utm2ll $(DESTDIR)/bin/utm2ll
- $(INSTALL) -D --mode=755 aclients $(DESTDIR)/bin/aclients
- $(INSTALL) -D --mode=755 log2gpx $(DESTDIR)/bin/log2gpx
- $(INSTALL) -D --mode=755 gen_packets $(DESTDIR)/bin/gen_packets
- $(INSTALL) -D --mode=755 atest $(DESTDIR)/bin/atest
- $(INSTALL) -D --mode=755 ttcalc $(DESTDIR)/bin/ttcalc
- $(INSTALL) -D --mode=755 kissutil $(DESTDIR)/bin/kissutil
- $(INSTALL) -D --mode=755 cm108 $(DESTDIR)/bin/cm108
- $(INSTALL) -D --mode=755 dwespeak.sh $(DESTDIR)/bin/dwspeak.sh
+ $(BSD_INSTALL_PROGRAM) direwolf $(DESTDIR)$(INSTALLDIR)/bin/direwolf
+ $(BSD_INSTALL_PROGRAM) decode_aprs $(DESTDIR)$(INSTALLDIR)/bin/decode_aprs
+ $(BSD_INSTALL_PROGRAM) text2tt $(DESTDIR)$(INSTALLDIR)/bin/text2tt
+ $(BSD_INSTALL_PROGRAM) tt2text $(DESTDIR)$(INSTALLDIR)/bin/tt2text
+ $(BSD_INSTALL_PROGRAM) ll2utm $(DESTDIR)$(INSTALLDIR)/bin/ll2utm
+ $(BSD_INSTALL_PROGRAM) utm2ll $(DESTDIR)$(INSTALLDIR)/bin/utm2ll
+ $(BSD_INSTALL_PROGRAM) aclients $(DESTDIR)$(INSTALLDIR)/bin/aclients
+ $(BSD_INSTALL_PROGRAM) log2gpx $(DESTDIR)$(INSTALLDIR)/bin/log2gpx
+ $(BSD_INSTALL_PROGRAM) gen_packets $(DESTDIR)$(INSTALLDIR)/bin/gen_packets
+ $(BSD_INSTALL_PROGRAM) atest $(DESTDIR)$(INSTALLDIR)/bin/atest
+ $(BSD_INSTALL_PROGRAM) ttcalc $(DESTDIR)$(INSTALLDIR)/bin/ttcalc
+ $(BSD_INSTALL_PROGRAM) kissutil $(DESTDIR)$(INSTALLDIR)/bin/kissutil
+ $(BSD_INSTALL_PROGRAM) cm108 $(DESTDIR)$(INSTALLDIR)/bin/cm108
+ $(BSD_INSTALL_SCRIPT) dwespeak.sh $(DESTDIR)$(INSTALLDIR)/bin/dwspeak.sh
#
# Telemetry Toolkit executables. Other .conf and .txt files will go into doc directory.
#
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(DESTDIR)/bin/telem-balloon.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(DESTDIR)/bin/telem-bits.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(DESTDIR)/bin/telem-data.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(DESTDIR)/bin/telem-data91.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(DESTDIR)/bin/telem-eqns.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(DESTDIR)/bin/telem-parm.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(DESTDIR)/bin/telem-seq.sh
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(DESTDIR)/bin/telem-unit.pl
- $(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(DESTDIR)/bin/telem-volts.py
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-balloon.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-balloon.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-bits.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-bits.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-data.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data91.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-data91.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-eqns.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-eqns.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-parm.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-parm.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-seq.sh $(DESTDIR)$(INSTALLDIR)/bin/telem-seq.sh
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-unit.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-unit.pl
+ $(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-volts.py $(DESTDIR)$(INSTALLDIR)/bin/telem-volts.py
#
# Misc. data such as "tocall" to system mapping.
#
- $(INSTALL) -D --mode=644 tocalls.txt $(DESTDIR)/share/direwolf/tocalls.txt
- $(INSTALL) -D --mode=644 symbols-new.txt $(DESTDIR)/share/direwolf/symbols-new.txt
- $(INSTALL) -D --mode=644 symbolsX.txt $(DESTDIR)/share/direwolf/symbolsX.txt
+ mkdir -p $(DESTDIR)${DATADIR}
+ $(BSD_INSTALL_DATA) tocalls.txt $(DESTDIR)$(DATADIR)/tocalls.txt
+ $(BSD_INSTALL_DATA) symbols-new.txt $(DESTDIR)$(DATADIR)/symbols-new.txt
+ $(BSD_INSTALL_DATA) symbolsX.txt $(DESTDIR)$(DATADIR)/symbolsX.txt
#
# For desktop icon.
#
- $(INSTALL) -D --mode=644 dw-icon.png $(DESTDIR)/share/direwolf/pixmaps/dw-icon.png
- $(INSTALL) -D --mode=644 direwolf.desktop $(DESTDIR)/share/applications/direwolf.desktop
+ mkdir -p $(DESTDIR)${DATADIR}/pixmaps
+ mkdir -p $(DESTDIR)${SHAREDIR}/applications
+ $(BSD_INSTALL_DATA) dw-icon.png $(DESTDIR)$(DATADIR)/pixmaps/dw-icon.png
+ $(BSD_INSTALL_DATA) direwolf.desktop $(DESTDIR)$(SHAREDIR)/applications/direwolf.desktop
#
# Documentation. Various plain text files and PDF.
#
- $(INSTALL) -D --mode=644 CHANGES.md $(DESTDIR)/share/doc/direwolf/CHANGES.md
- $(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
- $(INSTALL) -D --mode=644 LICENSE-other.txt $(DESTDIR)/share/doc/direwolf/LICENSE-other.txt
+ $(BSD_INSTALL_DATA) CHANGES.md $(DESTDIR)$(DATADIR)/CHANGES.md
+ $(BSD_INSTALL_DATA) LICENSE-dire-wolf.txt $(DESTDIR)$(DATADIR)/LICENSE-dire-wolf.txt
+ $(BSD_INSTALL_DATA) LICENSE-other.txt $(DESTDIR)$(DATADIR)/LICENSE-other.txt
#
# ./README.md is an overview for the project main page.
# Maybe we could stick it in some other place.
# doc/README.md contains an overview of the PDF file contents and is more useful here.
#
- $(INSTALL) -D --mode=644 doc/README.md $(DESTDIR)/share/doc/direwolf/README.md
- $(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
- $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
- $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
- $(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
- $(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
- $(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
- $(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
- $(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
- $(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
- $(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
- $(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
- $(INSTALL) -D --mode=644 doc/User-Guide.pdf $(DESTDIR)/share/doc/direwolf/User-Guide.pdf
- $(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
+ mkdir -p $(DESTDIR)${DOCSDIR}
+ $(BSD_INSTALL_DATA) doc/README.md $(DESTDIR)$(DOCSDIR)/README.md
+ $(BSD_INSTALL_DATA) doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)$(DOCSDIR)/2400-4800-PSK-for-APRS-Packet-Radio.pdf
+ $(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)$(DOCSDIR)/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
+ $(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)$(DOCSDIR)/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
+ $(BSD_INSTALL_DATA) doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)$(DOCSDIR)/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
+ $(BSD_INSTALL_DATA) doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)$(DOCSDIR)/APRS-Telemetry-Toolkit.pdf
+ $(BSD_INSTALL_DATA) doc/APRStt-Implementation-Notes.pdf $(DESTDIR)$(DOCSDIR)/APRStt-Implementation-Notes.pdf
+ $(BSD_INSTALL_DATA) doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)$(DOCSDIR)/APRStt-interface-for-SARTrack.pdf
+ $(BSD_INSTALL_DATA) doc/APRStt-Listening-Example.pdf $(DESTDIR)$(DOCSDIR)/APRStt-Listening-Example.pdf
+ $(BSD_INSTALL_DATA) doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)$(DOCSDIR)/Bluetooth-KISS-TNC.pdf
+ $(BSD_INSTALL_DATA) doc/Going-beyond-9600-baud.pdf $(DESTDIR)$(DOCSDIR)/Going-beyond-9600-baud.pdf
+ $(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-APRS.pdf
+ $(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-APRS-Tracker.pdf
+ $(BSD_INSTALL_DATA) doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-SDR-IGate.pdf
+ $(BSD_INSTALL_DATA) doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)$(DOCSDIR)/Successful-APRS-IGate-Operation.pdf
+ $(BSD_INSTALL_DATA) doc/User-Guide.pdf $(DESTDIR)$(DOCSDIR)/User-Guide.pdf
+ $(BSD_INSTALL_DATA) doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)$(DOCSDIR)/WA8LMF-TNC-Test-CD-Results.pdf
#
# Various sample config and other files go into examples under the doc directory.
# When building from source, these can be put in home directory with "make install-conf".
# When installed from .DEB or .RPM package, the user will need to copy these to
# the home directory or other desired location.
#
- $(INSTALL) -D --mode=644 direwolf.conf $(DESTDIR)/share/doc/direwolf/examples/direwolf.conf
- $(INSTALL) -D --mode=755 dw-start.sh $(DESTDIR)/share/doc/direwolf/examples/dw-start.sh
- $(INSTALL) -D --mode=644 sdr.conf $(DESTDIR)/share/doc/direwolf/examples/sdr.conf
- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(DESTDIR)/share/doc/direwolf/examples/telem-balloon.conf
- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(DESTDIR)/share/doc/direwolf/examples/telem-volts.conf
+ mkdir -p $(DESTDIR)${EXAMPLESDIR}
+ $(BSD_INSTALL_DATA) direwolf.conf $(DESTDIR)$(EXAMPLESDIR)/direwolf.conf
+ $(BSD_INSTALL_SCRIPT) dw-start.sh $(DESTDIR)$(EXAMPLESDIR)/dw-start.sh
+ $(BSD_INSTALL_DATA) sdr.conf $(DESTDIR)$(EXAMPLESDIR)/sdr.conf
+ $(BSD_INSTALL_DATA) telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)$(EXAMPLESDIR)/telem-m0xer-3.txt
+ $(BSD_INSTALL_DATA) telemetry-toolkit/telem-balloon.conf $(DESTDIR)$(EXAMPLESDIR)/telem-balloon.conf
+ $(BSD_INSTALL_DATA) telemetry-toolkit/telem-volts.conf $(DESTDIR)$(EXAMPLESDIR)/telem-volts.conf
#
# "man" pages
#
- $(INSTALL) -D --mode=644 man1/aclients.1 $(DESTDIR)/share/man/man1/aclients.1
- $(INSTALL) -D --mode=644 man1/atest.1 $(DESTDIR)/share/man/man1/atest.1
- $(INSTALL) -D --mode=644 man1/decode_aprs.1 $(DESTDIR)/share/man/man1/decode_aprs.1
- $(INSTALL) -D --mode=644 man1/direwolf.1 $(DESTDIR)/share/man/man1/direwolf.1
- $(INSTALL) -D --mode=644 man1/gen_packets.1 $(DESTDIR)/share/man/man1/gen_packets.1
- $(INSTALL) -D --mode=644 man1/kissutil.1 $(DESTDIR)/share/man/man1/kissutil.1
- $(INSTALL) -D --mode=644 man1/ll2utm.1 $(DESTDIR)/share/man/man1/ll2utm.1
- $(INSTALL) -D --mode=644 man1/log2gpx.1 $(DESTDIR)/share/man/man1/log2gpx.1
- $(INSTALL) -D --mode=644 man1/text2tt.1 $(DESTDIR)/share/man/man1/text2tt.1
- $(INSTALL) -D --mode=644 man1/tt2text.1 $(DESTDIR)/share/man/man1/tt2text.1
- $(INSTALL) -D --mode=644 man1/utm2ll.1 $(DESTDIR)/share/man/man1/utm2ll.1
+ $(BSD_INSTALL_MAN) man1/aclients.1 $(DESTDIR)$(MANDIR)/man1/aclients.1
+ $(BSD_INSTALL_MAN) man1/atest.1 $(DESTDIR)$(MANDIR)/man1/atest.1
+ $(BSD_INSTALL_MAN) man1/decode_aprs.1 $(DESTDIR)$(MANDIR)/man1/decode_aprs.1
+ $(BSD_INSTALL_MAN) man1/direwolf.1 $(DESTDIR)$(MANDIR)/man1/direwolf.1
+ $(BSD_INSTALL_MAN) man1/gen_packets.1 $(DESTDIR)$(MANDIR)/man1/gen_packets.1
+ $(BSD_INSTALL_MAN) man1/kissutil.1 $(DESTDIR)$(MANDIR)/man1/kissutil.1
+ $(BSD_INSTALL_MAN) man1/ll2utm.1 $(DESTDIR)$(MANDIR)/man1/ll2utm.1
+ $(BSD_INSTALL_MAN) man1/log2gpx.1 $(DESTDIR)$(MANDIR)//man1/log2gpx.1
+ $(BSD_INSTALL_MAN) man1/text2tt.1 $(DESTDIR)$(MANDIR)/man1/text2tt.1
+ $(BSD_INSTALL_MAN) man1/tt2text.1 $(DESTDIR)$(MANDIR)/man1/tt2text.1
+ $(BSD_INSTALL_MAN) man1/utm2ll.1 $(DESTDIR)$(MANDIR)/man1/utm2ll.1
#
# Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
# This will allow us to use the CM108/CM119 GPIO pins for PTT.
#
- $(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
+# $(BSD_INSTALL_DATA) 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
#
@echo " "
@echo "If this is your first install, not an upgrade, type this to put a copy"
@@ -693,7 +703,7 @@ install : $(APPS) direwolf.conf tocalls.
# Put sample configuration & startup files in home directory.
# This step would be done as ordinary user.
# Some people like to put the direwolf config file in /etc/ax25.
-# Note that all of these are also in $(DESTDIR)/share/doc/direwolf/examples/.
+# Note that all of these are also in $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/examples/.
# The Raspberry Pi has ~/Desktop but Ubuntu does not.
@@ -724,7 +734,7 @@ endif
.PHONY: install-rpi
install-rpi :
- ln -f -s $(DESTDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
+ ln -f -s $(DESTDIR)$(SHAREDIR)/applications/direwolf.desktop ~/Desktop/direwolf.desktop

View File

@ -1,24 +1,35 @@
--- dw-start.sh.orig 2017-01-20 00:11:50 UTC
--- dw-start.sh.orig 2018-10-08 14:15:21 UTC
+++ dw-start.sh
@@ -83,15 +83,15 @@ DWCMD="direwolf -a 100"
@@ -120,14 +120,14 @@ function GUI {
# Auto adjust the startup for your particular environment: gnome-terminal, xterm, etc.
#
- if [ -x /usr/bin/lxterminal ]; then
- /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
+ if [ -x %%PREFIX%%/bin/lxterminal ]; then
+ %%PREFIX%%/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
SUCCESS=1
- elif [ -x /usr/bin/xterm ]; then
- /usr/bin/xterm -bg white -fg black -e "$DWCMD" &
+ elif [ -x %%PREFIX%%/bin/xterm ]; then
+ %%PREFIX%%/bin/xterm -bg white -fg black -e "$DWCMD" &
SUCCESS=1
- elif [ -x /usr/bin/x-terminal-emulator ]; then
- /usr/bin/x-terminal-emulator -e "$DWCMD" &
+ elif [ -x %%PREFIX%%/bin/x-terminal-emulator ]; then
+ %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
SUCCESS=1
else
echo "Did not find an X terminal emulator. Reverting to CLI mode"
@@ -142,9 +142,9 @@ function GUI {
# -----------------------------------------------------------
# When running from cron, we have a very minimal environment
-# including PATH=/usr/bin:/bin.
+# including PATH=%%PREFIX%%/bin:/bin.
#
-export PATH=/usr/local/bin:$PATH
+export PATH=%%PREFIX%%/bin:$PATH
-if [ -x /usr/bin/lxterminal ]
+if [ -x %%PREFIX%%/bin/lxterminal ]
then
- /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
-elif [ -x /usr/bin/xterm ]
+ %%PREFIX%%/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
+elif [ -x %%PREFIX%%/bin/xterm ]
then
- /usr/bin/xterm -bg white -fg black -e "$DWCMD" &
-elif [ -x /usr/bin/x-terminal-emulator ]
+ %%PREFIX%%/bin/xterm -bg white -fg black -e "$DWCMD" &
+elif [ -x %%PREFIX%%/bin/x-terminal-emulator ]
then
- /usr/bin/x-terminal-emulator -e "$DWCMD" &
+ %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
else
echo "Did not find an X terminal emulator."
fi
#Log the start of the script run and re-run
date >> $LOGFILE

View File

@ -1,13 +0,0 @@
--- dwgpsd.c.orig 2017-01-20 00:11:50 UTC
+++ dwgpsd.c
@@ -77,8 +77,9 @@ static void * read_gpsd_thread (void *ar
* Information for interface to gpsd daemon.
*/
+#if ENABLE_GPSD
static struct gps_data_t gpsdata;
-
+#endif
/*-------------------------------------------------------------------
*

View File

@ -0,0 +1,11 @@
--- ptt.c.orig 2018-10-08 14:15:21 UTC
+++ ptt.c
@@ -139,7 +139,7 @@
#if __WIN32__
#else
-#include <sys/termios.h>
+#include <termios.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <sys/types.h>

View File

@ -1,9 +1,11 @@
bin/aclients
bin/atest
bin/cm108
bin/decode_aprs
bin/direwolf
bin/dwespeak.sh
bin/dwspeak.sh
bin/gen_packets
bin/kissutil
bin/ll2utm
bin/log2gpx
bin/telem-balloon.pl
@ -24,31 +26,40 @@ man/man1/atest.1.gz
man/man1/decode_aprs.1.gz
man/man1/direwolf.1.gz
man/man1/gen_packets.1.gz
man/man1/kissutil.1.gz
man/man1/ll2utm.1.gz
man/man1/log2gpx.1.gz
man/man1/text2tt.1.gz
man/man1/tt2text.1.gz
man/man1/utm2ll.1.gz
share/applications/direwolf.desktop
%%DATADIR%%/dw-icon.png
%%DATADIR%%/CHANGES.md
%%DATADIR%%/LICENSE-dire-wolf.txt
%%DATADIR%%/LICENSE-other.txt
%%DATADIR%%/symbols-new.txt
%%DATADIR%%/symbolsX.txt
%%DATADIR%%/tocalls.txt
%%DATADIR%%/pixmaps/dw-icon.png
%%PORTDOCS%%%%DOCSDIR%%/2400-4800-PSK-for-APRS-Packet-Radio.pdf
%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
%%PORTDOCS%%%%DOCSDIR%%/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
%%PORTDOCS%%%%DOCSDIR%%/APRS-Telemetry-Toolkit.pdf
%%PORTDOCS%%%%DOCSDIR%%/APRStt-Implementation-Notes.pdf
%%PORTDOCS%%%%DOCSDIR%%/APRStt-Listening-Example.pdf
%%PORTDOCS%%%%DOCSDIR%%/APRStt-interface-for-SARTrack.pdf
%%PORTDOCS%%%%DOCSDIR%%/LICENSE-dire-wolf.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE-other.txt
%%PORTDOCS%%%%DOCSDIR%%/Bluetooth-KISS-TNC.pdf
%%PORTDOCS%%%%DOCSDIR%%/Going-beyond-9600-baud.pdf
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS-Tracker.pdf
%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS.pdf
%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-SDR-IGate.pdf
%%PORTDOCS%%%%DOCSDIR%%/Successful-APRS-IGate-Operation.pdf
%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/examples/direwolf.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/dw-start.sh
%%PORTDOCS%%%%DOCSDIR%%/examples/sdr.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/telem-balloon.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/telem-m0xer-3.txt
%%PORTDOCS%%%%DOCSDIR%%/examples/telem-volts.conf
%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/direwolf.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dw-start.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdr.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-balloon.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-m0xer-3.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-volts.conf

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= galera
PORTVERSION?= 25.3.26
PORTVERSION?= 25.3.27
DISTVERSIONPREFIX?= release_
CATEGORIES= databases

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1555422252
SHA256 (codership-galera-release_25.3.26_GH0.tar.gz) = 62c27634198a447ab8c060a33775cb4accaa3c25b730461e5b7c5a0af6507411
SIZE (codership-galera-release_25.3.26_GH0.tar.gz) = 3286931
TIMESTAMP = 1563790559
SHA256 (codership-galera-release_25.3.27_GH0.tar.gz) = df943a9f282a58df4b02fe05df5cbf387fd251d82c29f4021954602cc67a8f7b
SIZE (codership-galera-release_25.3.27_GH0.tar.gz) = 3292352
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032

View File

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= mysqlwsrep
PORTVERSION?= 5.6.43
PORTVERSION?= 5.6.44
DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.25
DISTVERSIONSUFFIX?= -25.26
CATEGORIES= databases ipv6
PKGNAMESUFFIX= 56-server
@ -23,8 +23,8 @@ RUN_DEPENDS= bash:shells/bash \
socat:net/socat
LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4
BROKEN_SSL= openssl111
BROKEN_SSL_REASON_openssl111= incomplete definition of type 'struct dh_st'
#BROKEN_SSL= openssl111
#BROKEN_SSL_REASON_openssl111= incomplete definition of type 'struct dh_st'
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1555423195
SHA256 (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 12260d27032be278f139ed910d0e0ea8146161fdb59fbfc8e0c825294f567911
SIZE (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 32446195
TIMESTAMP = 1563525011
SHA256 (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 4a3671ad6eb2a71585e16f9f9acbec14cbf27eead41cf0dc9c2c8bac448120fe
SIZE (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 32778456
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032

View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
--- CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ CMakeLists.txt
@@ -499,12 +499,10 @@ IF(UNIX)
@@ -532,12 +532,10 @@ IF(UNIX)
ENDIF()
IF(NOT WITHOUT_SERVER)
@ -13,7 +13,7 @@
ENDIF(WITH_EMBEDDED_SERVER)
ENDIF()
@@ -513,10 +511,7 @@ ENDIF()
@@ -546,10 +544,7 @@ ENDIF()
ADD_SUBDIRECTORY(scripts)
IF(NOT WITHOUT_SERVER)
@ -24,7 +24,7 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
ENDIF()
@@ -574,6 +569,7 @@ ENDIF()
@@ -608,6 +603,7 @@ ENDIF()
#
# RPM installs documentation directly from the source tree
#
@ -32,11 +32,11 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "mysql.info" EXCLUDE
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
ENDIF()
INCLUDE(CPack)

View File

@ -1,6 +1,4 @@
diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h
index 10fa4913b7e..ff6cb696661 100644
--- extra/yassl/include/openssl/ssl.h.orig
--- extra/yassl/include/openssl/ssl.h.orig 2019-07-16 14:08:43 UTC
+++ extra/yassl/include/openssl/ssl.h
@@ -1,5 +1,5 @@
/*
@ -18,9 +16,7 @@ index 10fa4913b7e..ff6cb696661 100644
unsigned long ERR_get_error(void);
unsigned long ERR_peek_error(void);
int ERR_GET_REASON(int);
diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp
index 39244a01b92..c992d446487 100644
--- extra/yassl/src/ssl.cpp.orig
--- extra/yassl/src/ssl.cpp.orig 2019-07-16 14:08:43 UTC
+++ extra/yassl/src/ssl.cpp
@@ -1,5 +1,5 @@
/*
@ -29,7 +25,7 @@ index 39244a01b92..c992d446487 100644
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only
@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only
}
@ -38,17 +34,15 @@ index 39244a01b92..c992d446487 100644
{
GetErrors().Remove();
}
diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc
index 261ba8ab732..a0f8c147c7a 100644
--- mysys_ssl/my_aes_openssl.cc.orig
--- mysys_ssl/my_aes_openssl.cc.orig 2019-07-16 14:08:43 UTC
+++ mysys_ssl/my_aes_openssl.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved.
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
@ -103,7 +97,7 @@ index 261ba8ab732..a0f8c147c7a 100644
return MY_AES_BAD_DATA;
}
@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
enum my_aes_opmode mode, const unsigned char *iv)
{
@ -117,7 +111,7 @@ index 261ba8ab732..a0f8c147c7a 100644
const EVP_CIPHER *cipher= aes_evp_type(mode);
int u_len, f_len;
@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
my_aes_create_key(key, key_length, rkey, mode);
@ -161,11 +155,9 @@ index 261ba8ab732..a0f8c147c7a 100644
return MY_AES_BAD_DATA;
}
diff --git sql-common/client.c sql-common/client.c
index 19faefe8323..f1192306ccb 100644
--- sql-common/client.c.orig
--- sql-common/client.c.orig 2019-07-16 14:08:43 UTC
+++ sql-common/client.c
@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
goto error;
}
@ -177,11 +169,9 @@ index 19faefe8323..f1192306ccb 100644
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git sql/mysqld.cc sql/mysqld.cc
index 4acff4e4d9b..307778771be 100644
--- sql/mysqld.cc.orig
--- sql/mysqld.cc.orig 2019-07-16 14:08:43 UTC
+++ sql/mysqld.cc
@@ -3408,7 +3408,11 @@ static int init_ssl()
@@ -4511,7 +4511,11 @@ static int init_ssl()
{
#ifdef HAVE_OPENSSL
#ifndef HAVE_YASSL
@ -193,9 +183,9 @@ index 4acff4e4d9b..307778771be 100644
#endif
ssl_start();
#ifndef EMBEDDED_LIBRARY
@@ -3434,7 +3438,9 @@ static int init_ssl()
@@ -4525,7 +4529,9 @@ static int init_ssl()
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);
opt_ssl_crl, opt_ssl_crlpath);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
- ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
@ -203,12 +193,10 @@ index 4acff4e4d9b..307778771be 100644
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
if (!ssl_acceptor_fd)
{
/*
diff --git sql/rpl_slave.cc sql/rpl_slave.cc
index aee13e12cb2..37a20870bd4 100644
--- sql/rpl_slave.cc.orig
sql_print_warning("Failed to setup SSL");
--- sql/rpl_slave.cc.orig 2019-07-16 14:08:43 UTC
+++ sql/rpl_slave.cc
@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d",
@@ -5258,7 +5258,9 @@ err:
mysql_mutex_unlock(&mi->run_lock);
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
@ -219,7 +207,7 @@ index aee13e12cb2..37a20870bd4 100644
pthread_exit(0);
return(0); // Avoid compiler warnings
}
@@ -6256,7 +6258,9 @@ extern "C" void *handle_slave_worker(void *arg)
@@ -5449,7 +5451,9 @@ err:
}
my_thread_end();
@ -230,7 +218,7 @@ index aee13e12cb2..37a20870bd4 100644
pthread_exit(0);
DBUG_RETURN(0);
}
@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff));
@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
@ -241,17 +229,15 @@ index aee13e12cb2..37a20870bd4 100644
pthread_exit(0);
return 0; // Avoid compiler warnings
}
diff --git vio/viossl.c vio/viossl.c
index 5622cb7ee92..f738570f832 100644
--- vio/viossl.c.orig
--- vio/viossl.c.orig 2019-07-16 14:08:43 UTC
+++ vio/viossl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
-/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
for (j = 0; j < n; j++)
{
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
@ -263,17 +249,15 @@ index 5622cb7ee92..f738570f832 100644
}
}
#endif
diff --git vio/viosslfactories.c vio/viosslfactories.c
index f50678a37b3..d3891fd8b12 100644
--- vio/viosslfactories.c.orig
--- vio/viosslfactories.c.orig 2019-07-16 14:08:43 UTC
+++ vio/viosslfactories.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -121,13 +121,21 @@ static DH *get_dh2048(void)
@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
DH *dh;
if ((dh=DH_new()))
{

View File

@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig 2018-01-31 14:03:53.000000000 +0100
+++ client/CMakeLists.txt 2018-02-07 11:27:46.846686000 +0100
@@ -31,17 +31,20 @@
--- client/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ client/CMakeLists.txt
@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES(
COPY_OPENSSL_DLLS(copy_openssl_client)
ADD_DEFINITIONS(${SSL_DEFINES})
@ -21,7 +21,7 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -51,17 +54,21 @@
@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -43,7 +43,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -74,6 +81,7 @@
@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@ -51,7 +51,7 @@
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
IF(WIN32)
@@ -83,11 +91,6 @@
@@ -82,11 +90,6 @@ ENDIF(WIN32)
SET_TARGET_PROPERTIES (
mysql_plugin
mysql_upgrade

View File

@ -1,10 +1,12 @@
--- cmake/plugin.cmake.orig 2017-01-25 07:58:07 UTC
--- cmake/plugin.cmake.orig 2019-07-16 14:08:43 UTC
+++ cmake/plugin.cmake
@@ -205,7 +205,6 @@ MACRO(MYSQL_ADD_PLUGIN)
OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")
# Install dynamic library
MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
# Add installed files to list for RPMs
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
"%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
@@ -216,9 +216,6 @@ MACRO(MYSQL_ADD_PLUGIN)
MYSQL_INSTALL_TARGETS(${target}
DESTINATION ${INSTALL_PLUGINDIR}
COMPONENT ${INSTALL_COMPONENT})
- INSTALL_DEBUG_TARGET(${target}
- DESTINATION ${INSTALL_PLUGINDIR}/debug
- COMPONENT ${INSTALL_COMPONENT})
# Add installed files to list for RPMs
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
"%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"

View File

@ -1,4 +1,4 @@
--- extra/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
--- extra/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ extra/CMakeLists.txt
@@ -101,8 +101,10 @@ IF(UNIX)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
@ -8,6 +8,6 @@
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
ENDIF()
+ENDIF()
ENDIF()

View File

@ -1,6 +1,6 @@
--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
@@ -39,7 +39,7 @@
--- include/my_compare.h.orig 2019-07-16 14:08:43 UTC
+++ include/my_compare.h
@@ -39,7 +39,7 @@ extern "C" {
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
*/

View File

@ -1,7 +1,7 @@
--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
--- mysys_ssl/my_default.cc.orig 2019-07-16 14:08:43 UTC
+++ mysys_ssl/my_default.cc
@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
#endif /* WITH_WREP */
/* Which directories are searched for options (and in which order) */
-#define MAX_DEFAULT_DIRS 6
@ -9,9 +9,9 @@
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
return 1; /* Ignore wrong files */
}
@@ -921,6 +921,14 @@ static int search_default_file_with_ext(Process_option
strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
#endif /* WITH_WSREP */
+ if (strstr(name, "/etc") == name)
+ {
@ -24,7 +24,7 @@
while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
{
line++;
@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
@@ -1259,7 +1267,8 @@ void my_print_default_files(const char *conf_file)
end[(strlen(end)-1)] = ' ';
else
strxmov(end, conf_file, *ext , " ", NullS);
@ -34,23 +34,24 @@
}
}
}
@@ -1400,13 +1409,8 @@ static const char **init_default_directo
@@ -1418,14 +1427,9 @@ static const char **init_default_directories(MEM_ROOT
#else
- errors += add_directory(alloc, "/etc/", dirs);
- errors += add_directory(alloc, "/etc/mysql/", dirs);
-
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
-#if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#endif /* DEFAULT_SYSCONFDIR */
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
-
#endif
@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
if ((env= getenv("MYSQL_HOME")))
@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))

View File

@ -1,5 +1,5 @@
--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000
+++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000
--- plugin/password_validation/validate_password.cc.orig 2019-07-16 14:08:43 UTC
+++ plugin/password_validation/validate_password.cc
@@ -16,6 +16,8 @@
#include <my_sys.h>
#include <string>
@ -7,5 +7,5 @@
+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
+#undef test
#include <set>
#include <ios> // std::streamoff
#include <iostream>
#include <fstream>

View File

@ -1,6 +1,6 @@
--- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
--- scripts/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ scripts/CMakeLists.txt
@@ -298,6 +298,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
@@ -304,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
SET(${var} "${${var}}-l${lib} " )
@ -9,7 +9,7 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@@ -360,15 +362,10 @@ ELSE()
@@ -366,15 +368,10 @@ ELSE()
# On Unix, most of the files end up in the bin directory
SET(mysql_config_COMPONENT COMPONENT Development)
SET(BIN_SCRIPTS
@ -25,7 +25,7 @@
mysqlhotcopy
mysqldumpslow
mysqld_multi
@@ -378,7 +375,7 @@ ELSE()
@@ -384,7 +381,7 @@ ELSE()
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

View File

@ -1,6 +1,6 @@
--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200
+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200
@@ -242,10 +242,10 @@
--- scripts/mysqld_safe.sh.orig 2019-07-19 08:39:37 UTC
+++ scripts/mysqld_safe.sh
@@ -568,10 +568,10 @@ fi
if test -z "$MYSQL_HOME"
then
@ -13,7 +13,7 @@
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
@@ -254,7 +254,7 @@
@@ -580,7 +580,7 @@ IGNORING $DATADIR/my.cnf"
then
log_error "WARNING: Found $DATADIR/my.cnf
The data directory is a deprecated location for my.cnf, please move it to

View File

@ -1,6 +1,23 @@
--- sql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
--- sql/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ sql/CMakeLists.txt
@@ -472,6 +472,7 @@ ADD_CUSTOM_TARGET(distclean
@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET(
DEPENDS ${GEN_DIGEST_SOURCES}
)
-
+IF(FALSE)
MYSQL_ADD_PLUGIN(udf_example udf_example.cc
MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
IF(NOT DISABLE_SHARED)
@@ -445,6 +445,7 @@ IF(NOT DISABLE_SHARED)
"/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
ENDIF()
ENDIF()
+ENDIF()
FOREACH(tool gtar tar git)
STRING(TOUPPER ${tool} TOOL)
@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
@ -8,11 +25,11 @@
# Copy db.opt into data/test/
SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
@@ -516,6 +517,7 @@ ELSE()
@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
ELSE()
# Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
ENDIF()
ENDIF()
+ENDIF()
ENDIF()
ENDIF()
ADD_CUSTOM_TARGET(show-dist-name
COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"

View File

@ -1,6 +1,6 @@
--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200
+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200
@@ -900,7 +900,7 @@
--- sql/sys_vars.cc.orig 2019-07-16 14:08:43 UTC
+++ sql/sys_vars.cc
@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout(
"connection before closing it",
SESSION_VAR(net_interactive_timeout),
CMD_LINE(REQUIRED_ARG),
@ -9,7 +9,7 @@
static Sys_var_ulong Sys_join_buffer_size(
"join_buffer_size",
@@ -1401,7 +1401,7 @@
@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout(
"Number of seconds to wait for more data from a connection before "
"aborting the read",
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@ -18,7 +18,7 @@
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_read_timeout));
@@ -1416,7 +1416,7 @@
@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout(
"Number of seconds to wait for a block to be written to a connection "
"before aborting the write",
SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
@ -27,7 +27,7 @@
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_write_timeout));
@@ -2257,7 +2257,7 @@
@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
"The number of seconds the server waits for activity on a "
"connection before closing it",
SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
@ -35,4 +35,4 @@
+ VALID_RANGE(1, INT_MAX32/1000),
DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
/** propagates changes to the relevant flag of @@optimizer_switch */
static Sys_var_plugin Sys_default_storage_engine(

View File

@ -1,6 +1,6 @@
--- support-files/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
--- support-files/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ support-files/CMakeLists.txt
@@ -69,7 +69,9 @@ IF(UNIX)
@@ -74,7 +74,9 @@ IF(UNIX)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= BerkeleyDB
PORTVERSION= 0.62
PORTVERSION= 0.63
CATEGORIES= databases perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563735469
SHA256 (BerkeleyDB-0.62.tar.gz) = c975b46f4696e864ce06abb4896efd3029196306d17e9230b322ec79648040dd
SIZE (BerkeleyDB-0.62.tar.gz) = 208013
TIMESTAMP = 1563805971
SHA256 (BerkeleyDB-0.63.tar.gz) = 7e09938d22ebb9c5e0117e9303853937c3cfad3068b69869c7b020cfca5102d2
SIZE (BerkeleyDB-0.63.tar.gz) = 208324

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Redis
PORTVERSION= 1.9920
PORTVERSION= 1.9950
CATEGORIES= databases perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563736548
SHA256 (Redis-1.992.tar.gz) = 8d267ec381411be33b5a6f296e2b4bcf1595c4c6ebb0ae3bae5e9ac0e4be141e
SIZE (Redis-1.992.tar.gz) = 47634
TIMESTAMP = 1563805973
SHA256 (Redis-1.995.tar.gz) = a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906
SIZE (Redis-1.995.tar.gz) = 59271

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sqlalchemy
PORTVERSION= 1.3.5
PORTVERSION= 1.3.6
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1560957704
SHA256 (SQLAlchemy-1.3.5.tar.gz) = c30925d60af95443458ebd7525daf791f55762b106049ae71e18f8dd58084c2f
SIZE (SQLAlchemy-1.3.5.tar.gz) = 5887356
TIMESTAMP = 1563805953
SHA256 (SQLAlchemy-1.3.6.tar.gz) = 217e7fc52199a05851eee9b6a0883190743c4fb9c8ac4313ccfceaffd852b0ff
SIZE (SQLAlchemy-1.3.6.tar.gz) = 5907328

View File

@ -5553,6 +5553,7 @@
SUBDIR += rubygem-formatador
SUBDIR += rubygem-forwardable-extended
SUBDIR += rubygem-fugit
SUBDIR += rubygem-fugit12
SUBDIR += rubygem-gdata
SUBDIR += rubygem-gem-compare
SUBDIR += rubygem-gem_plugin

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= awscli
PORTVERSION= 1.16.185
PORTVERSION= 1.16.202
CATEGORIES= devel
MASTER_SITES= CHEESESHOP
@ -12,7 +12,7 @@ COMMENT= Universal Command Line Interface for Amazon Web Services
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.175:devel/py-botocore@${PY_FLAVOR} \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.192:devel/py-botocore@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}s3transfer>=0.2.0:net/py-s3transfer@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR} \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1561495698
SHA256 (awscli-1.16.185.tar.gz) = 9e415f7370db8dd38129f1b8eea5b7eaada5e4e1ae159ffbbc52ab9ee28694a7
SIZE (awscli-1.16.185.tar.gz) = 756768
TIMESTAMP = 1563748801
SHA256 (awscli-1.16.202.tar.gz) = 3e5c141257d154e3cc02825ab6442f0d7bd47b2be621d2304824e201eba17e45
SIZE (awscli-1.16.202.tar.gz) = 787854

View File

@ -10,6 +10,9 @@ MASTER_SITES= http://download.rsyslog.com/
MAINTAINER= matthew@FreeBSD.org
COMMENT= Event expression library inspired by CEE
DEPRECATED= No longer required by rsyslog, which was its only consumer. No longer maintained upstream
EXPIRATION_DATE= 2019-09-23
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING

View File

@ -1,14 +1,9 @@
# $FreeBSD$
PORTNAME= llvm
DISTVERSION= 8.0.0
PORTREVISION= 2
DISTVERSION= 8.0.1
CATEGORIES= devel lang
.if ${DISTVERSION:M*rc*}
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_RELEASE}-${DISTVERSION:S/${LLVM_RELEASE}//}/
.else
MASTER_SITES= http://releases.llvm.org/${LLVM_RELEASE}/
.endif
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/
PKGNAMESUFFIX= ${LLVM_SUFFIX}
DISTNAME= ${PORTNAME}-${DISTVERSION}.src
DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}

View File

@ -1,15 +1,15 @@
TIMESTAMP = 1560807021
SHA256 (llvm-8.0.0.src.tar.xz) = 8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c
SIZE (llvm-8.0.0.src.tar.xz) = 30503732
SHA256 (cfe-8.0.0.src.tar.xz) = 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b
SIZE (cfe-8.0.0.src.tar.xz) = 12868468
SHA256 (compiler-rt-8.0.0.src.tar.xz) = b435c7474f459e71b2831f1a4e3f1d21203cb9c0172e94e9d9b69f50354f21b1
SIZE (compiler-rt-8.0.0.src.tar.xz) = 1903020
SHA256 (clang-tools-extra-8.0.0.src.tar.xz) = 4f00122be408a7482f2004bcf215720d2b88cf8dc78b824abb225da8ad359d4b
SIZE (clang-tools-extra-8.0.0.src.tar.xz) = 1996156
SHA256 (lld-8.0.0.src.tar.xz) = 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37
SIZE (lld-8.0.0.src.tar.xz) = 999864
SHA256 (lldb-8.0.0.src.tar.xz) = 49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373
SIZE (lldb-8.0.0.src.tar.xz) = 19602332
SHA256 (openmp-8.0.0.src.tar.xz) = f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
SIZE (openmp-8.0.0.src.tar.xz) = 934384
TIMESTAMP = 1563822147
SHA256 (llvm-8.0.1.src.tar.xz) = 44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7
SIZE (llvm-8.0.1.src.tar.xz) = 30477608
SHA256 (cfe-8.0.1.src.tar.xz) = 70effd69f7a8ab249f66b0a68aba8b08af52aa2ab710dfb8a0fba102685b1646
SIZE (cfe-8.0.1.src.tar.xz) = 12810056
SHA256 (compiler-rt-8.0.1.src.tar.xz) = 11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837
SIZE (compiler-rt-8.0.1.src.tar.xz) = 1954204
SHA256 (clang-tools-extra-8.0.1.src.tar.xz) = 187179b617e4f07bb605cc215da0527e64990b4a7dd5cbcc452a16b64e02c3e1
SIZE (clang-tools-extra-8.0.1.src.tar.xz) = 1994068
SHA256 (lld-8.0.1.src.tar.xz) = 9fba1e94249bd7913e8a6c3aadcb308b76c8c3d83c5ce36c99c3f34d73873d88
SIZE (lld-8.0.1.src.tar.xz) = 996440
SHA256 (lldb-8.0.1.src.tar.xz) = e8a79baa6d11dd0650ab4a1b479f699dfad82af627cbbcd49fa6f2dc14e131d7
SIZE (lldb-8.0.1.src.tar.xz) = 19586288
SHA256 (openmp-8.0.1.src.tar.xz) = 3e85dd3cad41117b7c89a41de72f2e6aa756ea7b4ef63bb10dcddf8561a7722c
SIZE (openmp-8.0.1.src.tar.xz) = 933320

View File

@ -0,0 +1,12 @@
--- tools/clang/lib/Driver/ToolChains/Arch/PPC.cpp.orig
+++ tools/clang/lib/Driver/ToolChains/Arch/PPC.cpp
@@ -116,7 +116,8 @@
const ArgList &Args) {
if (Args.getLastArg(options::OPT_msecure_plt))
return ppc::ReadGOTPtrMode::SecurePlt;
- if (Triple.isOSNetBSD() || Triple.isOSOpenBSD())
+ if ((Triple.isOSFreeBSD() && Triple.getOSMajorVersion() >= 13) ||
+ Triple.isOSNetBSD() || Triple.isOSOpenBSD())
return ppc::ReadGOTPtrMode::SecurePlt;
else
return ppc::ReadGOTPtrMode::Bss;

View File

@ -0,0 +1,12 @@
--- lib/Target/PowerPC/PPCSubtarget.cpp.orig 2019-06-25 23:46:37.175257000 +0100
+++ lib/Target/PowerPC/PPCSubtarget.cpp 2019-06-25 23:48:13.189675000 +0100
@@ -138,7 +138,8 @@
if (isDarwin())
HasLazyResolverStubs = true;
- if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD())
+ if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) ||
+ TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD())
SecurePlt = true;
if (HasSPE && IsPPC64)

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= osc
PORTVERSION= 0.165.1
PORTVERSION= 0.165.2
CATEGORIES= devel
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1559475512
SHA256 (openSUSE-osc-0.165.1_GH0.tar.gz) = 538e7afd6deac6b67d21ae9989d55991f0633fe9b464dace5c01024a0eca6095
SIZE (openSUSE-osc-0.165.1_GH0.tar.gz) = 350146
TIMESTAMP = 1563805026
SHA256 (openSUSE-osc-0.165.2_GH0.tar.gz) = 56c0819cd49d18c99561bd5af6f8fcfbf71ae1f56b3efbf34c81d0dfcd70606c
SIZE (openSUSE-osc-0.165.2_GH0.tar.gz) = 350702

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= MCE-Shared
PORTVERSION= 1.841
PORTVERSION= 1.842
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARIOROY
@ -18,7 +18,7 @@ LICENSE_FILE_GPLv1+ = ${WRKSRC}/Copying
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-IO-FDPass>=1.1:devel/p5-IO-FDPass \
p5-MCE>=1.839:devel/p5-MCE
p5-MCE>=1.842:devel/p5-MCE
USES= perl5
USE_PERL5= configure

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1562497701
SHA256 (MCE-Shared-1.841.tar.gz) = 63a2dbd1a25a18ba0aee04ff4437458a27ba36d07a0be272c4e3715a0bea1d70
SIZE (MCE-Shared-1.841.tar.gz) = 142785
TIMESTAMP = 1563805949
SHA256 (MCE-Shared-1.842.tar.gz) = b93ea89eae7f282446baa7ed931c7dcf6dcb0f0432049b545736bbf0332489b1
SIZE (MCE-Shared-1.842.tar.gz) = 143825

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= MCE
PORTVERSION= 1.841
PORTVERSION= 1.842
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARIOROY

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1562689552
SHA256 (MCE-1.841.tar.gz) = 5a29414134fb887eb0838ba68a2ec8527d3a38bf7ea0afce6212e7e4113cf049
SIZE (MCE-1.841.tar.gz) = 208096
TIMESTAMP = 1563805947
SHA256 (MCE-1.842.tar.gz) = a7384b59537530293323c55e010d8a1d30f4009e8d1140161e9c35389a8c30ae
SIZE (MCE-1.842.tar.gz) = 208765

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Regexp-Compare
PORTVERSION= 0.30
PORTVERSION= 0.31
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563642018
SHA256 (Regexp-Compare-0.30.tar.gz) = d713252c30034b44c9ad806045f485b4ced4b3226041604cde68df76a619c1f5
SIZE (Regexp-Compare-0.30.tar.gz) = 87126
TIMESTAMP = 1563805951
SHA256 (Regexp-Compare-0.31.tar.gz) = 29909dafa288fcc7f1c584250d41ac06946daf92fd177c7fb9e8e6f248a2fedf
SIZE (Regexp-Compare-0.31.tar.gz) = 87169

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Test-Mock-Redis
PORTVERSION= 0.21
PORTVERSION= 0.22
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547536491
SHA256 (Test-Mock-Redis-0.21.tar.gz) = a624f1439c2256fdbaf5b0887dae31669d4aa9c8f73eb603801688d1495e89cb
SIZE (Test-Mock-Redis-0.21.tar.gz) = 32449
TIMESTAMP = 1563683034
SHA256 (Test-Mock-Redis-0.22.tar.gz) = 32394de0252c2c351b04f6c4957f3044242d789fa6b6f713d23ff03459ca8650
SIZE (Test-Mock-Redis-0.22.tar.gz) = 33749

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flake8
PORTVERSION= 3.7.7
PORTREVISION= 2
PORTVERSION= 3.7.8
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1551187354
SHA256 (flake8-3.7.7.tar.gz) = 859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661
SIZE (flake8-3.7.7.tar.gz) = 148457
TIMESTAMP = 1563805035
SHA256 (flake8-3.7.8.tar.gz) = 19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548
SIZE (flake8-3.7.8.tar.gz) = 150113

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= graphql-core
PORTVERSION= 2.2
PORTVERSION= 2.2.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -14,7 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}promise>=2.1:devel/py-promise@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}rx>=1.6.0:devel/py-rx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}rx>=1.6<3:devel/py-rx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1559944333
SHA256 (graphql-core-2.2.tar.gz) = 60ef8277b82aaad49e87154a0288a9542a82a63909568375712f826b1c280ef5
SIZE (graphql-core-2.2.tar.gz) = 99204
TIMESTAMP = 1563805955
SHA256 (graphql-core-2.2.1.tar.gz) = da64c472d720da4537a2e8de8ba859210b62841bd47a9be65ca35177f62fe0e4
SIZE (graphql-core-2.2.1.tar.gz) = 99207

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= molecule
PORTVERSION= 2.20.1
PORTVERSION= 2.20.2
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1555145209
SHA256 (molecule-2.20.1.tar.gz) = 621797c54299775f284bbb010d5bb9be485500eecaaa14a476cbc0df285d0da7
SIZE (molecule-2.20.1.tar.gz) = 251517
TIMESTAMP = 1563826185
SHA256 (molecule-2.20.2.tar.gz) = 9dc29b9ef172b26532752784687faca2e868c84e2d90f0b4f018d81d76a8b30a
SIZE (molecule-2.20.2.tar.gz) = 251623

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-core
DISTVERSION= 2.11.302
DISTVERSION= 2.11.317
CATEGORIES= devel rubygems
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1561568214
SHA256 (rubygem/aws-sdk-core-2.11.302.gem) = d4ea1759c8a1046024555457bc54b5a47fd9b81b7623d3c9886bd2aa1df0a872
SIZE (rubygem/aws-sdk-core-2.11.302.gem) = 1613824
TIMESTAMP = 1563805961
SHA256 (rubygem/aws-sdk-core-2.11.317.gem) = 71a54d6b224ef4eb5108bda8fc597be9b8706a46ff616c5235f247076b11be8c
SIZE (rubygem/aws-sdk-core-2.11.317.gem) = 1626112

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-resources
DISTVERSION= 2.11.302
DISTVERSION= 2.11.317
CATEGORIES= devel rubygems
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1561568215
SHA256 (rubygem/aws-sdk-resources-2.11.302.gem) = c226b46976142aefdb578bbdd05e2a3c1d914562617441f5d55877f7c86a10f6
SIZE (rubygem/aws-sdk-resources-2.11.302.gem) = 48640
TIMESTAMP = 1563805963
SHA256 (rubygem/aws-sdk-resources-2.11.317.gem) = 930aa155e12b2aa7ef6e57762f29d332f2e0f5668e3c1ed5016bc9483dc129b2
SIZE (rubygem/aws-sdk-resources-2.11.317.gem) = 48640

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk
DISTVERSION= 2.11.302
DISTVERSION= 2.11.317
CATEGORIES= devel rubygems
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1561568190
SHA256 (rubygem/aws-sdk-2.11.302.gem) = f6fe3e66a4bb3a40e1e216073a0d4a9064d0e27706c73cbee09a83077ac8b358
SIZE (rubygem/aws-sdk-2.11.302.gem) = 4608
TIMESTAMP = 1563805959
SHA256 (rubygem/aws-sdk-2.11.317.gem) = 6c6bb96c1a33f1bfd371ed903162147fd7314475b7b0ef4cf718f69be298835c
SIZE (rubygem/aws-sdk-2.11.317.gem) = 4608

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fugit
PORTVERSION= 1.2.3
PORTVERSION= 1.3.0
CATEGORIES= devel rubygems
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563472163
SHA256 (rubygem/fugit-1.2.3.gem) = a0ba58211f4e69103531cc26d6d5c18f03a2d3989e7b8aa03d2d83f2181cb745
SIZE (rubygem/fugit-1.2.3.gem) = 20992
TIMESTAMP = 1563805969
SHA256 (rubygem/fugit-1.3.0.gem) = 09e5fcd8f3fca51544b36f51f7a5506f7d5b4f41d854b804dbfacea5dc1eee61
SIZE (rubygem/fugit-1.3.0.gem) = 21504

View File

@ -0,0 +1,29 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$
PORTNAME= fugit
PORTVERSION= 1.2.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 12
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Time tools for flor and the floraison project
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= rubygem-et-orbi>=1.1.8:devel/rubygem-et-orbi \
rubygem-raabro>=1.1:textproc/rubygem-raabro
USES= gem
USE_RUBY= yes
NO_ARCH= yes
# Disable rdoc
OPTIONS_EXCLUDE=DOCS
PORTSCOUT= limit:^1\.2\.
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1563472163
SHA256 (rubygem/fugit-1.2.3.gem) = a0ba58211f4e69103531cc26d6d5c18f03a2d3989e7b8aa03d2d83f2181cb745
SIZE (rubygem/fugit-1.2.3.gem) = 20992

View File

@ -0,0 +1,5 @@
Fugit is a time tools for flor and the floraison group. It uses et-orbi to represent
time instances and raabro as a basis for its parsers. Fugit will probably become
the foundation for rufus-scheduler 4.x
WWW: https://github.com/floraison/fugit

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= google-api-client
PORTVERSION= 0.30.6
PORTVERSION= 0.30.7
CATEGORIES= devel rubygems
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563472167
SHA256 (rubygem/google-api-client-0.30.6.gem) = 5ec924010375a724a7d2660000f3cc60987d3b20037ef1acc404473a4e63e4b3
SIZE (rubygem/google-api-client-0.30.6.gem) = 5566464
TIMESTAMP = 1563805965
SHA256 (rubygem/google-api-client-0.30.7.gem) = f3621b52cd98961152931f6b51affe01540df859f8279b395b24f4de9bacc37e
SIZE (rubygem/google-api-client-0.30.7.gem) = 5583872

View File

@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove tar:bz2
USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.15.0a0.2019.07.12
ISCVERSION= 9.15.0a0.2019.07.21
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= 4084ba108599f9fa0ab6f7019b63552c338b4020
GL_COMMIT= 03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563193902
SHA256 (isc-projects-bind9-4084ba108599f9fa0ab6f7019b63552c338b4020_GL0.tar.gz) = 15640d6227063d3e04f2bde586f9ff802e6f3eefc7d40c7ccf81ea0757ccf72d
SIZE (isc-projects-bind9-4084ba108599f9fa0ab6f7019b63552c338b4020_GL0.tar.gz) = 6341064
TIMESTAMP = 1563803945
SHA256 (isc-projects-bind9-03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2_GL0.tar.gz) = 7c42b6a1af0547e0c9546c4b53da67b8d98580cd9fd408a2bc1344192f4138a9
SIZE (isc-projects-bind9-03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2_GL0.tar.gz) = 6340946

View File

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2019-07-04 16:38:26 UTC
--- bin/named/config.c.orig 2019-07-22 02:18:48 UTC
+++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\
@ -8,9 +8,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2019-07-04 16:38:26 UTC
--- bin/named/server.c.orig 2019-07-22 02:18:48 UTC
+++ bin/named/server.c
@@ -4225,6 +4225,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4226,6 +4226,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@ -22,7 +22,7 @@
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2019-07-04 16:38:26 UTC
--- lib/dns/include/dns/view.h.orig 2019-07-22 02:18:48 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@ -32,7 +32,7 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2019-07-04 16:38:26 UTC
--- lib/dns/resolver.c.orig 2019-07-22 02:18:48 UTC
+++ lib/dns/resolver.c
@@ -6048,6 +6048,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@ -47,7 +47,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2019-07-04 16:38:26 UTC
--- lib/isccfg/namedconf.c.orig 2019-07-22 02:18:48 UTC
+++ lib/isccfg/namedconf.c
@@ -1911,6 +1911,7 @@ view_clauses[] = {
#endif

View File

@ -1,6 +1,6 @@
--- configure.orig 2019-07-12 14:07:20 UTC
--- configure.orig 2019-07-22 02:18:48 UTC
+++ configure
@@ -17287,27 +17287,9 @@ done
@@ -17246,27 +17246,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@ -30,7 +30,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17350,47 +17332,7 @@ $as_echo "no" >&6; } ;;
@@ -17309,47 +17291,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -22613,7 +22555,7 @@ $as_echo "" >&6; }
@@ -22572,7 +22514,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citra
PORTVERSION= s20190715
PORTVERSION= s20190722
PORTREVISION?= 0
CATEGORIES= emulators
@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs
USE_GITHUB= yes
GH_ACCOUNT= citra-emu
GH_TAGNAME= 643a39638
GH_TAGNAME= 077eacd41
GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1563163465
SHA256 (citra-emu-citra-s20190715-643a39638_GH0.tar.gz) = bc8fefd7d4dec3403724a8cec177160cd5a9e1ef83c5965f04a6f54a6622f55b
SIZE (citra-emu-citra-s20190715-643a39638_GH0.tar.gz) = 5049237
TIMESTAMP = 1563838906
SHA256 (citra-emu-citra-s20190722-077eacd41_GH0.tar.gz) = 0b5f5bbd810b1c76410577d9abdf5c71f7412904ac02992f4a75400db4c791ee
SIZE (citra-emu-citra-s20190722-077eacd41_GH0.tar.gz) = 5049067
SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c

View File

@ -2,8 +2,8 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.6-8398 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -ge2574ff10
DISTVERSION= 0.0.6-8411 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g85b1152e2
CATEGORIES= emulators
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1563540548
SHA256 (RPCS3-rpcs3-v0.0.6-8398-ge2574ff10_GH0.tar.gz) = efe90a12b46e9a700067812e5456c4167c078c0895303b7f087d19e5a684ebb0
SIZE (RPCS3-rpcs3-v0.0.6-8398-ge2574ff10_GH0.tar.gz) = 5518494
TIMESTAMP = 1563836941
SHA256 (RPCS3-rpcs3-v0.0.6-8411-g85b1152e2_GH0.tar.gz) = e646a07203c00eb964ddcfad939a82d2c51a64af51a3728f0f9f7397f70f538d
SIZE (RPCS3-rpcs3-v0.0.6-8411-g85b1152e2_GH0.tar.gz) = 5526341
SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yuzu
PORTVERSION= s20190718
PORTVERSION= s20190722
PORTREVISION?= 0
CATEGORIES= emulators
@ -28,7 +28,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= 5d369112d
GH_TAGNAME= f601f25bc
GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1563472384
SHA256 (yuzu-emu-yuzu-s20190718-5d369112d_GH0.tar.gz) = c5c9576abedb1e1d85e7e173d3cd9eb79286a026308a2947063d6fd4c0435049
SIZE (yuzu-emu-yuzu-s20190718-5d369112d_GH0.tar.gz) = 2700821
TIMESTAMP = 1563808375
SHA256 (yuzu-emu-yuzu-s20190722-f601f25bc_GH0.tar.gz) = 2ab6824991a4ea86ea1100e2bbeb5f1b8943d0d5620ef6ce89ab9f9fbc94298c
SIZE (yuzu-emu-yuzu-s20190722-f601f25bc_GH0.tar.gz) = 2704865
SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254
SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7

View File

@ -141,6 +141,25 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
namespace Vulkan {
namespace Alternatives {
--- src/video_core/renderer_vulkan/vk_shader_decompiler.cpp.orig 2019-07-22 15:12:55 UTC
+++ src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
@@ -21,6 +21,16 @@
#include "video_core/renderer_vulkan/vk_shader_decompiler.h"
#include "video_core/shader/shader_ir.h"
+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
+_LIBCPP_BEGIN_NAMESPACE_STD
+template<class _Tp, class... _Args,
+ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), void>::type
+ >
+array(_Tp, _Args...)
+ -> array<_Tp, 1 + sizeof...(_Args)>;
+_LIBCPP_END_NAMESPACE_STD
+#endif
+
namespace Vulkan::VKShader {
using Sirit::Id;
--- src/yuzu/configuration/configure_gamelist.cpp.orig 2019-06-28 18:03:38 UTC
+++ src/yuzu/configuration/configure_gamelist.cpp
@@ -11,6 +11,16 @@

View File

@ -52,6 +52,7 @@
SUBDIR += apricots
SUBDIR += aquaria
SUBDIR += arkanoidsb
SUBDIR += armagetronad
SUBDIR += arx-libertatis
SUBDIR += asc
SUBDIR += ascii-invaders
@ -1005,6 +1006,7 @@
SUBDIR += vitetris
SUBDIR += vkquake
SUBDIR += vms-empire
SUBDIR += voadi
SUBDIR += vodovod
SUBDIR += volleyball
SUBDIR += vor

View File

@ -0,0 +1,34 @@
# $FreeBSD$
PORTNAME= armagetronad
DISTVERSION= 0.2.8.3.4
DISTVERSIONSUFFIX= .src
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/stable/${DISTVERSION}/
MAINTAINER= yuri@FreeBSD.org
COMMENT= Tron clone in 3D
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libpng16.so:graphics/png
USES= autoreconf gl gmake gnome jpeg sdl
GNU_CONFIGURE= yes
USE_SDL= image mixer sdl
USE_GL= gl glu
USE_GNOME= libxml2
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
CONFIGURE_ARGS= --disable-etc --disable-games --enable-music
BINARY_ALIAS= sdl11-config=sdl-config
OPTIONS_DEFINE= DOCS
PORTDOCS= *
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1563837617
SHA256 (armagetronad-0.2.8.3.4.src.tar.gz) = 446af57c614ed28b4aa1d5a0d818c9d67a621bf7832b9276c3029c0f5006fedd
SIZE (armagetronad-0.2.8.3.4.src.tar.gz) = 2217387

View File

@ -0,0 +1,11 @@
--- batch/sysinstall.in.orig 2011-09-11 10:41:39 UTC
+++ batch/sysinstall.in
@@ -205,7 +205,7 @@ if test $MODE = install; then
for script in $DESTDIR$SCRIPTDIR/* $DESTDIR$CONFIGDIR/rc.config; do
if test $script != $DESTDIR$SCRIPTDIR/sysinstall; then
sed -e ${sedcommands} < $script > $script.trans || exit 1
- mv $script.trans $script
+ mv -f $script.trans $script
chmod 755 $script
fi
done

View File

@ -0,0 +1,16 @@
This is a fix for a bug in how std::autoptr is handled.
clang complains:
gCycle.cpp:*:*: warning: reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true
[-Wundefined-bool-conversion]
--- src/tron/gCycle.cpp.orig 2011-09-11 10:41:47 UTC
+++ src/tron/gCycle.cpp
@@ -2712,7 +2712,7 @@ bool gCycle::Timestep(REAL currentTime){
gCycleChatBot & bot = gCycleChatBot::Get( this );
bot.Activate( currentTime );
}
- else if ( &(*chatBot_) )
+ else if ( chatBot_.get() )
{
chatBot_->nextChatAI_ = 0;
}

View File

@ -0,0 +1,7 @@
Armagetron is a multiplayer game in 3d that attempts to emulate and expand on
the lightcycle sequence from the movie Tron. It's an old school arcade game
slung into the 21st century. Highlights include a customizable playing arena,
HUD, unique graphics, and AI bots. For the more advanced player there are new
game modes and a wide variety of physics settings to tweak as well.
WWW: http://www.armagetronad.org/

View File

@ -0,0 +1,76 @@
bin/armagetronad
%%ETCDIR%%/aiplayers.cfg
%%ETCDIR%%/default.cfg
%%ETCDIR%%/examples/breakfast_in_hell.cfg
%%ETCDIR%%/examples/cvs_test/fortress_complete.cfg
%%ETCDIR%%/examples/cvs_test/fortress_physics.cfg
%%ETCDIR%%/examples/cvs_test/fortress_politics.cfg
%%ETCDIR%%/examples/cvs_test/fortress_scoring.cfg
%%ETCDIR%%/examples/cvs_test/sumo_complete.cfg
%%ETCDIR%%/examples/death_zone.cfg
%%ETCDIR%%/examples/fortress_soccer.cfg
%%ETCDIR%%/examples/single_use_turbo.cfg
%%ETCDIR%%/examples/teamsumo.cfg
%%ETCDIR%%/master.srv
%%ETCDIR%%/rc.config
%%ETCDIR%%/settings.cfg
%%ETCDIR%%/settings_authentication.cfg
%%ETCDIR%%/settings_dedicated.cfg
%%ETCDIR%%/settings_visual.cfg
%%ETCDIR%%/subcultures.srv
%%DATADIR%%/desktop/armagetronad.desktop
%%DATADIR%%/desktop/icons/large/armagetronad.png
%%DATADIR%%/desktop/icons/medium/armagetronad.png
%%DATADIR%%/desktop/icons/small/armagetronad.png
%%DATADIR%%/language/american.txt
%%DATADIR%%/language/british.txt
%%DATADIR%%/language/deutsch.txt
%%DATADIR%%/language/english_base.txt
%%DATADIR%%/language/english_base_notranslate.txt
%%DATADIR%%/language/french.txt
%%DATADIR%%/language/languages.txt
%%DATADIR%%/language/languages.txt.in
%%DATADIR%%/language/polish.txt
%%DATADIR%%/language/polish_transliterated.txt
%%DATADIR%%/language/spanish.txt
%%DATADIR%%/language/update.py
%%DATADIR%%/models/cycle_body.mod
%%DATADIR%%/models/cycle_front.mod
%%DATADIR%%/models/cycle_rear.mod
%%DATADIR%%/resource/included/AATeam/map-0.2.8.0.dtd
%%DATADIR%%/resource/included/AATeam/map-0.2.8.0_rc4.dtd
%%DATADIR%%/resource/included/Anonymous/README
%%DATADIR%%/resource/included/Anonymous/polygon/README
%%DATADIR%%/resource/included/Anonymous/polygon/regular/40-gon-0.2.aamap.xml
%%DATADIR%%/resource/included/Anonymous/polygon/regular/README
%%DATADIR%%/resource/included/Anonymous/polygon/regular/diamond-1.0.2.aamap.xml
%%DATADIR%%/resource/included/Anonymous/polygon/regular/square-1.0.1.aamap.xml
%%DATADIR%%/resource/included/Your_mom/clever/inaktek-0.7.2.aamap.xml
%%DATADIR%%/resource/included/Your_mom/clever/repeat-0.3.2.aamap.xml
%%DATADIR%%/resource/included/Z-Man/fortress/for_old_clients-0.1.0.aamap.xml
%%DATADIR%%/resource/included/Z-Man/fortress/fourfold_for_old_clients-0.1.0.aamap.xml
%%DATADIR%%/resource/included/Z-Man/fortress/sumo_4x4-0.1.1.aamap.xml
%%DATADIR%%/resource/included/Z-Man/fortress/sumo_8x2-0.1.0.aamap.xml
%%DATADIR%%/resource/included/Z-Man/fortress/zonetest-0.1.0.aamap.xml
%%DATADIR%%/resource/included/map-0.1-exp.dtd
%%DATADIR%%/resource/included/map-0.1.dtd
%%DATADIR%%/resource/included/map-0.2.8_beta3.dtd
%%DATADIR%%/scripts/relocate
%%DATADIR%%/scripts/sysinstall
%%DATADIR%%/sound/cyclrun.wav
%%DATADIR%%/sound/expl.wav
%%DATADIR%%/textures/KGN_logo.png
%%DATADIR%%/textures/cycle_body.png
%%DATADIR%%/textures/cycle_wheel.png
%%DATADIR%%/textures/dir_wall.png
%%DATADIR%%/textures/floor.png
%%DATADIR%%/textures/floor_a.png
%%DATADIR%%/textures/floor_b.png
%%DATADIR%%/textures/font.png
%%DATADIR%%/textures/font_extra.png
%%DATADIR%%/textures/font_s.png
%%DATADIR%%/textures/icon.png
%%DATADIR%%/textures/rim_wall.png
%%DATADIR%%/textures/shadow.png
%%DATADIR%%/textures/sky.png
%%DATADIR%%/textures/title.jpg

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lolcat
PORTVERSION= 99.9.69
PORTREVISION= 1
PORTVERSION= 99.9.99
CATEGORIES= games
MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1554553297
SHA256 (rubygem/lolcat-99.9.69.gem) = 4929d3d37798fdeed7d259dbdc059adb5fb1bf33cd7e4caa3ad0433fa3803e34
SIZE (rubygem/lolcat-99.9.69.gem) = 57856
TIMESTAMP = 1563805967
SHA256 (rubygem/lolcat-99.9.99.gem) = c4e6663d282db5dd0720e3f1dea191b8654b2777287e976d70111aa793414210
SIZE (rubygem/lolcat-99.9.99.gem) = 121344

47
games/voadi/Makefile Normal file
View File

@ -0,0 +1,47 @@
# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
# $FreeBSD$
PORTNAME= voadi
PORTVERSION= 0.3
CATEGORIES= games
MASTER_SITES= https://gitlab.com/${PORTNAME}/${PORTNAME}/-/archive/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Vegan on a Desert Island, 2D top-down adventure game
LICENSE= GPLv3 CC-BY-SA-4.0
LICENSE_COMB= multi
LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE
RUN_DEPENDS= solarus-run:games/solarus
NO_ARCH= yes
NO_BUILD= yes
SUB_FILES= ${PORTNAME}.sh
PORTDOCS= README.md
PORTDATA= *
PLIST_FILES= bin/${PORTNAME}
OPTIONS_DEFINE= DOCS
DESKTOP_ENTRIES="Vegan on a Desert Island" \
"" \
"${DATADIR}/data/logos/icon_64.png" \
"${PORTNAME}" \
"Game;AdventureGame;" \
""
do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
.include <bsd.port.mk>

3
games/voadi/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1561669319
SHA256 (voadi-v0.3.tar.gz) = 87fe17bba2a7692bb7e88741e41f906f17267b0cf14100b7197bc3da5574455e
SIZE (voadi-v0.3.tar.gz) = 4810405

View File

@ -0,0 +1,3 @@
#!/bin/sh
exec %%LOCALBASE%%/bin/solarus-run %%DATADIR%%

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