- 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, 4 insertions, 20 deletions

diff --git a/multimedia/linux-c7-libv4l/Makefile b/multimedia/linux-c7-libv4l/Makefile
index 5a6f70da50b9..7cd889b2cf5b 100644
--- a/multimedia/linux-c7-libv4l/Makefile
+++ b/multimedia/linux-c7-libv4l/Makefile
@@ -3,17 +3,18 @@
 
 PORTNAME=	libv4l
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia linux
-SRC_DISTFILES=	v4l-utils-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+SRC_DISTFILES=	v4l-utils-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Collection of video4linux support libraries (CentOS ${LINUX_DIST_VER})
+COMMENT=	Video4Linux library (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	LGPL20+
 
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	4.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
diff --git a/multimedia/linux-c7-libv4l/distinfo.x86_64 b/multimedia/linux-c7-libv4l/distinfo
index 9f1c9c66a07f..9f1c9c66a07f 100644
--- a/multimedia/linux-c7-libv4l/distinfo.x86_64
+++ b/multimedia/linux-c7-libv4l/distinfo
diff --git a/multimedia/linux-c7-libv4l/pkg-descr b/multimedia/linux-c7-libv4l/pkg-descr
deleted file mode 100644
index 2426783acae1..000000000000
--- a/multimedia/linux-c7-libv4l/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-libv4l is a collection of libraries which adds a thin abstraction layer on
-top of video4linux2 devices. The purpose of this (thin) layer is to make it
-easy for application writers to support a wide variety of devices without
-having to write separate code for different devices in the same class. libv4l
-consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
-libv4lconvert offers functions to convert from any (known) pixel-format
-to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420.
-
-libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
-of the drivers for those devices supporting v4l1 compatibility (which many
-v4l2 drivers do not).
-
-libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
-application transparent libv4lconvert conversion where necessary.
-
-WWW: http://hansdegoede.livejournal.com/3636.html
diff --git a/multimedia/linux-c7-libv4l/pkg-plist.x86_64 b/multimedia/linux-c7-libv4l/pkg-plist.amd64
index e0da517f9866..e0da517f9866 100644
--- a/multimedia/linux-c7-libv4l/pkg-plist.x86_64
+++ b/multimedia/linux-c7-libv4l/pkg-plist.amd64