- 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.

4 files changed, 11 insertions, 36 deletions

diff --git a/audio/linux-c7-libsndfile/Makefile b/audio/linux-c7-libsndfile/Makefile
index 3c19769a4f1a..a499b1719950 100644
--- a/audio/linux-c7-libsndfile/Makefile
+++ b/audio/linux-c7-libsndfile/Makefile
@@ -3,22 +3,19 @@
 
 PORTNAME=	libsndfile
 PORTVERSION=	1.0.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
-BIN_DISTFILES=	${PORTNAME}-utils-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
 
 CONTFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	10.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	flac libogg libvorbis
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/audio/linux-c7-libsndfile/distinfo.x86_64 b/audio/linux-c7-libsndfile/distinfo
index 30a7020be253..98b3bcd21c7f 100644
--- a/audio/linux-c7-libsndfile/distinfo.x86_64
+++ b/audio/linux-c7-libsndfile/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1482091724
+TIMESTAMP = 1485459653
 SHA256 (centos/libsndfile-1.0.25-10.el7.i686.rpm) = 1d8d3c9fb6fc12ffaacfe1f3330be92a90a269d6190192a28496c1193d86537d
 SIZE (centos/libsndfile-1.0.25-10.el7.i686.rpm) = 162888
 SHA256 (centos/libsndfile-1.0.25-10.el7.x86_64.rpm) = 50fad657626376fa5b8eca66fd5c9d549f5c036345f2458dc6b6f462c220e1b7
 SIZE (centos/libsndfile-1.0.25-10.el7.x86_64.rpm) = 152776
-SHA256 (centos/libsndfile-utils-1.0.25-10.el7.x86_64.rpm) = d80f4f78c24651b775895b40ad3ac8c80d63b8bbfb94880180500c68c667e91a
-SIZE (centos/libsndfile-utils-1.0.25-10.el7.x86_64.rpm) = 60344
 SHA256 (centos/libsndfile-1.0.25-10.el7.src.rpm) = 21628d8e805d912d8dfc705f3f0f6283d14c51f89fe62f60b8bbf7a688f778f5
 SIZE (centos/libsndfile-1.0.25-10.el7.src.rpm) = 1072937
diff --git a/audio/linux-c7-libsndfile/pkg-plist.amd64 b/audio/linux-c7-libsndfile/pkg-plist.amd64
new file mode 100644
index 000000000000..ec2dc4df0018
--- /dev/null
+++ b/audio/linux-c7-libsndfile/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/lib/libsndfile.so.1
+usr/lib/libsndfile.so.1.0.25
+usr/lib64/libsndfile.so.1
+usr/lib64/libsndfile.so.1.0.25
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c7-libsndfile/pkg-plist.x86_64 b/audio/linux-c7-libsndfile/pkg-plist.x86_64
deleted file mode 100644
index a848fe92b708..000000000000
--- a/audio/linux-c7-libsndfile/pkg-plist.x86_64
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/sndfile-cmp
-usr/bin/sndfile-concat
-usr/bin/sndfile-convert
-usr/bin/sndfile-deinterleave
-usr/bin/sndfile-info
-usr/bin/sndfile-interleave
-usr/bin/sndfile-metadata-get
-usr/bin/sndfile-metadata-set
-usr/bin/sndfile-play
-usr/bin/sndfile-regtest
-usr/bin/sndfile-salvage
-usr/lib/libsndfile.so.1
-usr/lib/libsndfile.so.1.0.25
-usr/lib64/libsndfile.so.1
-usr/lib64/libsndfile.so.1.0.25
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/man/man1/sndfile-cmp.1.gz
-usr/share/man/man1/sndfile-concat.1.gz
-usr/share/man/man1/sndfile-convert.1.gz
-usr/share/man/man1/sndfile-deinterleave.1.gz
-usr/share/man/man1/sndfile-info.1.gz
-usr/share/man/man1/sndfile-interleave.1.gz
-usr/share/man/man1/sndfile-metadata-get.1.gz
-usr/share/man/man1/sndfile-metadata-set.1.gz
-usr/share/man/man1/sndfile-play.1.gz