*/*: sync with upstream

Taken from: HardenedBSD

accessibility/orca/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	orca
 PORTVERSION=	3.28.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

accessibility/orca/pkg-descr

@@ -2,6 +2,6 @@ Orca a scriptable screen reader that is currently under development.
 As such it is highly unstable and undergoes frequent changes.  To
 read more about Orca, please refer to the Orca documentation series
 available in the ./docs/doc-set directory and also the Orca WIKI at
-http://live.gnome.org/Orca.
+the URL below.
 
 WWW: http://live.gnome.org/Orca

archivers/snappy-java/Makefile

@@ -11,14 +11,14 @@ DISTVERSIONPREFIX=	snappy-java-
 PORTREVISION=	2
 CATEGORIES=	archivers java
 MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/snappy/snappy-1.0.4.tar.gz/b69151652e82168bc5c643bcd6f07162/:source2 \
-		LOCAL/jgh/archivers/${PORTNAME}/:source3
+		SF/bsdsrc/${.CURDIR:T}:source3
 PKGNAMESUFFIX=	java
 DISTFILES+=	snappy-${PORTVERSION:R}.tar.gz:source2 \
 		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz:source3
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz
 
-MAINTAINER=	[email protected]
+MAINTAINER=	[email protected]
 COMMENT=	Fast compressor/decompressor library
 
 LICENSE=	APACHE20

audio/Makefile

@@ -460,6 +460,7 @@
     SUBDIR += linux-c6-pulseaudio-utils
     SUBDIR += linux-c6-sdl_mixer
     SUBDIR += linux-c7-alsa-lib
+    SUBDIR += linux-c7-alsa-lib-devel
     SUBDIR += linux-c7-alsa-plugins-oss
     SUBDIR += linux-c7-alsa-plugins-pulseaudio
     SUBDIR += linux-c7-alsa-utils

audio/gbsplay/Makefile

@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gbsplay
-DISTVERSION=	0.0.93-130
+DISTVERSION=	0.0.93-151
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g6225989
+DISTVERSIONSUFFIX=	-ga7777f8
 PORTEPOCH=	1
 CATEGORIES=	audio
 

audio/gbsplay/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1545989371
-SHA256 (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 00bc00bbec4a66edef6dfd71df4c0b55c28fa9b65cc614381ae258576fdd1622
-SIZE (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 129907
+TIMESTAMP = 1567890902
+SHA256 (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 851145187f32fa04ba803a7f914e5b82bd9e80ed5dd35abc1c157fe19390bc7d
+SIZE (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 136054

audio/linux-c7-alsa-lib-devel/Makefile

@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	alsa-lib
+PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-2.el7
+CATEGORIES=	audio linux
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	[email protected]
+COMMENT=	Advanced Linux Sound Architecture headers (Linux CentOS ${LINUX_DIST_VER})
+
+LICENSE=	LGPL21+
+
+USES=		linux:c7
+USE_LINUX=	alsalib
+USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>

audio/linux-c7-alsa-lib-devel/distinfo

@@ -0,0 +1,7 @@
+TIMESTAMP = 1567880217
+SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 47cccf052146b269ba2c8dd269385fabade58450166eb640bfca6afff5792f85
+SIZE (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 984608
+SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 9ae063780b8652153fe4c58015d00f651577f105cc30c944c665e2a27602f8e6
+SIZE (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 984508
+SHA256 (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 56cb2556210f4443f4ef81074ae396f82ba7a0ba3d224065628baddb8c6a55ef
+SIZE (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 1028253

audio/linux-c7-alsa-plugins-oss/Makefile

@@ -4,29 +4,100 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
+MASTER_SITES=	CENTOS_LINUX
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/Source/SPackages/ \
+			centos/${LINUX_DIST_VER}/updates/Source/SPackages/
+PKGNAMEPREFIX=	linux-c7-
 PKGNAMESUFFIX=	-oss
+EXTRACT_SUFX=	.src.rpm
+DIST_SUBDIR=	centos
 
 MAINTAINER=	[email protected]
 COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
-LICENSE=	GPLv3
+LICENSE=	LGPL21+
 
-USES=		linux:c7
+USES=		autoreconf:build linux:c7
 USE_LDCONFIG=	yes
-USE_LINUX=	alsalib
-USE_LINUX_RPM=	yes
+USE_LINUX=	alsalib:build,run alsa-lib-devel:build devtools:build \
+		make:build
+USE_LINUX_PREFIX=yes
 
-LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+RPM_PATCHES=	alsa-plugins-1.1.6-post.patch \
+		alsa-plugins-1.1.6-speexdsp.patch
+CONFIG_ARGS=	--disable-static --disable-mix --disable-usbstream \
+		--disable-arcamav --disable-jack --disable-pulseaudio \
+		--disable-samplerate --disable-libav --disable-a52 \
+		--disable-lavrate --disable-speexdsp --with-speex=no
+CFLAGS+=	-DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR -DFREEBSD_OSS_BUFSZ_P2
+CFLAGS_amd64=	-nostdinc -isystem \
+		${LINUXBASE}/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include \
+		-isystem /usr/include
+CFLAGS_i386=	-nostdinc -isystem \
+		${LINUXBASE}/usr/lib/gcc/i686-redhat-linux/4.8.5/include \
+		-isystem /usr/include
+COMPAT32_CFLAGS_amd64=	-m32
+LIBDIR_amd64=	/usr/lib64
+LIBDIR_i386=	/usr/lib
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC32=	${WRKDIR}/32/${PORTNAME}-${PORTVERSION}
 
 CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+PLIST=		${PKGDIR}/pkg-plist.${ARCH}
 
-OPTIONS_DEFINE=	DOCS
+post-extract:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${MKDIR} ${WRKDIR}/32
+	@(cd ${WRKDIR}/32 && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		../${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
+.endif
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
 
-post-patch:
-	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/alsa
+do-patch:
+.for p in ${RPM_PATCHES}
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${PATCH} -d ${WRKSRC32} --forward --quiet -E -p1 < ${WRKDIR}/${p}
+.endif
+	@${PATCH} -d ${WRKSRC} --forward --quiet -E -p1 < ${WRKDIR}/${p}
+.endfor
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC32} --forward \
+		--quiet -E -p0
+.endif
+	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC} --forward \
+		--quiet -E -p0
+
+do-configure:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \
+		PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
+		${LINUXBASE}/bin/sh ./configure \
+		CFLAGS="${CFLAGS} ${COMPAT32_CFLAGS_${ARCH}}" ${CONFIG_ARGS})
+.endif
+	@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
+		PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
+		${LINUXBASE}/bin/sh ./configure --libdir ${LIBDIR_${ARCH}} \
+		CFLAGS="${CFLAGS}" ${CONFIG_ARGS})
+
+do-build:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make)
+.endif
+	@(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make)
+
+do-install:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make install-strip \
+		DESTDIR=${STAGEDIR}${LINUXBASE})
+	${RM} -r ${STAGEDIR}${LINUXBASE}/usr/lib/alsa-lib/*.la
+.endif
+	@(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make install-strip \
+		DESTDIR=${STAGEDIR}${LINUXBASE})
+	${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la
+	${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share
 
 .include <bsd.port.mk>

audio/linux-c7-alsa-plugins-oss/distinfo

@@ -1,7 +1,3 @@
-TIMESTAMP = 1556469061
-SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 4da7c5cd52caed8640db1cb1521c7c7ef837dd89272e93870a13d919f1db081a
-SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 32748
-SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = f7ebfb51012b6905e4e96eecfff1179cde32ade799c2eb7e740c3646146a70c3
-SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = 33236
+TIMESTAMP = 1567864839
 SHA256 (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = e01bf476f3117bc29276a24ddae250396b928dfe2755550ec234e6f77f43add0
 SIZE (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = 396174

audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c

@@ -0,0 +1,42 @@
+--- oss/ctl_oss.c.orig	2018-04-03 07:01:38 UTC
++++ oss/ctl_oss.c
+@@ -362,7 +362,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
+ {
+ 	snd_config_iterator_t it, next;
+ 	const char *device = "/dev/mixer";
++#ifndef FREEBSD_OSS
+ 	struct mixer_info mixinfo;
++#endif
+ 	int i, err, val;
+ 	snd_ctl_oss_t *oss;
+
+@@ -399,19 +401,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
+ 		goto error;
+ 	}
+
++#ifndef FREEBSD_OSS
+ 	if (ioctl(oss->fd, SOUND_MIXER_INFO, &mixinfo) < 0) {
+ 		err = -errno;
+ 		SNDERR("Cannot get mixer info for device %s", device);
+ 		goto error;
+ 	}
++#endif
+
+ 	oss->ext.version = SND_CTL_EXT_VERSION;
+ 	oss->ext.card_idx = 0; /* FIXME */
++#ifdef FREEBSD_OSS
++	strncpy(oss->ext.id, "fbsd", sizeof(oss->ext.id) - 1);
++	strcpy(oss->ext.driver, "FreeBSD/OSS plugin");
++	strncpy(oss->ext.name, "FreeBSD/OSS", sizeof(oss->ext.name) - 1);
++	strncpy(oss->ext.longname, "FreeBSD/OSS", sizeof(oss->ext.longname) - 1);
++	strncpy(oss->ext.mixername, "FreeBSD/OSS", sizeof(oss->ext.mixername) - 1);
++#else
+ 	strncpy(oss->ext.id, mixinfo.id, sizeof(oss->ext.id) - 1);
+ 	strcpy(oss->ext.driver, "OSS-Emulation");
+ 	strncpy(oss->ext.name, mixinfo.name, sizeof(oss->ext.name) - 1);
+ 	strncpy(oss->ext.longname, mixinfo.name, sizeof(oss->ext.longname) - 1);
+ 	strncpy(oss->ext.mixername, mixinfo.name, sizeof(oss->ext.mixername) - 1);
++#endif
+ 	oss->ext.poll_fd = -1;
+ 	oss->ext.callback = &oss_ext_callback;
+ 	oss->ext.private_data = oss;