Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history 
Taken from: HardenedBSD
  • Loading branch information
@fichtner
fichtner committed Nov 11, 2018
1 parent 1c2ef78 commit 2d9c45e
Show file tree
Hide file tree
Showing 686 changed files with 3,298 additions and 3,551 deletions.
2 changes: 1 addition & 1 deletion accessibility/speech-dispatcher/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= speech-dispatcher
PORTVERSION= 0.8.6
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= accessibility audio
MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/

Expand Down
2 changes: 1 addition & 1 deletion archivers/fastjar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= fastjar
PORTVERSION= 0.93.20060808
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= archivers java
MASTER_SITES= LOCAL/maho/fastjar

Expand Down
1 change: 1 addition & 0 deletions archivers/gcpio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= cpio
PORTVERSION= 2.12
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= GNU
PKGNAMEPREFIX= g
Expand Down
1 change: 1 addition & 0 deletions archivers/gtar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= tar
PORTVERSION= 1.30
PORTREVISION= 1
CATEGORIES= archivers sysutils
MASTER_SITES= GNU
PKGNAMEPREFIX= g
Expand Down
1 change: 1 addition & 0 deletions archivers/gzip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= gzip
PORTVERSION= 1.9
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= GNU

Expand Down
1 change: 1 addition & 0 deletions archivers/lzip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= lzip
PORTVERSION= 1.19
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= SAVANNAH/lzip

Expand Down
1 change: 1 addition & 0 deletions archivers/lzlib/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= lzlib
PORTVERSION= 1.9
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= SAVANNAH/lzip/lzlib

Expand Down
1 change: 1 addition & 0 deletions archivers/plzip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= plzip
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= SAVANNAH/lzip/${PORTNAME}

Expand Down
2 changes: 1 addition & 1 deletion archivers/sharutils/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= sharutils
PORTVERSION= 4.15.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= GNU

Expand Down
1 change: 1 addition & 0 deletions archivers/zutils/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= zutils
PORTVERSION= 1.7
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= SAVANNAH/zutils
EXTRACT_SUFX= .tar.lz
Expand Down
2 changes: 1 addition & 1 deletion astro/foxtrotgps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= foxtrotgps
PORTVERSION= 1.2.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= astro geography
MASTER_SITES= http://www.foxtrotgps.org/releases/

