From 6140d3c6aada863a40f9075019eb0f48789cd48f Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 31 Jan 2017 16:54:21 +0000 Subject: - Autodetect the installed linux_base port and use LINUX_DEFAULT only as a last resort. - Construct a list of DISTFILES for every architecture (amd64, i386). Select one list for regular make and all lists for make makesum so linux ports can have one combined distinfo file. - Set DIST_SUBDIR?=centos so there's only one copy of common distfiles. - Use MASTER_SITES and DISTFILES groups so make fetch is a bit smarter. - Regenerate all distinfo files. - For linux_base-c6 (just like linux_base-c7 already does) turn bin, lib, lib64 and sbin into symbolic links to the same directory under usr. This fixes the problem where some programs/libraries exist under / on FreeBSD and /usr on Linux or vice versa and then depending on the order of search paths Linux programs may run/load FreeBSD programs/libraries and fail. - Turn usr/share/icons into a symbolic link to LOCALBASE/share/icons so Linux programs can find desktop theme icons. This eliminates the need for x11-themes/linux*-hicolor-icon-theme. - Rename pkg-plist.x86_64 to pkg-plist.amd64. - Regenerate all pkg-plist files. - Add @preexec to linux_base pkg-plist that moves existing files in bin, lib, lib64, sbin and icons to the new destination before the directories are turned into symbolic links. - Remove several empty directories from linux_base ports. - Sweep over all linux ports: use consistent style, remove old CONFLICTS, remove unused pkg-descr files, add NLS option,... - Remove old linux arts, esound and openssl-compat ports. --- audio/linux-c7-alsa-plugins-pulseaudio/Makefile | 11 +++++++---- audio/linux-c7-alsa-plugins-pulseaudio/distinfo | 7 +++++++ audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 | 7 ------- audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr | 4 ---- audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 | 11 +++++++++++ audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 | 11 ----------- 6 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 audio/linux-c7-alsa-plugins-pulseaudio/distinfo delete mode 100644 audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 delete mode 100644 audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr create mode 100644 audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 delete mode 100644 audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 (limited to 'audio/linux-c7-alsa-plugins-pulseaudio') diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile index a7eec15fff35..a331ec48e4a6 100644 --- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile +++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile @@ -1,19 +1,22 @@ # Created by: Piotr Kubaj # $FreeBSD$ -PORTNAME= alsa-plugins-pulseaudio +PORTNAME= alsa-plugins PORTVERSION= 1.1.1 CATEGORIES= audio linux +PKGNAMESUFFIX= -pulseaudio +LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} MAINTAINER= emulation@FreeBSD.org COMMENT= PulseAudio plugin for ALSA (Linux CentOS ${LINUX_DIST_VER}) LICENSE= GPLv3 -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* - -SRC_DISTFILES= alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE +CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr +DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} +LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX} RPMVERSION= 1.el7 USES= linux:c7 USE_LDCONFIG= yes diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/distinfo b/audio/linux-c7-alsa-plugins-pulseaudio/distinfo new file mode 100644 index 000000000000..f4960a1b3e46 --- /dev/null +++ b/audio/linux-c7-alsa-plugins-pulseaudio/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1482093193 +SHA256 (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.i686.rpm) = ce4695e6e77ad062c5e0a806eef925f0363a10bcaa89f8eeedd97027034cd2d4 +SIZE (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.i686.rpm) = 41344 +SHA256 (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.x86_64.rpm) = bcb33cec91ae5518ae68baac3d53e93b4062884d1f673066467ad110f2c97845 +SIZE (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.x86_64.rpm) = 42044 +SHA256 (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = db290b29cf2c95463a78de59bdabe4bf78391b03967c121f935bcd3274f2dff1 +SIZE (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = 381619 diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 b/audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 deleted file mode 100644 index f4960a1b3e46..000000000000 --- a/audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1482093193 -SHA256 (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.i686.rpm) = ce4695e6e77ad062c5e0a806eef925f0363a10bcaa89f8eeedd97027034cd2d4 -SIZE (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.i686.rpm) = 41344 -SHA256 (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.x86_64.rpm) = bcb33cec91ae5518ae68baac3d53e93b4062884d1f673066467ad110f2c97845 -SIZE (centos/alsa-plugins-pulseaudio-1.1.1-1.el7.x86_64.rpm) = 42044 -SHA256 (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = db290b29cf2c95463a78de59bdabe4bf78391b03967c121f935bcd3274f2dff1 -SIZE (centos/alsa-plugins-1.1.1-1.el7.src.rpm) = 381619 diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr deleted file mode 100644 index 9447636da467..000000000000 --- a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI -functionality to the Linux operating system. - -WWW: http://www.alsa-project.org/ diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 new file mode 100644 index 000000000000..5e08139f076c --- /dev/null +++ b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 @@ -0,0 +1,11 @@ +usr/lib/alsa-lib/libasound_module_conf_pulse.so +usr/lib/alsa-lib/libasound_module_ctl_pulse.so +usr/lib/alsa-lib/libasound_module_pcm_pulse.so +usr/lib64/alsa-lib/libasound_module_conf_pulse.so +usr/lib64/alsa-lib/libasound_module_ctl_pulse.so +usr/lib64/alsa-lib/libasound_module_pcm_pulse.so +usr/share/alsa/alsa.conf.d/50-pulseaudio.conf +usr/share/alsa/alsa.conf.d/99-pulseaudio-default.conf +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL +%%PORTDOCS%%%%DOCSDIR%%/README-pulse diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 deleted file mode 100644 index 5e08139f076c..000000000000 --- a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 +++ /dev/null @@ -1,11 +0,0 @@ -usr/lib/alsa-lib/libasound_module_conf_pulse.so -usr/lib/alsa-lib/libasound_module_ctl_pulse.so -usr/lib/alsa-lib/libasound_module_pcm_pulse.so -usr/lib64/alsa-lib/libasound_module_conf_pulse.so -usr/lib64/alsa-lib/libasound_module_ctl_pulse.so -usr/lib64/alsa-lib/libasound_module_pcm_pulse.so -usr/share/alsa/alsa.conf.d/50-pulseaudio.conf -usr/share/alsa/alsa.conf.d/99-pulseaudio-default.conf -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL -%%PORTDOCS%%%%DOCSDIR%%/README-pulse -- cgit v1.2.3