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

3 files changed, 7 insertions, 6 deletions

diff --git a/audio/linux-c7-sdl_mixer/Makefile b/audio/linux-c7-sdl_mixer/Makefile
index 94846887a436..bfda95569d52 100644
--- a/audio/linux-c7-sdl_mixer/Makefile
+++ b/audio/linux-c7-sdl_mixer/Makefile
@@ -6,14 +6,16 @@ PORTVERSION=	1.2.12
 PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL7/s
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
-LINUX_NAME=	SDL_mixer
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	SDL_mixer
 ONLY_FOR_ARCHS=	amd64
 RPMVERSION=	4.el7
 USES=		linux:c7
@@ -21,8 +23,4 @@ USE_LDCONFIG=	yes
 USE_LINUX=	sdl12
 USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS=	CHANGES COPYING README
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/audio/linux-c7-sdl_mixer/distinfo.x86_64 b/audio/linux-c7-sdl_mixer/distinfo
index 6071ed9c5b00..6071ed9c5b00 100644
--- a/audio/linux-c7-sdl_mixer/distinfo.x86_64
+++ b/audio/linux-c7-sdl_mixer/distinfo
diff --git a/audio/linux-c7-sdl_mixer/pkg-plist.x86_64 b/audio/linux-c7-sdl_mixer/pkg-plist.amd64
index 4639ff0828a3..27bb5cbc4836 100644
--- a/audio/linux-c7-sdl_mixer/pkg-plist.x86_64
+++ b/audio/linux-c7-sdl_mixer/pkg-plist.amd64
@@ -2,3 +2,6 @@ usr/bin/playmus
 usr/bin/playwave
 usr/lib64/libSDL_mixer-1.2.so.0
 usr/lib64/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README