Expand Down
2 changes: 1 addition & 1 deletion audio/beets/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_
FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg
GMUSIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmusicapi>=0:audio/py-gmusicapi@${PY_FLAVOR}
IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick
IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6
IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go
KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR}
Expand Down
2 changes: 1 addition & 1 deletion audio/emms/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= emms
DISTVERSION= 5.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio elisp
MASTER_SITES= GNU
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
Expand Down
8 changes: 5 additions & 3 deletions audio/emms/files/patch-Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
--- Makefile.orig 2018-01-06 17:26:53 UTC
--- Makefile.orig 2018-05-01 18:43:15 UTC
+++ Makefile
@@ -10,13 +10,13 @@ ALLCOMPILED=$(wildcard $(LISPDIR)/*.elc)
@@ -9,14 +9,14 @@ ALLCOMPILED=$(wildcard $(LISPDIR)/*.elc)

DESTDIR=
PREFIX=$(DESTDIR)/usr/local
INFODIR=$(PREFIX)/info
-INFODIR=$(PREFIX)/info
-MAN1DIR=$(PREFIX)/share/man/man1
+INFODIR=$(PREFIX)/share/info
+MAN1DIR=$(PREFIX)/man/man1
BINDIR=$(PREFIX)/bin
SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
Expand Down
2 changes: 1 addition & 1 deletion audio/festival-freebsoft-utils/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= festival-freebsoft-utils
PORTVERSION= 0.10
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio accessibility
MASTER_SITES= http://www.freebsoft.org/pub/projects/${PORTNAME}/

Expand Down
2 changes: 1 addition & 1 deletion audio/gnupod/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gnupod
PORTVERSION= 0.99.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio perl5
MASTER_SITES= SAVANNAH \
http://www.blinkenlights.ch/gnupod-dist/stable/
Expand Down
2 changes: 1 addition & 1 deletion audio/kwave/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CATEGORIES= audio kde kde-applications
MAINTAINER= [email protected]
COMMENT= Sound editor for KDE

BUILD_DEPENDS= convert:graphics/ImageMagick
BUILD_DEPENDS= convert:graphics/ImageMagick6
LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \
libFLAC.so:audio/flac \
libfftw3.so:math/fftw3 \
Expand Down
1 change: 1 addition & 0 deletions audio/libadplug/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
PORTNAME= adplug
PORTVERSION= 2.3.1
DISTVERSIONPREFIX= ${PORTNAME}-
PORTREVISION= 1
CATEGORIES= audio
PKGNAMEPREFIX= lib

Expand Down
1 change: 1 addition & 0 deletions audio/libmikmod/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= libmikmod
PORTVERSION= 3.3.11.1
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/mikmod/libmikmod/${PORTVERSION}/

Expand Down
2 changes: 1 addition & 1 deletion audio/mp3plot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
GD_CONFIGURE_ENABLE= gd
GD_LIB_DEPENDS= libgd.so:graphics/gd
IMAGEMAGICK_CONFIGURE_ENABLE= magick
IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick
IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick6

post-patch:
@${REINPLACE_CMD} -e '/bldtype_/s|-O2||g; s|^extra_LD.*||g' ${WRKSRC}/configure
Expand Down
20 changes: 9 additions & 11 deletions audio/musicpc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= musicpc
DISTVERSION= 0.30
DISTVERSION= 0.31
CATEGORIES= audio ipv6
MASTER_SITES= http://www.musicpd.org/download/mpc/0/
DISTNAME= mpc-${PORTVERSION}
Expand All @@ -18,21 +18,19 @@ LIB_DEPENDS= libmpdclient.so:audio/libmpdclient
USES= meson pkgconfig tar:xz
MESON_ARGS= --mandir=${MANPREFIX}

PLIST_FILES= bin/mpc
OPTIONS_DEFINE= DOCS ICONV
OPTIONS_DEFAULT= DOCS ICONV

OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES ICONV
OPTIONS_DEFAULT= MANPAGES ICONV

MANPAGES_USES= python:env
MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
MANPAGES_MESON_TRUE= use_sphinx
MANPAGES_PLIST_FILES= man/man1/mpc.1.gz
DOCS_USES= python:env
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
DOCS_MESON_ON= -Ddocumentation=enabled
DOCS_MESON_OFF= -Ddocumentation=disabled

ICONV_USES= iconv
ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
ICONV_MESON_TRUE= iconv
ICONV_MESON_ON= -Diconv=enabled
ICONV_MESON_OFF= -Diconv=disabled

PORTDOCS= AUTHORS README.rst NEWS
PORTEXAMPLES= *

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions audio/musicpc/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1529036000
SHA256 (mpc-0.30.tar.xz) = 65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce
SIZE (mpc-0.30.tar.xz) = 41968
TIMESTAMP = 1540994707
SHA256 (mpc-0.31.tar.xz) = 62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d
SIZE (mpc-0.31.tar.xz) = 43896
49 changes: 8 additions & 41 deletions audio/musicpc/files/patch-doc_meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,9 @@
--- doc/meson.build.orig 2018-06-15 04:16:53 UTC
--- doc/meson.build.orig 2018-10-24 08:31:33 UTC
+++ doc/meson.build
@@ -1,16 +1,19 @@
-sphinx = find_program('sphinx-build', required:false)
-
-if sphinx.found()
- custom_target(
- 'HTML documentation',
- output: 'html',
- input: ['index.rst', 'conf.py'],
- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
- build_by_default: true,
- install: true,
- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
- )
+use_sphinx = get_option('use_sphinx')

+if use_sphinx == 'false'
+ use_sphinx = false
+elif use_sphinx == 'true'
+ sphinx = find_program('sphinx-build', required:false)
+ if not sphinx.found()
+ error('can\'t find sphinx')
+ endif
+ use_sphinx = true
+else
+ sphinx = find_program('sphinx-build', required:false)
+ use_sphinx = sphinx.found()
+endif
+
+if use_sphinx
custom_target(
'Manpage documentation',
output: 'man',
@@ -18,6 +21,6 @@ if sphinx.found()
command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
build_by_default: true,
install: true,
- install_dir: get_option('datadir'),
+ install_dir: get_option('mandir'),
)
endif
@@ -15,5 +15,5 @@ custom_target(
command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
build_by_default: true,
install: true,
- install_dir: get_option('datadir'),
+ install_dir: get_option('mandir'),
)
8 changes: 4 additions & 4 deletions audio/musicpc/files/patch-meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
--- meson.build.orig 2018-05-03 10:27:29 UTC
--- meson.build.orig 2018-10-24 08:31:33 UTC
+++ meson.build
@@ -1,4 +1,4 @@
-project('mpc', 'c',
+project('musicpc', 'c',
version: '0.30',
version: '0.31',
meson_version: '>= 0.47',
default_options: [
'c_std=c99',
@@ -101,13 +101,13 @@ executable('mpc',
@@ -109,13 +109,13 @@ executable('mpc',
install: true
)

Expand Down
14 changes: 0 additions & 14 deletions audio/musicpc/files/patch-meson__options.txt
View file

This file was deleted.

30 changes: 30 additions & 0 deletions audio/musicpc/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
bin/mpc
%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css
%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
%%PORTDOCS%%man/man1/mpc.1.gz
2 changes: 1 addition & 1 deletion audio/ocp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= ocp
PORTVERSION= 0.1.21
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= SF/opencubicplayer/${DISTNAME} \
Expand Down
1 change: 1 addition & 0 deletions audio/rplay/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib

INFO= RPLAY RPTP librplay rplayd
MAKE_ARGS= infodir=${PREFIX}/${INFO_PATH}

.include <bsd.port.pre.mk>

Expand Down
2 changes: 1 addition & 1 deletion audio/xhippo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= xhippo
PORTVERSION= 3.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= GNU

Expand Down
1 change: 1 addition & 0 deletions benchmarks/netperf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= netperf
PORTVERSION= 2.7.1.p20170921
PORTREVISION= 1
CATEGORIES= benchmarks ipv6

MAINTAINER= [email protected]
Expand Down
2 changes: 1 addition & 1 deletion cad/dinotrace/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= dinotrace
PORTVERSION= 9.4c
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= cad
MASTER_SITES= http://www.veripool.org/ftp/
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion cad/freehdl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= freehdl
PORTVERSION= 0.0.7
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= cad
MASTER_SITES= http://freehdl.seul.org/~enaroska/

Expand Down
2 changes: 1 addition & 1 deletion cad/fritzing/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LICENSE= GPLv2+

SUB_FILES+= pkg-install

USES= dos2unix gmake python qmake qt:5 tar:bzip2
USES= compiler:c++11-lang dos2unix gmake python qmake qt:5 tar:bzip2
USE_QT= buildtools concurrent core dbus gui imageformats network printsupport qmake serialport sql-sqlite3 svg xml
DOS2UNIX_REGEX= .*pro
INSTALLS_ICONS= yes
Expand Down
Loading

0 comments on commit 2d9c45e

Please sign in to comment.