aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/linux-c6-atk/Makefile3
-rw-r--r--accessibility/linux-c7-atk/Makefile6
-rw-r--r--audio/linux-c6-alsa-lib/Makefile3
-rw-r--r--audio/linux-c6-alsa-plugins-oss/Makefile9
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/Makefile9
-rw-r--r--audio/linux-c6-alsa-utils/Makefile3
-rw-r--r--audio/linux-c6-flac/Makefile3
-rw-r--r--audio/linux-c6-libaudiofile/Makefile3
-rw-r--r--audio/linux-c6-libogg/Makefile3
-rw-r--r--audio/linux-c6-libsndfile/Makefile3
-rw-r--r--audio/linux-c6-libvorbis/Makefile3
-rw-r--r--audio/linux-c6-mikmod/Makefile3
-rw-r--r--audio/linux-c6-nas-libs/Makefile3
-rw-r--r--audio/linux-c6-openal-soft/Makefile3
-rw-r--r--audio/linux-c6-pulseaudio-libs/Makefile11
-rw-r--r--audio/linux-c6-pulseaudio-utils/Makefile7
-rw-r--r--audio/linux-c6-sdl_mixer/Makefile10
-rw-r--r--audio/linux-c7-alsa-lib/Makefile4
-rw-r--r--audio/linux-c7-alsa-plugins-oss/Makefile12
-rw-r--r--audio/linux-c7-alsa-plugins-pulseaudio/Makefile12
-rw-r--r--audio/linux-c7-alsa-utils/Makefile6
-rw-r--r--audio/linux-c7-audiofile/Makefile6
-rw-r--r--audio/linux-c7-flac/Makefile12
-rw-r--r--audio/linux-c7-libogg/Makefile6
-rw-r--r--audio/linux-c7-libsndfile/Makefile6
-rw-r--r--audio/linux-c7-libvorbis/Makefile6
-rw-r--r--audio/linux-c7-openal-soft/Makefile7
-rw-r--r--audio/linux-c7-pulseaudio-libs/Makefile14
-rw-r--r--audio/linux-c7-pulseaudio-utils/Makefile10
-rw-r--r--audio/linux-c7-sdl_mixer/Makefile12
-rw-r--r--converters/linux-c7-fribidi/Makefile3
-rw-r--r--databases/linux-c6-sqlite3/Makefile3
-rw-r--r--databases/linux-c7-sqlite3/Makefile6
-rw-r--r--devel/linux-c6-dbus-glib/Makefile3
-rw-r--r--devel/linux-c6-dbus-libs/Makefile7
-rw-r--r--devel/linux-c6-devtools/Makefile21
-rw-r--r--devel/linux-c6-icu/Makefile3
-rw-r--r--devel/linux-c6-libelf/Makefile7
-rw-r--r--devel/linux-c6-libgfortran/Makefile3
-rw-r--r--devel/linux-c6-libglade2/Makefile3
-rw-r--r--devel/linux-c6-libpciaccess/Makefile3
-rw-r--r--devel/linux-c6-libsigc++20/Makefile3
-rw-r--r--devel/linux-c6-libsoup/Makefile3
-rw-r--r--devel/linux-c6-libthai/Makefile3
-rw-r--r--devel/linux-c6-libunwind/Makefile3
-rw-r--r--devel/linux-c6-nspr/Makefile3
-rw-r--r--devel/linux-c6-qt47/Makefile3
-rw-r--r--devel/linux-c6-sdl12/Makefile8
-rw-r--r--devel/linux-c7-dbus-glib/Makefile6
-rw-r--r--devel/linux-c7-dbus-libs/Makefile12
-rw-r--r--devel/linux-c7-devtools/Makefile21
-rw-r--r--devel/linux-c7-icu/Makefile9
-rw-r--r--devel/linux-c7-libelf/Makefile4
-rw-r--r--devel/linux-c7-libgfortran/Makefile7
-rw-r--r--devel/linux-c7-libglade2/Makefile6
-rw-r--r--devel/linux-c7-libpciaccess/Makefile6
-rw-r--r--devel/linux-c7-libsigc++20/Makefile6
-rw-r--r--devel/linux-c7-libthai/Makefile6
-rw-r--r--devel/linux-c7-libunwind/Makefile3
-rw-r--r--devel/linux-c7-nspr/Makefile6
-rw-r--r--devel/linux-c7-qt/Makefile8
-rw-r--r--devel/linux-c7-sdl12/Makefile11
-rw-r--r--devel/linux-c7-sdl20/Makefile9
-rw-r--r--dns/linux-c7-libasyncns/Makefile4
-rw-r--r--emulators/linux_base-c6/Makefile14
-rw-r--r--emulators/linux_base-c7/Makefile16
-rw-r--r--ftp/linux-c6-curl/Makefile6
-rw-r--r--ftp/linux-c7-curl/Makefile9
-rw-r--r--graphics/linux-c6-cairo/Makefile3
-rw-r--r--graphics/linux-c6-dri/Makefile17
-rw-r--r--graphics/linux-c6-gdk-pixbuf2/Makefile3
-rw-r--r--graphics/linux-c6-glx-utils/Makefile3
-rw-r--r--graphics/linux-c6-jasper/Makefile7
-rw-r--r--graphics/linux-c6-jpeg/Makefile8
-rw-r--r--graphics/linux-c6-png/Makefile3
-rw-r--r--graphics/linux-c6-sdl_image/Makefile8
-rw-r--r--graphics/linux-c6-sdl_ttf/Makefile8
-rw-r--r--graphics/linux-c6-tiff/Makefile3
-rw-r--r--graphics/linux-c7-cairo/Makefile6
-rw-r--r--graphics/linux-c7-dri/Makefile17
-rw-r--r--graphics/linux-c7-gdk-pixbuf2/Makefile6
-rw-r--r--graphics/linux-c7-glx-utils/Makefile7
-rw-r--r--graphics/linux-c7-graphite2/Makefile3
-rw-r--r--graphics/linux-c7-jasper/Makefile9
-rw-r--r--graphics/linux-c7-jbigkit/Makefile9
-rw-r--r--graphics/linux-c7-jpeg/Makefile11
-rw-r--r--graphics/linux-c7-libglvnd/Makefile11
-rw-r--r--graphics/linux-c7-png/Makefile6
-rw-r--r--graphics/linux-c7-sdl_image/Makefile12
-rw-r--r--graphics/linux-c7-sdl_ttf/Makefile12
-rw-r--r--graphics/linux-c7-tiff/Makefile6
-rw-r--r--graphics/linux-c7-wayland/Makefile12
-rw-r--r--lang/linux-c6-tcl85/Makefile5
-rw-r--r--lang/linux-c7-tcl85/Makefile8
-rw-r--r--multimedia/linux-c6-libtheora/Makefile3
-rw-r--r--multimedia/linux-c6-libv4l/Makefile3
-rw-r--r--multimedia/linux-c7-libtheora/Makefile6
-rw-r--r--multimedia/linux-c7-libv4l/Makefile9
-rw-r--r--net/linux-c6-avahi-libs/Makefile7
-rw-r--r--net/linux-c6-openldap/Makefile3
-rw-r--r--net/linux-c6-tcp_wrappers-libs/Makefile7
-rw-r--r--net/linux-c7-avahi-libs/Makefile10
-rw-r--r--net/linux-c7-openldap/Makefile6
-rw-r--r--net/linux-c7-tcp_wrappers-libs/Makefile10
-rw-r--r--print/linux-c6-cups-libs/Makefile7
-rw-r--r--print/linux-c7-cups-libs/Makefile12
-rw-r--r--print/linux-c7-freetype/Makefile3
-rw-r--r--print/linux-c7-harfbuzz/Makefile3
-rw-r--r--security/linux-c6-cyrus-sasl2/Makefile9
-rw-r--r--security/linux-c6-gnutls/Makefile3
-rw-r--r--security/linux-c6-libgcrypt/Makefile3
-rw-r--r--security/linux-c6-libgpg-error/Makefile3
-rw-r--r--security/linux-c6-libssh2/Makefile3
-rw-r--r--security/linux-c6-libtasn1/Makefile3
-rw-r--r--security/linux-c6-nss/Makefile16
-rw-r--r--security/linux-c6-openssl/Makefile3
-rw-r--r--security/linux-c7-cyrus-sasl2/Makefile12
-rw-r--r--security/linux-c7-gnutls/Makefile6
-rw-r--r--security/linux-c7-libgcrypt/Makefile6
-rw-r--r--security/linux-c7-libgpg-error/Makefile6
-rw-r--r--security/linux-c7-libssh2/Makefile6
-rw-r--r--security/linux-c7-libtasn1/Makefile9
-rw-r--r--security/linux-c7-nettle/Makefile3
-rw-r--r--security/linux-c7-nss/Makefile17
-rw-r--r--security/linux-c7-openssl/Makefile14
-rw-r--r--security/linux-c7-p11-kit/Makefile3
-rw-r--r--security/linux-c7-trousers/Makefile3
-rw-r--r--sysutils/linux-c6-lttng-ust/Makefile5
-rw-r--r--sysutils/linux-c6-userspace-rcu/Makefile3
-rw-r--r--sysutils/linux-c7-lttng-ust/Makefile6
-rw-r--r--sysutils/linux-c7-userspace-rcu/Makefile4
-rw-r--r--textproc/linux-c6-aspell/Makefile3
-rw-r--r--textproc/linux-c6-expat/Makefile3
-rw-r--r--textproc/linux-c6-libxml2/Makefile3
-rw-r--r--textproc/linux-c7-aspell/Makefile6
-rw-r--r--textproc/linux-c7-expat/Makefile6
-rw-r--r--textproc/linux-c7-libxml2/Makefile6
-rw-r--r--www/linux-c6-qt47-webkit/Makefile6
-rw-r--r--www/linux-c7-qtwebkit/Makefile7
-rw-r--r--x11-fonts/linux-c6-fontconfig/Makefile3
-rw-r--r--x11-fonts/linux-c7-fontconfig/Makefile6
-rw-r--r--x11-toolkits/linux-c6-gtk2/Makefile10
-rw-r--r--x11-toolkits/linux-c6-openmotif/Makefile3
-rw-r--r--x11-toolkits/linux-c6-pango/Makefile3
-rw-r--r--x11-toolkits/linux-c6-qt47-x11/Makefile8
-rw-r--r--x11-toolkits/linux-c6-tk85/Makefile5
-rw-r--r--x11-toolkits/linux-c7-gtk2/Makefile11
-rw-r--r--x11-toolkits/linux-c7-openmotif/Makefile6
-rw-r--r--x11-toolkits/linux-c7-pango/Makefile6
-rw-r--r--x11-toolkits/linux-c7-qt-x11/Makefile12
-rw-r--r--x11-toolkits/linux-c7-tk85/Makefile8
-rw-r--r--x11/linux-c6-pixman/Makefile3
-rw-r--r--x11/linux-c6-xorg-libs/Makefile17
-rw-r--r--x11/linux-c7-pixman/Makefile3
-rw-r--r--x11/linux-c7-xorg-libs/Makefile17
155 files changed, 579 insertions, 475 deletions
diff --git a/accessibility/linux-c6-atk/Makefile b/accessibility/linux-c6-atk/Makefile
index fa95cf2501a9..f19ab14adb73 100644
--- a/accessibility/linux-c6-atk/Makefile
+++ b/accessibility/linux-c6-atk/Makefile
@@ -12,11 +12,12 @@ COMMENT= Accessibility Toolkit (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/accessibility/linux-c7-atk/Makefile b/accessibility/linux-c7-atk/Makefile
index d7abdee1c715..ff2635e581d5 100644
--- a/accessibility/linux-c7-atk/Makefile
+++ b/accessibility/linux-c7-atk/Makefile
@@ -11,13 +11,13 @@ COMMENT= Accessibility Toolkit (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile
index 33c76acd9a6b..2c7ca66cf07e 100644
--- a/audio/linux-c6-alsa-lib/Makefile
+++ b/audio/linux-c6-alsa-lib/Makefile
@@ -14,11 +14,12 @@ LICENSE= GPLv3
RUN_DEPENDS= alsa-lib>0:audio/alsa-lib
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/audio/linux-c6-alsa-plugins-oss/Makefile b/audio/linux-c6-alsa-plugins-oss/Makefile
index 1ee47037ea86..5c40dc9cbdbd 100644
--- a/audio/linux-c6-alsa-plugins-oss/Makefile
+++ b/audio/linux-c6-alsa-plugins-oss/Makefile
@@ -7,21 +7,22 @@ DISTVERSIONSUFFIX= -1.el6
PORTREVISION= 3
CATEGORIES= audio linux
PKGNAMESUFFIX= -oss
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= alsalib
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
index 8bd0db6260f7..c361fe9a2959 100644
--- a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
@@ -7,21 +7,22 @@ DISTVERSIONSUFFIX= -1.el6
PORTREVISION= 4
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
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= alsalib pulseaudio-libs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-utils/Makefile b/audio/linux-c6-alsa-utils/Makefile
index a7a8b1430c5b..6462c6a1ebfe 100644
--- a/audio/linux-c6-alsa-utils/Makefile
+++ b/audio/linux-c6-alsa-utils/Makefile
@@ -12,11 +12,12 @@ COMMENT= Advanced Linux Sound Architecture utilities (Linux CentOS ${LINUX_DIST_
LICENSE= GPLv3
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LINUX= alsalib alsa-plugins-oss
USE_LINUX_RPM= nolib
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/audio/linux-c6-flac/Makefile b/audio/linux-c6-flac/Makefile
index 2ddae476cd05..251f5ec6da1e 100644
--- a/audio/linux-c6-flac/Makefile
+++ b/audio/linux-c6-flac/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libaudiofile/Makefile b/audio/linux-c6-libaudiofile/Makefile
index 68d5a2bac28a..8424e4fe2e8c 100644
--- a/audio/linux-c6-libaudiofile/Makefile
+++ b/audio/linux-c6-libaudiofile/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libogg/Makefile b/audio/linux-c6-libogg/Makefile
index 3e64602dadd5..19b4a8098ae6 100644
--- a/audio/linux-c6-libogg/Makefile
+++ b/audio/linux-c6-libogg/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libsndfile/Makefile b/audio/linux-c6-libsndfile/Makefile
index f40c1124deb5..73cfd1f3efcc 100644
--- a/audio/linux-c6-libsndfile/Makefile
+++ b/audio/linux-c6-libsndfile/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= flac libogg libvorbis
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libvorbis/Makefile b/audio/linux-c6-libvorbis/Makefile
index b121cad47578..37d467244444 100644
--- a/audio/linux-c6-libvorbis/Makefile
+++ b/audio/linux-c6-libvorbis/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-mikmod/Makefile b/audio/linux-c6-mikmod/Makefile
index 22db21e70a72..cfbd3fa87f61 100644
--- a/audio/linux-c6-mikmod/Makefile
+++ b/audio/linux-c6-mikmod/Makefile
@@ -11,11 +11,12 @@ MASTER_SITES= EPEL/l
MAINTAINER= emulation@FreeBSD.org
COMMENT= MikMod Sound Library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-nas-libs/Makefile b/audio/linux-c6-nas-libs/Makefile
index da63865b9a9d..2698b52564a5 100644
--- a/audio/linux-c6-nas-libs/Makefile
+++ b/audio/linux-c6-nas-libs/Makefile
@@ -11,12 +11,13 @@ MASTER_SITES= EPEL/n
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Audio System (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/audio/linux-c6-openal-soft/Makefile b/audio/linux-c6-openal-soft/Makefile
index d597161ec950..6d1ea7f30a91 100644
--- a/audio/linux-c6-openal-soft/Makefile
+++ b/audio/linux-c6-openal-soft/Makefile
@@ -11,12 +11,13 @@ MASTER_SITES= EPEL/o
MAINTAINER= emulation@FreeBSD.org
COMMENT= 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= alsalib
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c6-pulseaudio-libs/Makefile b/audio/linux-c6-pulseaudio-libs/Makefile
index bf6bd8a3a0e2..a579d0f010ce 100644
--- a/audio/linux-c6-pulseaudio-libs/Makefile
+++ b/audio/linux-c6-pulseaudio-libs/Makefile
@@ -7,20 +7,21 @@ DISTVERSIONSUFFIX= -26.el6
PORTREVISION= 7
CATEGORIES= audio linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} \
- ${LINUXNAME}-glib2-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
+ ${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/audio/linux-c6-pulseaudio-utils/Makefile b/audio/linux-c6-pulseaudio-utils/Makefile
index 8f3a4e849819..3423fc0293ae 100644
--- a/audio/linux-c6-pulseaudio-utils/Makefile
+++ b/audio/linux-c6-pulseaudio-utils/Makefile
@@ -7,16 +7,17 @@ DISTVERSIONSUFFIX= -26.el6
PORTREVISION= 6
CATEGORIES= audio linux
PKGNAMESUFFIX= -utils
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs pulseaudio-libs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/audio/linux-c6-sdl_mixer/Makefile b/audio/linux-c6-sdl_mixer/Makefile
index 4905e9ebcb3e..aaf92cef2645 100644
--- a/audio/linux-c6-sdl_mixer/Makefile
+++ b/audio/linux-c6-sdl_mixer/Makefile
@@ -7,21 +7,19 @@ DISTVERSIONSUFFIX= -1.el6
PORTREVISION= 5
CATEGORIES= audio linux
MASTER_SITES= EPEL/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_mixer-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_mixer
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= sdl12
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-lib/Makefile b/audio/linux-c7-alsa-lib/Makefile
index 786ae19f8a9c..1affe9b4eb7b 100644
--- a/audio/linux-c7-alsa-lib/Makefile
+++ b/audio/linux-c7-alsa-lib/Makefile
@@ -13,12 +13,12 @@ LICENSE= GPLv3
RUN_DEPENDS= alsa-lib>0:audio/alsa-lib
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile
index 455cf70707e2..03ee546da129 100644
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@@ -6,23 +6,23 @@ PORTVERSION= 1.1.6
DISTVERSIONSUFFIX= -1.el7
CATEGORIES= audio linux
PKGNAMESUFFIX= -oss
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= alsalib
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
index 9c139b505252..b122fb6f4f72 100644
--- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
@@ -6,23 +6,23 @@ PORTVERSION= 1.1.6
DISTVERSIONSUFFIX= -1.el7
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-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= alsalib pulseaudio-libs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-utils/Makefile b/audio/linux-c7-alsa-utils/Makefile
index 1742dd4ac82d..a81a3ba79dd3 100644
--- a/audio/linux-c7-alsa-utils/Makefile
+++ b/audio/linux-c7-alsa-utils/Makefile
@@ -11,13 +11,13 @@ COMMENT= Advanced Linux Sound Architecture utilities (Linux CentOS ${LINUX_DIST_
LICENSE= GPLv3
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LINUX= alsalib alsa-plugins-oss
USE_LINUX_RPM= nolib
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/audio/linux-c7-audiofile/Makefile b/audio/linux-c7-audiofile/Makefile
index f29fe9f9308e..4ac0c49ae182 100644
--- a/audio/linux-c7-audiofile/Makefile
+++ b/audio/linux-c7-audiofile/Makefile
@@ -10,13 +10,13 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Implementation of the Audio File Library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-flac/Makefile b/audio/linux-c7-flac/Makefile
index 58cf7ca730e3..8b01f7511670 100644
--- a/audio/linux-c7-flac/Makefile
+++ b/audio/linux-c7-flac/Makefile
@@ -7,21 +7,21 @@ DISTVERSIONSUFFIX= -5.el7_1
PORTREVISION= 2
CATEGORIES= audio linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libogg/Makefile b/audio/linux-c7-libogg/Makefile
index 9777c124c353..6f92cf83d0a7 100644
--- a/audio/linux-c7-libogg/Makefile
+++ b/audio/linux-c7-libogg/Makefile
@@ -10,13 +10,13 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libsndfile/Makefile b/audio/linux-c7-libsndfile/Makefile
index 340eb0ca1e4a..fbb1d11331ac 100644
--- a/audio/linux-c7-libsndfile/Makefile
+++ b/audio/linux-c7-libsndfile/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= flac libogg libvorbis
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libvorbis/Makefile b/audio/linux-c7-libvorbis/Makefile
index af6e8b522573..5ebd2df217cd 100644
--- a/audio/linux-c7-libvorbis/Makefile
+++ b/audio/linux-c7-libvorbis/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-openal-soft/Makefile b/audio/linux-c7-openal-soft/Makefile
index c48a07768292..99c1dfe8b4be 100644
--- a/audio/linux-c7-openal-soft/Makefile
+++ b/audio/linux-c7-openal-soft/Makefile
@@ -11,15 +11,16 @@ MASTER_SITES= EPEL7/o
MAINTAINER= emulation@FreeBSD.org
COMMENT= 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= alsalib
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/audio/linux-c7-pulseaudio-libs/Makefile b/audio/linux-c7-pulseaudio-libs/Makefile
index f63f7902a2b6..23334e5ea18f 100644
--- a/audio/linux-c7-pulseaudio-libs/Makefile
+++ b/audio/linux-c7-pulseaudio-libs/Makefile
@@ -7,22 +7,22 @@ DISTVERSIONSUFFIX= -5.el7
PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} \
- ${LINUXNAME}-glib2-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
+ ${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/audio/linux-c7-pulseaudio-utils/Makefile b/audio/linux-c7-pulseaudio-utils/Makefile
index 88c682c8bbcc..7402c4d24439 100644
--- a/audio/linux-c7-pulseaudio-utils/Makefile
+++ b/audio/linux-c7-pulseaudio-utils/Makefile
@@ -7,18 +7,18 @@ DISTVERSIONSUFFIX= -5.el7
PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMESUFFIX= -utils
-BIN_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs pulseaudio-libs
USE_LINUX_RPM= nolib
+BIN_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/audio/linux-c7-sdl_mixer/Makefile b/audio/linux-c7-sdl_mixer/Makefile
index 588910761a44..4e8fa2e2a92f 100644
--- a/audio/linux-c7-sdl_mixer/Makefile
+++ b/audio/linux-c7-sdl_mixer/Makefile
@@ -7,22 +7,22 @@ DISTVERSIONSUFFIX= -4.el7
PORTREVISION= 1
CATEGORIES= audio linux
MASTER_SITES= EPEL7/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_mixer-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_mixer
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= sdl12
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/converters/linux-c7-fribidi/Makefile b/converters/linux-c7-fribidi/Makefile
index 65ad5a259de5..8219c2de1fcb 100644
--- a/converters/linux-c7-fribidi/Makefile
+++ b/converters/linux-c7-fribidi/Makefile
@@ -8,11 +8,12 @@ CATEGORIES= converters linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Unicode Bidirectional Algorithm (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/databases/linux-c6-sqlite3/Makefile b/databases/linux-c6-sqlite3/Makefile
index ba53d5395fd1..235b97a5874e 100644
--- a/databases/linux-c6-sqlite3/Makefile
+++ b/databases/linux-c6-sqlite3/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= databases linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library that implements an embeddable SQL database engine (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile
index 68e2ae62afdd..46e35183ec73 100644
--- a/databases/linux-c7-sqlite3/Makefile
+++ b/databases/linux-c7-sqlite3/Makefile
@@ -12,13 +12,13 @@ COMMENT= Library that implements an embeddable SQL database engine (Linux CentOS
LICENSE= PD
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-dbus-glib/Makefile b/devel/linux-c6-dbus-glib/Makefile
index 6ae0e4c56d65..491badc1b7d4 100644
--- a/devel/linux-c6-dbus-glib/Makefile
+++ b/devel/linux-c6-dbus-glib/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= dbuslibs expat
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-dbus-libs/Makefile b/devel/linux-c6-dbus-libs/Makefile
index 5fc83b03a1a7..23afe1b2b911 100644
--- a/devel/linux-c6-dbus-libs/Makefile
+++ b/devel/linux-c6-dbus-libs/Makefile
@@ -7,15 +7,16 @@ DISTVERSIONSUFFIX= -9.el6
PORTREVISION= 7
CATEGORIES= devel linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for accessing D-BUS (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/devel/linux-c6-devtools/Makefile b/devel/linux-c6-devtools/Makefile
index 4fb4733ac333..0795836daa3e 100644
--- a/devel/linux-c6-devtools/Makefile
+++ b/devel/linux-c6-devtools/Makefile
@@ -5,6 +5,17 @@ PORTNAME= devtools
PORTVERSION= ${LINUX_DIST_VER}
PORTREVISION= 3
CATEGORIES= devel
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
+
+# LICENSE= Various GNU
+
+USES= linux:c6
+USE_LDCONFIG= yes
+USE_LINUX= libgfortran
+USE_LINUX_RPM= yes
+
BIN_DISTNAMES= binutils-2.20.51.0.2-5.48.el6_10.1 \
glibc-headers-2.12-1.212.el6_10.3 \
kernel-headers-2.6.32-754.14.2.el6 \
@@ -23,16 +34,6 @@ SRC_DISTFILES= binutils-2.20.51.0.2-5.48.el6_10.1${SRC_SUFX}:SOURCE \
mpfr-2.4.1-6.el6${SRC_SUFX}:SOURCE \
gcc-4.4.7-23.el6${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
-
-# LICENSE= Various GNU
-
-USES= linux:c6
-USE_LDCONFIG= yes
-USE_LINUX= libgfortran
-USE_LINUX_RPM= yes
-
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/devel/linux-c6-icu/Makefile b/devel/linux-c6-icu/Makefile
index 62e5359ad860..e28414972c01 100644
--- a/devel/linux-c6-icu/Makefile
+++ b/devel/linux-c6-icu/Makefile
@@ -10,9 +10,10 @@ LIB_DISTNAMES= lib${PORTNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= International Components for Unicode (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libelf/Makefile b/devel/linux-c6-libelf/Makefile
index ac6acee661ab..7275c9d3c253 100644
--- a/devel/linux-c6-libelf/Makefile
+++ b/devel/linux-c6-libelf/Makefile
@@ -6,17 +6,18 @@ DISTVERSIONSUFFIX= -2.el6
PORTREVISION= 2
CATEGORIES= devel
PKGNAMESUFFIX= -libelf
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= ELF file handling library (CentOS ${LINUX_DIST_VER})
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/devel/linux-c6-libgfortran/Makefile b/devel/linux-c6-libgfortran/Makefile
index 8c7348fdd4b8..4dd81fdc902d 100644
--- a/devel/linux-c6-libgfortran/Makefile
+++ b/devel/linux-c6-libgfortran/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 4.4.7
DISTVERSIONSUFFIX= -23.el6
PORTREVISION= 7
CATEGORIES= devel linux
-SRC_DISTFILES= gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Runtime libraries for gfortran (Linux Centos ${LINUX_DIST_VER})
@@ -14,4 +13,6 @@ USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+SRC_DISTFILES= gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
+
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libglade2/Makefile b/devel/linux-c6-libglade2/Makefile
index e86c876df312..f3a16764356e 100644
--- a/devel/linux-c6-libglade2/Makefile
+++ b/devel/linux-c6-libglade2/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GNOME glade library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libpciaccess/Makefile b/devel/linux-c6-libpciaccess/Makefile
index 3cd4f1665165..ce58f78195ba 100644
--- a/devel/linux-c6-libpciaccess/Makefile
+++ b/devel/linux-c6-libpciaccess/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= devel
MAINTAINER= emulation@FreeBSD.org
COMMENT= Generic PCI access library (CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libsigc++20/Makefile b/devel/linux-c6-libsigc++20/Makefile
index 5fa3e2a61480..d9b59b50c315 100644
--- a/devel/linux-c6-libsigc++20/Makefile
+++ b/devel/linux-c6-libsigc++20/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Callback Framework for C++ (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libsoup/Makefile b/devel/linux-c6-libsoup/Makefile
index a8d81639b32d..3259b963f878 100644
--- a/devel/linux-c6-libsoup/Makefile
+++ b/devel/linux-c6-libsoup/Makefile
@@ -8,11 +8,12 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Simple Object Access Protocol implementation in C (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libthai/Makefile b/devel/linux-c6-libthai/Makefile
index 2e4d410daac2..5d12c6c044ef 100644
--- a/devel/linux-c6-libthai/Makefile
+++ b/devel/linux-c6-libthai/Makefile
@@ -9,11 +9,12 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Thai language support library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-libunwind/Makefile b/devel/linux-c6-libunwind/Makefile
index c538347704b9..36fc92584afe 100644
--- a/devel/linux-c6-libunwind/Makefile
+++ b/devel/linux-c6-libunwind/Makefile
@@ -10,11 +10,12 @@ MASTER_SITES= EPEL/l
MAINTAINER= emulation@FreeBSD.org
COMMENT= Generic stack unwinding library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-nspr/Makefile b/devel/linux-c6-nspr/Makefile
index 5fe2914927af..a3e617f1aa88 100644
--- a/devel/linux-c6-nspr/Makefile
+++ b/devel/linux-c6-nspr/Makefile
@@ -9,9 +9,10 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/devel/linux-c6-qt47/Makefile b/devel/linux-c6-qt47/Makefile
index 9e72bf0eebbb..2b0fa83693d1 100644
--- a/devel/linux-c6-qt47/Makefile
+++ b/devel/linux-c6-qt47/Makefile
@@ -7,7 +7,6 @@ DISTVERSIONSUFFIX= -1_18.el6
PORTREVISION= 4
CATEGORIES= devel linux
MASTER_SITES= LOCAL/tijl/atrpms:amd64,i386
-SRC_DISTFILES= # unavailable
DIST_SUBDIR= atrpms
MAINTAINER= emulation@FreeBSD.org
@@ -18,6 +17,8 @@ USE_LDCONFIG= yes
USE_LINUX= fontconfig png dbuslibs sqlite3 openssl
USE_LINUX_RPM= yes
+SRC_DISTFILES= # unavailable
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c6-sdl12/Makefile b/devel/linux-c6-sdl12/Makefile
index 921bc7d91fd1..7544ce7d5330 100644
--- a/devel/linux-c6-sdl12/Makefile
+++ b/devel/linux-c6-sdl12/Makefile
@@ -6,19 +6,19 @@ PORTVERSION= 1.2.14
DISTVERSIONSUFFIX= -7.el6_7.1
PORTREVISION= 4
CATEGORIES= devel linux
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-dbus-glib/Makefile b/devel/linux-c7-dbus-glib/Makefile
index fe3b95004d7d..24727736d883 100644
--- a/devel/linux-c7-dbus-glib/Makefile
+++ b/devel/linux-c7-dbus-glib/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= dbuslibs expat
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-dbus-libs/Makefile b/devel/linux-c7-dbus-libs/Makefile
index eedd0e35d3e0..d41cb2b8a5a2 100644
--- a/devel/linux-c7-dbus-libs/Makefile
+++ b/devel/linux-c7-dbus-libs/Makefile
@@ -6,20 +6,20 @@ PORTVERSION= 1.10.24
DISTVERSIONSUFFIX= -13.el7_6
CATEGORIES= devel linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for accessing D-BUS (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv2+
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
.include <bsd.port.mk>
diff --git a/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile
index 52cd62cd22c8..ddc55c72e535 100644
--- a/devel/linux-c7-devtools/Makefile
+++ b/devel/linux-c7-devtools/Makefile
@@ -4,6 +4,17 @@
PORTNAME= devtools
PORTVERSION= ${LINUX_DIST_VER}
CATEGORIES= devel
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
+
+# LICENSE= Various GNU
+
+USES= linux:c7
+USE_LDCONFIG= yes
+USE_LINUX= libgfortran
+USE_LINUX_RPM= yes
+
BIN_DISTNAMES= binutils-2.27-34.base.el7 \
glibc-headers-2.17-260.el7_6.5 \
mpfr-3.1.1-4.el7 \
@@ -30,18 +41,8 @@ SRC_DISTFILES= binutils-2.27-34.base.el7${SRC_SUFX}:SOURCE \
mpfr-3.1.1-4.el7${SRC_SUFX}:SOURCE \
gcc-4.8.5-36.el7_6.2${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
-
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-# LICENSE= Various GNU
-
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX= libgfortran
-USE_LINUX_RPM= yes
-
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/devel/linux-c7-icu/Makefile b/devel/linux-c7-icu/Makefile
index d7b84b45ea59..404454acf595 100644
--- a/devel/linux-c7-icu/Makefile
+++ b/devel/linux-c7-icu/Makefile
@@ -6,18 +6,19 @@ PORTVERSION= 50.1.2
DISTVERSIONSUFFIX= -17.el7
PORTREVISION= 1
CATEGORIES= devel linux
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= International Components for Unicode (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= lib${PORTNAME}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= lib${PORTNAME}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/lib${PORTNAME}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libelf/Makefile b/devel/linux-c7-libelf/Makefile
index 2a109fb060cd..9e83ca8dd4e2 100644
--- a/devel/linux-c7-libelf/Makefile
+++ b/devel/linux-c7-libelf/Makefile
@@ -5,16 +5,16 @@ PORTVERSION= 0.172
DISTVERSIONSUFFIX= -2.el7
CATEGORIES= devel
PKGNAMESUFFIX= -libelf
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= ELF file handling library (CentOS ${LINUX_DIST_VER})
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
diff --git a/devel/linux-c7-libgfortran/Makefile b/devel/linux-c7-libgfortran/Makefile
index 776552b57987..c5f3bf593622 100644
--- a/devel/linux-c7-libgfortran/Makefile
+++ b/devel/linux-c7-libgfortran/Makefile
@@ -6,15 +6,16 @@ PORTVERSION= 4.8.5
DISTVERSIONSUFFIX= -36.el7_6.2
PORTREVISION= 4
CATEGORIES= devel linux
-SRC_DISTFILES= gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Runtime libraries for gfortran (Linux Centos ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+SRC_DISTFILES= gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libglade2/Makefile b/devel/linux-c7-libglade2/Makefile
index d69aa5e98977..5091f1c69ccf 100644
--- a/devel/linux-c7-libglade2/Makefile
+++ b/devel/linux-c7-libglade2/Makefile
@@ -13,13 +13,13 @@ COMMENT= GNOME glade library (Linux CentOS ${LINUX_DIST_VER})
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/COPYING
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libpciaccess/Makefile b/devel/linux-c7-libpciaccess/Makefile
index d82395921a67..497fba51a5d4 100644
--- a/devel/linux-c7-libpciaccess/Makefile
+++ b/devel/linux-c7-libpciaccess/Makefile
@@ -9,13 +9,13 @@ CATEGORIES= devel
MAINTAINER= emulation@FreeBSD.org
COMMENT= Generic PCI access library (CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libsigc++20/Makefile b/devel/linux-c7-libsigc++20/Makefile
index ef9f94495dac..ddf5f0cf3692 100644
--- a/devel/linux-c7-libsigc++20/Makefile
+++ b/devel/linux-c7-libsigc++20/Makefile
@@ -9,13 +9,13 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Callback Framework for C++ (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libthai/Makefile b/devel/linux-c7-libthai/Makefile
index 1030fcb73fed..ade66729b381 100644
--- a/devel/linux-c7-libthai/Makefile
+++ b/devel/linux-c7-libthai/Makefile
@@ -10,13 +10,13 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Thai language support library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-libunwind/Makefile b/devel/linux-c7-libunwind/Makefile
index 3276e1042786..f270a38548dd 100644
--- a/devel/linux-c7-libunwind/Makefile
+++ b/devel/linux-c7-libunwind/Makefile
@@ -9,11 +9,12 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Generic stack unwinding library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-nspr/Makefile b/devel/linux-c7-nspr/Makefile
index 95fb36064a6c..58cc87e8bd07 100644
--- a/devel/linux-c7-nspr/Makefile
+++ b/devel/linux-c7-nspr/Makefile
@@ -9,11 +9,11 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/devel/linux-c7-qt/Makefile b/devel/linux-c7-qt/Makefile
index 38867e681d1d..87f1b6e3a400 100644
--- a/devel/linux-c7-qt/Makefile
+++ b/devel/linux-c7-qt/Makefile
@@ -9,15 +9,15 @@ CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of QT4 (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}47-[0-9]*
-
-DATADIR= ${PREFIX}/usr/share/${PORTNAME}4
-DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= fontconfig png dbuslibs sqlite3 openssl
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}47-[0-9]*
+DATADIR= ${PREFIX}/usr/share/${PORTNAME}4
+DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-sdl12/Makefile b/devel/linux-c7-sdl12/Makefile
index ac4be294be98..31a4de0e8ad6 100644
--- a/devel/linux-c7-sdl12/Makefile
+++ b/devel/linux-c7-sdl12/Makefile
@@ -6,21 +6,20 @@ PORTVERSION= 1.2.15
DISTVERSIONSUFFIX= -14.el7
PORTREVISION= 1
CATEGORIES= devel linux
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/devel/linux-c7-sdl20/Makefile b/devel/linux-c7-sdl20/Makefile
index 511fc8167b2b..98d736cbd3bd 100644
--- a/devel/linux-c7-sdl20/Makefile
+++ b/devel/linux-c7-sdl20/Makefile
@@ -6,20 +6,21 @@ PORTVERSION= 2.0.9
DISTVERSIONSUFFIX= -1.el7
CATEGORIES= devel linux
MASTER_SITES= EPEL7/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL2-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL2
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL2-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/dns/linux-c7-libasyncns/Makefile b/dns/linux-c7-libasyncns/Makefile
index 4c5523fdfd21..87506bdbfd2b 100644
--- a/dns/linux-c7-libasyncns/Makefile
+++ b/dns/linux-c7-libasyncns/Makefile
@@ -12,12 +12,12 @@ COMMENT= Library for executing DNS queries (Linux CentOS ${LINUX_DIST_VER})
LICENSE= LGPL21+
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index d16e9268efad..1c3db80ff1d4 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -6,6 +6,14 @@ PORTVERSION= ${LINUX_DIST_VER}
PORTREVISION= 1
CATEGORIES= emulators linux
PKGNAMEPREFIX= linux_base-
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Base set of packages needed in Linux mode (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c6
+USE_LINUX= # empty
+USE_LINUX_RPM= yes
+
BIN_DISTNAMES= bash-4.1.2-48.el6 \
bzip2-1.0.5-7.el6_0 \
centos-release-6-10.el6.centos.12.3 \
@@ -104,13 +112,7 @@ SRC_DISTFILES= acl-2.2.49-7.el6_9.1${SRC_SUFX}:SOURCE \
which-2.19-6.el6${SRC_SUFX}:SOURCE \
zlib-1.2.3-29.el6${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Base set of packages needed in Linux mode (Linux CentOS ${LINUX_DIST_VER})
-
PLIST_SUB= LINUXBASE=${LINUXBASE} SYSCTLMIB=${SYSCTLMIB}
-USES= linux:c6
-USE_LINUX= # empty
-USE_LINUX_RPM= yes
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
index 31b0add0521a..3705ffabd03e 100644
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@@ -4,6 +4,15 @@ PORTNAME= c7
PORTVERSION= ${LINUX_DIST_VER}
CATEGORIES= emulators linux
PKGNAMEPREFIX= linux_base-
+EXTRACT_ONLY= ${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//}
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Base set of packages needed in Linux mode (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c7
+USE_LINUX= # empty
+USE_LINUX_RPM= yes
+
BIN_DISTNAMES= bash-4.2.46-31.el7 \
bzip2-1.0.6-13.el7 \
coreutils-8.22-23.el7 \
@@ -111,15 +120,8 @@ SRC_DISTFILES= acl-2.2.51-14.el7${SRC_SUFX}:SOURCE \
which-2.20-7.el7${SRC_SUFX}:SOURCE \
xz-5.2.2-1.el7${SRC_SUFX}:SOURCE \
zlib-1.2.7-18.el7${SRC_SUFX}:SOURCE
-EXTRACT_ONLY= ${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//}
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Base set of packages needed in Linux mode (Linux CentOS ${LINUX_DIST_VER})
PLIST_SUB= LINUXBASE=${LINUXBASE} SYSCTLMIB=${SYSCTLMIB}
-USES= linux:c7
-USE_LINUX= # empty
-USE_LINUX_RPM= yes
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/ftp/linux-c6-curl/Makefile b/ftp/linux-c6-curl/Makefile
index bf911fd30102..6a8a9835bb2b 100644
--- a/ftp/linux-c6-curl/Makefile
+++ b/ftp/linux-c6-curl/Makefile
@@ -6,17 +6,19 @@ PORTVERSION= 7.19.7
DISTVERSIONSUFFIX= -53.el6_9
PORTREVISION= 9
CATEGORIES= ftp linux
-LIB_DISTNAMES= lib${DISTNAME}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Command line tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libssh2 nspr nss openldap
USE_LINUX_RPM= nolib
+LIB_DISTNAMES= lib${DISTNAME}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/ftp/linux-c7-curl/Makefile b/ftp/linux-c7-curl/Makefile
index d4d9a178aed2..f1d23abc095f 100644
--- a/ftp/linux-c7-curl/Makefile
+++ b/ftp/linux-c7-curl/Makefile
@@ -6,21 +6,22 @@ PORTVERSION= 7.29.0
DISTVERSIONSUFFIX= -51.el7
PORTREVISION= 5
CATEGORIES= ftp linux
-LIB_DISTNAMES= lib${DISTNAME}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MIT
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libssh2 nspr nss openldap
USE_LINUX_RPM= nolib
+LIB_DISTNAMES= lib${DISTNAME}
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-cairo/Makefile b/graphics/linux-c6-cairo/Makefile
index d5a03114bc92..e0620253db6c 100644
--- a/graphics/linux-c6-cairo/Makefile
+++ b/graphics/linux-c6-cairo/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= fontconfig pixman png xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile
index a7d7809ef6c3..cedfd80dbf0a 100644
--- a/graphics/linux-c6-dri/Makefile
+++ b/graphics/linux-c6-dri/Makefile
@@ -6,6 +6,15 @@ PORTVERSION= 11.0.7
DISTVERSIONSUFFIX= -4.el6
PORTREVISION= 5
CATEGORIES= graphics linux
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c6
+USE_LDCONFIG= yes
+USE_LINUX= expat libelf libpciaccess xorglibs
+USE_LINUX_RPM= yes
+
LIB_DISTNAMES= mesa-libGL-${DISTVERSIONFULL} \
mesa-libGLU-${DISTVERSIONFULL} \
mesa-dri-drivers-${DISTVERSIONFULL} \
@@ -17,14 +26,6 @@ SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE \
libdrm-2.4.65-2.el6${SRC_SUFX}:SOURCE \
freeglut-2.6.0-1.el6${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
-
-USES= linux:c6
-USE_LDCONFIG= yes
-USE_LINUX= expat libelf libpciaccess xorglibs
-USE_LINUX_RPM= yes
-
post-install:
@${RM} ${STAGEDIR}${PREFIX}/usr/lib/libGL.so.1
@${RM} ${STAGEDIR}${PREFIX}/usr/lib64/libGL.so.1
diff --git a/graphics/linux-c6-gdk-pixbuf2/Makefile b/graphics/linux-c6-gdk-pixbuf2/Makefile
index f4d892820e01..5ab799bb096b 100644
--- a/graphics/linux-c6-gdk-pixbuf2/Makefile
+++ b/graphics/linux-c6-gdk-pixbuf2/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Graphic library for GTK+ (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= jasper jpeg png tiff xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/graphics/linux-c6-glx-utils/Makefile b/graphics/linux-c6-glx-utils/Makefile
index d96b8b52be02..458d598548fa 100644
--- a/graphics/linux-c6-glx-utils/Makefile
+++ b/graphics/linux-c6-glx-utils/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 11.0.7
DISTVERSIONSUFFIX= -4.el6
PORTREVISION= 3
CATEGORIES= graphics linux
-SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Mesa GLX utilities (Linux CentOS ${LINUX_DIST_VER})
@@ -16,4 +15,6 @@ USE_LDCONFIG= yes
USE_LINUX= dri xorglibs
USE_LINUX_RPM= nolib
+SRC_DISTFILES= mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
+
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-jasper/Makefile b/graphics/linux-c6-jasper/Makefile
index 7752e990c764..df2844c3e5bc 100644
--- a/graphics/linux-c6-jasper/Makefile
+++ b/graphics/linux-c6-jasper/Makefile
@@ -6,16 +6,17 @@ DISTVERSIONSUFFIX= -22.el6
PORTREVISION= 5
CATEGORIES= graphics linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= JPEG-2000 reference implementation (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= jpeg
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-jpeg/Makefile b/graphics/linux-c6-jpeg/Makefile
index 5ce6fb7f50c3..4c6cab44a0aa 100644
--- a/graphics/linux-c6-jpeg/Makefile
+++ b/graphics/linux-c6-jpeg/Makefile
@@ -6,18 +6,18 @@ PORTVERSION= 1.2.1
DISTVERSIONSUFFIX= -3.el6_5
PORTREVISION= 3
CATEGORIES= graphics linux
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= libjpeg-turbo-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= SIMD-accelerated JPEG codec (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= libjpeg-turbo
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/libjpeg-turbo-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-png/Makefile b/graphics/linux-c6-png/Makefile
index 737628dba119..2112da57f650 100644
--- a/graphics/linux-c6-png/Makefile
+++ b/graphics/linux-c6-png/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library for manipulating PNG images (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../png/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../png/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-sdl_image/Makefile b/graphics/linux-c6-sdl_image/Makefile
index bce72abaa94a..0a489f7c13ca 100644
--- a/graphics/linux-c6-sdl_image/Makefile
+++ b/graphics/linux-c6-sdl_image/Makefile
@@ -7,19 +7,19 @@ DISTVERSIONSUFFIX= -9.el6
PORTREVISION= 5
CATEGORIES= graphics linux
MASTER_SITES= EPEL/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_image-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Simple library to load images as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_image
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= jpeg png sdl12 tiff
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_image-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-sdl_ttf/Makefile b/graphics/linux-c6-sdl_ttf/Makefile
index 920257831ce0..93901f6bc618 100644
--- a/graphics/linux-c6-sdl_ttf/Makefile
+++ b/graphics/linux-c6-sdl_ttf/Makefile
@@ -7,19 +7,19 @@ DISTVERSIONSUFFIX= -6.el6
PORTREVISION= 4
CATEGORIES= graphics linux
MASTER_SITES= EPEL/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_ttf-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Simple library to load True Type Fonts as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_ttf
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= jpeg png sdl12 tiff
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_ttf-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c6-tiff/Makefile b/graphics/linux-c6-tiff/Makefile
index 9fc6520534c8..20483cb5602b 100644
--- a/graphics/linux-c6-tiff/Makefile
+++ b/graphics/linux-c6-tiff/Makefile
@@ -12,12 +12,13 @@ COMMENT= Tools and library routines for working with TIFF images (Linux CentOS $
LICENSE= BSD3CLAUSE
-DESCR= ${.CURDIR}/../tiff/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= jpeg
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../tiff/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-cairo/Makefile b/graphics/linux-c7-cairo/Makefile
index d4ea07a7a115..c6d88279e592 100644
--- a/graphics/linux-c7-cairo/Makefile
+++ b/graphics/linux-c7-cairo/Makefile
@@ -9,14 +9,14 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= dri fontconfig pixman png xorglibs
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-dri/Makefile b/graphics/linux-c7-dri/Makefile
index 9949033fabae..2d9275e89e44 100644
--- a/graphics/linux-c7-dri/Makefile
+++ b/graphics/linux-c7-dri/Makefile
@@ -5,6 +5,15 @@ PORTNAME= dri
PORTVERSION= 18.0.5
DISTVERSIONSUFFIX= -4.el7_6
CATEGORIES= graphics linux
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c7
+USE_LDCONFIG= yes
+USE_LINUX= expat libelf libglvnd libpciaccess wayland xorglibs
+USE_LINUX_RPM= yes
+
LIB_DISTNAMES= freeglut-3.0.0-8.el7 \
libdrm-2.4.91-3.el7 \
llvm-private-6.0.1-2.el7 \
@@ -28,16 +37,8 @@ SRC_DISTFILES= freeglut-3.0.0-8.el7${SRC_SUFX}:SOURCE \
mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE \
mesa-libGLU-9.0.0-4.el7${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
-
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX= expat libelf libglvnd libpciaccess wayland xorglibs
-USE_LINUX_RPM= yes
-
OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
diff --git a/graphics/linux-c7-gdk-pixbuf2/Makefile b/graphics/linux-c7-gdk-pixbuf2/Makefile
index fba3dff5f08b..7275e9dab274 100644
--- a/graphics/linux-c7-gdk-pixbuf2/Makefile
+++ b/graphics/linux-c7-gdk-pixbuf2/Makefile
@@ -9,14 +9,14 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Graphic library for GTK+ (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= jasper jpeg png tiff xorglibs
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/graphics/linux-c7-glx-utils/Makefile b/graphics/linux-c7-glx-utils/Makefile
index 2d2cfd62c147..632c153c8dfe 100644
--- a/graphics/linux-c7-glx-utils/Makefile
+++ b/graphics/linux-c7-glx-utils/Makefile
@@ -5,16 +5,17 @@ PORTNAME= glx-utils
PORTVERSION= 8.3.0
DISTVERSIONSUFFIX= -10.el7
CATEGORIES= graphics linux
-SRC_DISTFILES= mesa-demos-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Mesa GLX utilities (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= dri xorglibs
USE_LINUX_RPM= nolib
+SRC_DISTFILES= mesa-demos-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-graphite2/Makefile b/graphics/linux-c7-graphite2/Makefile
index c809f9b6f71c..ce7dbcf31f11 100644
--- a/graphics/linux-c7-graphite2/Makefile
+++ b/graphics/linux-c7-graphite2/Makefile
@@ -9,11 +9,12 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Rendering capabilities for complex non-Roman writing systems (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-jasper/Makefile b/graphics/linux-c7-jasper/Makefile
index a5e22ba8fa6e..258d9cfd41fc 100644
--- a/graphics/linux-c7-jasper/Makefile
+++ b/graphics/linux-c7-jasper/Makefile
@@ -7,19 +7,20 @@ DISTVERSIONSUFFIX= -33.el7
PORTREVISION= 5
CATEGORIES= graphics linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= JPEG-2000 reference implementation (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= jpeg
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-jbigkit/Makefile b/graphics/linux-c7-jbigkit/Makefile
index 21bbd5766560..18270098a6cd 100644
--- a/graphics/linux-c7-jbigkit/Makefile
+++ b/graphics/linux-c7-jbigkit/Makefile
@@ -7,18 +7,19 @@ DISTVERSIONSUFFIX= -11.el7
PORTREVISION= 2
CATEGORIES= graphics linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Lossless compression for bi-level images (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-jpeg/Makefile b/graphics/linux-c7-jpeg/Makefile
index 9289129f47e2..de0624db7d69 100644
--- a/graphics/linux-c7-jpeg/Makefile
+++ b/graphics/linux-c7-jpeg/Makefile
@@ -6,20 +6,19 @@ PORTVERSION= 1.2.90
DISTVERSIONSUFFIX= -6.el7
PORTREVISION= 3
CATEGORIES= graphics linux
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= libjpeg-turbo-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= SIMD-accelerated JPEG codec (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= libjpeg-turbo
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/libjpeg-turbo-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-libglvnd/Makefile b/graphics/linux-c7-libglvnd/Makefile
index 603c8ef43214..56ed76c4dfc7 100644
--- a/graphics/linux-c7-libglvnd/Makefile
+++ b/graphics/linux-c7-libglvnd/Makefile
@@ -4,11 +4,6 @@ PORTNAME= libglvnd
PORTVERSION= 1.0.1
DISTVERSIONSUFFIX= -0.8.git5baa1e5.el7
CATEGORIES= graphics linux
-LIB_DISTNAMES= libglvnd-${DISTVERSIONFULL} \
- libglvnd-egl-${DISTVERSIONFULL} \
- libglvnd-gles-${DISTVERSIONFULL} \
- libglvnd-glx-${DISTVERSIONFULL} \
- libglvnd-opengl-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= GL Vendor-Neutral Dispatch library (Linux CentOS ${LINUX_DIST_VER})
@@ -18,6 +13,12 @@ USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= libglvnd-${DISTVERSIONFULL} \
+ libglvnd-egl-${DISTVERSIONFULL} \
+ libglvnd-gles-${DISTVERSIONFULL} \
+ libglvnd-glx-${DISTVERSIONFULL} \
+ libglvnd-opengl-${DISTVERSIONFULL}
+
OPTIONS_DEFINE= DOCS
post-install:
diff --git a/graphics/linux-c7-png/Makefile b/graphics/linux-c7-png/Makefile
index b53321d2d3a0..9612eb5c587f 100644
--- a/graphics/linux-c7-png/Makefile
+++ b/graphics/linux-c7-png/Makefile
@@ -15,13 +15,13 @@ LICENSE_NAME= libpng license
LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../png/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../png/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-sdl_image/Makefile b/graphics/linux-c7-sdl_image/Makefile
index 585b2c5d9ae1..18b284c36422 100644
--- a/graphics/linux-c7-sdl_image/Makefile
+++ b/graphics/linux-c7-sdl_image/Makefile
@@ -7,22 +7,22 @@ DISTVERSIONSUFFIX= -11.el7
PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= EPEL7/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_image-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Simple library to load images as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_image
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= jpeg png sdl12 tiff
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_image-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-sdl_ttf/Makefile b/graphics/linux-c7-sdl_ttf/Makefile
index 1692b747bfab..c6be73b5d91c 100644
--- a/graphics/linux-c7-sdl_ttf/Makefile
+++ b/graphics/linux-c7-sdl_ttf/Makefile
@@ -7,22 +7,22 @@ DISTVERSIONSUFFIX= -6.el7
PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= EPEL7/s
-DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
+DISTNAME= SDL_ttf-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Simple library to load True Type Fonts as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= SDL_ttf
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= jpeg png sdl12 tiff
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/SDL_ttf-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-tiff/Makefile b/graphics/linux-c7-tiff/Makefile
index 35418a40cf00..12fbd32da7bc 100644
--- a/graphics/linux-c7-tiff/Makefile
+++ b/graphics/linux-c7-tiff/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library routines for working with TIFF images (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../tiff/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= jbigkit jpeg
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../tiff/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/graphics/linux-c7-wayland/Makefile b/graphics/linux-c7-wayland/Makefile
index 47f48f21519d..7084957bd21b 100644
--- a/graphics/linux-c7-wayland/Makefile
+++ b/graphics/linux-c7-wayland/Makefile
@@ -4,17 +4,19 @@ PORTNAME= wayland
PORTVERSION= 1.15.0
DISTVERSIONSUFFIX= -1.el7
CATEGORIES= graphics linux
-LIB_DISTNAMES= libwayland-client-${DISTVERSIONFULL} \
- libwayland-cursor-${DISTVERSIONFULL} \
- libwayland-egl-${DISTVERSIONFULL} \
- libwayland-server-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Wayland compositor libraries (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../wayland/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= libwayland-client-${DISTVERSIONFULL} \
+ libwayland-cursor-${DISTVERSIONFULL} \
+ libwayland-egl-${DISTVERSIONFULL} \
+ libwayland-server-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../wayland/pkg-descr
+
.include <bsd.port.mk>
diff --git a/lang/linux-c6-tcl85/Makefile b/lang/linux-c6-tcl85/Makefile
index 7cf8dac0baa2..60799ded10aa 100644
--- a/lang/linux-c6-tcl85/Makefile
+++ b/lang/linux-c6-tcl85/Makefile
@@ -11,13 +11,14 @@ PKGNAMESUFFIX= 85
MAINTAINER= emulation@FreeBSD.org
COMMENT= Tool Command Language (Linux CentOS ${LINUX_DIST_VER})
-DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R}
-DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
USE_LINUX_RPM_BAD_PERMS= yes
+DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R}
+DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/lang/linux-c7-tcl85/Makefile b/lang/linux-c7-tcl85/Makefile
index 4a4f0b7017b0..62c0d5773a69 100644
--- a/lang/linux-c7-tcl85/Makefile
+++ b/lang/linux-c7-tcl85/Makefile
@@ -11,15 +11,15 @@ PKGNAMESUFFIX= 85
MAINTAINER= emulation@FreeBSD.org
COMMENT= Tool Command Language (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
-
-DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R}
-DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
USE_LINUX_RPM_BAD_PERMS= yes
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R}
+DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/multimedia/linux-c6-libtheora/Makefile b/multimedia/linux-c6-libtheora/Makefile
index 4161ce722956..d2af20d3b33f 100644
--- a/multimedia/linux-c6-libtheora/Makefile
+++ b/multimedia/linux-c6-libtheora/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= multimedia linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Theora Video Compression Codec (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/multimedia/linux-c6-libv4l/Makefile b/multimedia/linux-c6-libv4l/Makefile
index 0ecfe4389e99..9a27fb370fed 100644
--- a/multimedia/linux-c6-libv4l/Makefile
+++ b/multimedia/linux-c6-libv4l/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= multimedia linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Video4Linux library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/multimedia/linux-c7-libtheora/Makefile b/multimedia/linux-c7-libtheora/Makefile
index fc00b96786fe..91b0f4af546c 100644
--- a/multimedia/linux-c7-libtheora/Makefile
+++ b/multimedia/linux-c7-libtheora/Makefile
@@ -12,13 +12,13 @@ COMMENT= Theora Video Compression Codec (Linux CentOS ${LINUX_DIST_VER})
LICENSE= BSD3CLAUSE
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/multimedia/linux-c7-libv4l/Makefile b/multimedia/linux-c7-libv4l/Makefile
index 898187c0f606..06fe58fae1a0 100644
--- a/multimedia/linux-c7-libv4l/Makefile
+++ b/multimedia/linux-c7-libv4l/Makefile
@@ -6,20 +6,21 @@ PORTVERSION= 0.9.5
DISTVERSIONSUFFIX= -4.el7
PORTREVISION= 2
CATEGORIES= multimedia linux
-SRC_DISTFILES= v4l-utils-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Video4Linux library (Linux CentOS ${LINUX_DIST_VER})
LICENSE= LGPL20+
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+SRC_DISTFILES= v4l-utils-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/net/linux-c6-avahi-libs/Makefile b/net/linux-c6-avahi-libs/Makefile
index 209f0cba5c8d..a9dfae72b789 100644
--- a/net/linux-c6-avahi-libs/Makefile
+++ b/net/linux-c6-avahi-libs/Makefile
@@ -7,15 +7,16 @@ DISTVERSIONSUFFIX= -17.el6
PORTREVISION= 5
CATEGORIES= net linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile
index 4ff93992b98c..5550737da69e 100644
--- a/net/linux-c6-openldap/Makefile
+++ b/net/linux-c6-openldap/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= net linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Lightweight Directory Access Protocol libraries (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= cyrus-sasl2 nss nspr
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
+
OPTIONS_DEFINE= DOCS
# do not install any openldap configuration directories/files
diff --git a/net/linux-c6-tcp_wrappers-libs/Makefile b/net/linux-c6-tcp_wrappers-libs/Makefile
index 8565248164f3..bb77620bfda4 100644
--- a/net/linux-c6-tcp_wrappers-libs/Makefile
+++ b/net/linux-c6-tcp_wrappers-libs/Makefile
@@ -7,18 +7,19 @@ DISTVERSIONSUFFIX= -58.el6
PORTREVISION= 4
CATEGORIES= net linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/net/linux-c7-avahi-libs/Makefile b/net/linux-c7-avahi-libs/Makefile
index 83a430fb8e38..303df05a13b2 100644
--- a/net/linux-c7-avahi-libs/Makefile
+++ b/net/linux-c7-avahi-libs/Makefile
@@ -7,17 +7,17 @@ DISTVERSIONSUFFIX= -19.el7
PORTREVISION= 2
CATEGORIES= net linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/net/linux-c7-openldap/Makefile b/net/linux-c7-openldap/Makefile
index 68b1ff566b38..ebe3515e4aaa 100644
--- a/net/linux-c7-openldap/Makefile
+++ b/net/linux-c7-openldap/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= net linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= LDAP libraries (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= cyrus-sasl2 nspr nss
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
+
OPTIONS_DEFINE= DOCS
# do not install any openldap configuration directories/files
diff --git a/net/linux-c7-tcp_wrappers-libs/Makefile b/net/linux-c7-tcp_wrappers-libs/Makefile
index 61622d73a25c..33689adcff0e 100644
--- a/net/linux-c7-tcp_wrappers-libs/Makefile
+++ b/net/linux-c7-tcp_wrappers-libs/Makefile
@@ -7,20 +7,20 @@ DISTVERSIONSUFFIX= -77.el7
PORTREVISION= 2
CATEGORIES= net linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile
index f4f65de6142d..1cd60b65c249 100644
--- a/print/linux-c6-cups-libs/Makefile
+++ b/print/linux-c6-cups-libs/Makefile
@@ -7,16 +7,17 @@ DISTVERSIONSUFFIX= -81.el6_10
PORTREVISION= 10
CATEGORIES= print linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Common UNIX Printing System libraries
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= avahi-libs gnutls jpeg png tiff
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/print/linux-c7-cups-libs/Makefile b/print/linux-c7-cups-libs/Makefile
index 203d1fc1bc2b..140f365491dc 100644
--- a/print/linux-c7-cups-libs/Makefile
+++ b/print/linux-c7-cups-libs/Makefile
@@ -7,21 +7,21 @@ DISTVERSIONSUFFIX= -35.el7
PORTREVISION= 5
CATEGORIES= print linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Common UNIX Printing System libraries
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= avahi-libs openssl
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/print/linux-c7-freetype/Makefile b/print/linux-c7-freetype/Makefile
index 570f45d90a5e..ee1cdfcb7105 100644
--- a/print/linux-c7-freetype/Makefile
+++ b/print/linux-c7-freetype/Makefile
@@ -8,12 +8,13 @@ CATEGORIES= print linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Font rendering engine (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= png
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/print/linux-c7-harfbuzz/Makefile b/print/linux-c7-harfbuzz/Makefile
index 059a8cc9c3b7..1847dbbc7202 100644
--- a/print/linux-c7-harfbuzz/Makefile
+++ b/print/linux-c7-harfbuzz/Makefile
@@ -8,12 +8,13 @@ CATEGORIES= print linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= OpenType text shaping engine (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= graphite2
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index 6ed43a475fb3..a735fbd4b76c 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -7,18 +7,19 @@ DISTVERSIONSUFFIX= -15.el6_6.2
PORTREVISION= 5
CATEGORIES= security linux
PKGNAMESUFFIX= -lib
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile
index 1eed959ce8ef..7fa7743a3831 100644
--- a/security/linux-c6-gnutls/Makefile
+++ b/security/linux-c6-gnutls/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libtasn1 libgcrypt libgpg-error
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index aa1db0b03e1d..8138033a7d34 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libgpg-error
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index 036fcd593932..45d7eddb23e3 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index 9f0dec760cb1..d3c9e2baf90a 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= openssl
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index 128844d3bd08..ebdb18f8977e 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= cpe linux:c6
CPE_VENDOR= gnu
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index 594c6cf62062..b0ad79ee6f24 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -6,22 +6,24 @@ PORTVERSION= 3.36.0
DISTVERSIONSUFFIX= -9.el6_10
PORTREVISION= 2
CATEGORIES= security linux
-LIB_DISTNAMES= ${DISTNAME} \
- ${PORTNAME}-util-${PORTVERSION}-1.el6 \
- ${PORTNAME}-softokn-3.14.3-23.3.el6_8
-SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \
- ${PORTNAME}-util-${PORTVERSION}-1.el6${SRC_SUFX}:SOURCE \
- ${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MPL20
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= nspr sqlite3
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${DISTNAME} \
+ ${PORTNAME}-util-${PORTVERSION}-1.el6 \
+ ${PORTNAME}-softokn-3.14.3-23.3.el6_8
+SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-util-${PORTVERSION}-1.el6${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index 97f359b13a69..4045329c8e38 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile
index 7d2e3de930fb..60e9c3f66c3d 100644
--- a/security/linux-c7-cyrus-sasl2/Makefile
+++ b/security/linux-c7-cyrus-sasl2/Makefile
@@ -7,20 +7,20 @@ DISTVERSIONSUFFIX= -23.el7
PORTREVISION= 4
CATEGORIES= security linux
PKGNAMESUFFIX= -lib
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile
index 02b3bb75641a..f1b1912c100f 100644
--- a/security/linux-c7-gnutls/Makefile
+++ b/security/linux-c7-gnutls/Makefile
@@ -9,14 +9,14 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libtasn1 nettle p11-kit trousers
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/security/linux-c7-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile
index 2550036bd993..d188a14c243b 100644
--- a/security/linux-c7-libgcrypt/Makefile
+++ b/security/linux-c7-libgcrypt/Makefile
@@ -10,16 +10,16 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
LICENSE= LGPL21+
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libgpg-error
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile
index 8cc6f7840054..c6bf52becb4b 100644
--- a/security/linux-c7-libgpg-error/Makefile
+++ b/security/linux-c7-libgpg-error/Makefile
@@ -10,15 +10,15 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
LICENSE= LGPL21+
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile
index e919c82dab19..c7ec02ec4123 100644
--- a/security/linux-c7-libssh2/Makefile
+++ b/security/linux-c7-libssh2/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= openssl
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile
index 7b42d8006f51..666798a25a8d 100644
--- a/security/linux-c7-libtasn1/Makefile
+++ b/security/linux-c7-libtasn1/Makefile
@@ -11,14 +11,15 @@ COMMENT= ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
LICENSE= LGPL21+
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= cpe linux:c7
-CPE_VENDOR= gnu
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CPE_VENDOR= gnu
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-nettle/Makefile b/security/linux-c7-nettle/Makefile
index 194352298908..f352955db1aa 100644
--- a/security/linux-c7-nettle/Makefile
+++ b/security/linux-c7-nettle/Makefile
@@ -8,11 +8,12 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Low-level cryptographic library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile
index d2623fa54109..55e8b15075a3 100644
--- a/security/linux-c7-nss/Makefile
+++ b/security/linux-c7-nss/Makefile
@@ -5,6 +5,15 @@ PORTNAME= nss
PORTVERSION= 3.36.0
DISTVERSIONSUFFIX= -7.1.el7_6
CATEGORIES= security linux
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c7
+USE_LDCONFIG= yes
+USE_LINUX= nspr sqlite3
+USE_LINUX_RPM= yes
+
LIB_DISTNAMES= ${DISTNAME} \
${PORTNAME}-pem-1.0.3-5.el7_6.1 \
${PORTNAME}-util-${PORTVERSION}-1.1.el7_6 \
@@ -14,15 +23,7 @@ SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \
${PORTNAME}-util-${PORTVERSION}-1.1.el7_6${SRC_SUFX}:SOURCE \
${PORTNAME}-softokn-3.36.0-5.el7_5${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
-
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX= nspr sqlite3
-USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/security/linux-c7-openssl/Makefile b/security/linux-c7-openssl/Makefile
index 474a5c0a8d00..c07bd0cf6b35 100644
--- a/security/linux-c7-openssl/Makefile
+++ b/security/linux-c7-openssl/Makefile
@@ -7,23 +7,23 @@ DISTVERSIONSUFFIX= -16.el7_6.1
PORTREVISION= 1
CATEGORIES= security linux
PKGNAMESUFFIX= -libs
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= OpenSSL libraries (Linux CentOS ${LINUX_DIST_VER})
LICENSE= OpenSSL
-LICENSE_FILE= ${WRKSRC}/usr/share/licenses/${LINUXNAME}-${PORTVERSION}/LICENSE
+LICENSE_FILE= ${WRKSRC}/usr/share/licenses/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}/LICENSE
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-p11-kit/Makefile b/security/linux-c7-p11-kit/Makefile
index 66c6e6ed8903..3911a46806d7 100644
--- a/security/linux-c7-p11-kit/Makefile
+++ b/security/linux-c7-p11-kit/Makefile
@@ -8,11 +8,12 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library for loading and enumerating of PKCS\#11 modules (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/security/linux-c7-trousers/Makefile b/security/linux-c7-trousers/Makefile
index 7abd1a54e660..3ec518523e20 100644
--- a/security/linux-c7-trousers/Makefile
+++ b/security/linux-c7-trousers/Makefile
@@ -8,12 +8,13 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Open-source TCG Software Stack (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= openssl
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/sysutils/linux-c6-lttng-ust/Makefile b/sysutils/linux-c6-lttng-ust/Makefile
index ea6239849791..51605e35a4ce 100644
--- a/sysutils/linux-c6-lttng-ust/Makefile
+++ b/sysutils/linux-c6-lttng-ust/Makefile
@@ -10,13 +10,14 @@ MASTER_SITES= EPEL/l
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries to instrument and trace user applications (CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= userspace-rcu
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/sysutils/linux-c6-userspace-rcu/Makefile b/sysutils/linux-c6-userspace-rcu/Makefile
index 8d4b954a6474..3af5e6e639a5 100644
--- a/sysutils/linux-c6-userspace-rcu/Makefile
+++ b/sysutils/linux-c6-userspace-rcu/Makefile
@@ -10,11 +10,12 @@ MASTER_SITES= EPEL/u
MAINTAINER= emulation@FreeBSD.org
COMMENT= Userspace read-copy-update (RCU) data synchronization library (CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../liburcu/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../liburcu/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/sysutils/linux-c7-lttng-ust/Makefile b/sysutils/linux-c7-lttng-ust/Makefile
index 35191b35ad8f..e91540e538ad 100644
--- a/sysutils/linux-c7-lttng-ust/Makefile
+++ b/sysutils/linux-c7-lttng-ust/Makefile
@@ -10,14 +10,16 @@ MASTER_SITES= EPEL7/l
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries to instrument and trace user applications (CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= userspace-rcu
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/sysutils/linux-c7-userspace-rcu/Makefile b/sysutils/linux-c7-userspace-rcu/Makefile
index b8ad14c6d51c..de37fef2f6e6 100644
--- a/sysutils/linux-c7-userspace-rcu/Makefile
+++ b/sysutils/linux-c7-userspace-rcu/Makefile
@@ -10,12 +10,14 @@ MASTER_SITES= EPEL7/u
MAINTAINER= emulation@FreeBSD.org
COMMENT= Userspace read-copy-update (RCU) data synchronization library (CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../liburcu/pkg-descr
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../liburcu/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/textproc/linux-c6-aspell/Makefile b/textproc/linux-c6-aspell/Makefile
index f0c54a4b0059..126efc497d01 100644
--- a/textproc/linux-c6-aspell/Makefile
+++ b/textproc/linux-c6-aspell/Makefile
@@ -12,11 +12,12 @@ COMMENT= Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
LICENSE= LGPL21+
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/textproc/linux-c6-expat/Makefile b/textproc/linux-c6-expat/Makefile
index 6b6289945ad6..017da055291c 100644
--- a/textproc/linux-c6-expat/Makefile
+++ b/textproc/linux-c6-expat/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/textproc/linux-c6-libxml2/Makefile b/textproc/linux-c6-libxml2/Makefile
index dda1c89c16ef..d30a27184390 100644
--- a/textproc/linux-c6-libxml2/Makefile
+++ b/textproc/linux-c6-libxml2/Makefile
@@ -10,11 +10,12 @@ CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/textproc/linux-c7-aspell/Makefile b/textproc/linux-c7-aspell/Makefile
index 7fdf62d04297..3604b1c46bba 100644
--- a/textproc/linux-c7-aspell/Makefile
+++ b/textproc/linux-c7-aspell/Makefile
@@ -12,13 +12,13 @@ COMMENT= Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
LICENSE= LGPL21+
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/textproc/linux-c7-expat/Makefile b/textproc/linux-c7-expat/Makefile
index e801353951bf..39dc8bcf6459 100644
--- a/textproc/linux-c7-expat/Makefile
+++ b/textproc/linux-c7-expat/Makefile
@@ -12,13 +12,13 @@ COMMENT= XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MIT
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/textproc/linux-c7-libxml2/Makefile b/textproc/linux-c7-libxml2/Makefile
index 172d09f35f6e..e359a31d61b0 100644
--- a/textproc/linux-c7-libxml2/Makefile
+++ b/textproc/linux-c7-libxml2/Makefile
@@ -12,13 +12,13 @@ COMMENT= Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MIT
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/www/linux-c6-qt47-webkit/Makefile b/www/linux-c6-qt47-webkit/Makefile
index af20a7b160a3..0fe30865e81e 100644
--- a/www/linux-c6-qt47-webkit/Makefile
+++ b/www/linux-c6-qt47-webkit/Makefile
@@ -7,16 +7,18 @@ DISTVERSIONSUFFIX= -1_18.el6
PORTREVISION= 4
CATEGORIES= www linux
MASTER_SITES= LOCAL/tijl/atrpms:amd64,i386
-SRC_DISTFILES= # unavailable
DIST_SUBDIR= atrpms
MAINTAINER= emulation@FreeBSD.org
COMMENT= Qt WebKit implementation (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= fontconfig png xorglibs sqlite3 qt qt-x11
USE_LINUX_RPM= yes
+SRC_DISTFILES= # unavailable
+
+DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
.include <bsd.port.mk>
diff --git a/www/linux-c7-qtwebkit/Makefile b/www/linux-c7-qtwebkit/Makefile
index d4aa0f4c47c1..629fc6ed7f88 100644
--- a/www/linux-c7-qtwebkit/Makefile
+++ b/www/linux-c7-qtwebkit/Makefile
@@ -11,13 +11,14 @@ MASTER_SITES= EPEL7/q
MAINTAINER= emulation@FreeBSD.org
COMMENT= Qt WebKit implementation (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-qt47-webkit-[0-9]*
-
-DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
ONLY_FOR_ARCHS= amd64
+
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= fontconfig png xorglibs sqlite3 qt qt-x11
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-qt47-webkit-[0-9]*
+DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
.include <bsd.port.mk>
diff --git a/x11-fonts/linux-c6-fontconfig/Makefile b/x11-fonts/linux-c6-fontconfig/Makefile
index 5a1d69de5982..549fbfed4967 100644
--- a/x11-fonts/linux-c6-fontconfig/Makefile
+++ b/x11-fonts/linux-c6-fontconfig/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= x11-fonts linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= expat
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/x11-fonts/linux-c7-fontconfig/Makefile b/x11-fonts/linux-c7-fontconfig/Makefile
index c7cb0ea2d06e..cef76c115a50 100644
--- a/x11-fonts/linux-c7-fontconfig/Makefile
+++ b/x11-fonts/linux-c7-fontconfig/Makefile
@@ -9,14 +9,14 @@ CATEGORIES= x11-fonts linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= expat freetype
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 90130afd7fab..e07d61349d85 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -6,19 +6,21 @@ PORTVERSION= 2.24.23
DISTVERSIONSUFFIX= -9.el6
PORTREVISION= 7
CATEGORIES= x11-toolkits linux
-LIB_DISTNAMES= ${DISTNAME} \
- ${PORTNAME}-engines-2.18.4-5.el6.centos \
- ${PORTNAME}-immodules-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= atk gdkpixbuf2 pango xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${DISTNAME} \
+ ${PORTNAME}-engines-2.18.4-5.el6.centos \
+ ${PORTNAME}-immodules-${DISTVERSIONFULL}
+
+DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index 3ec588df4a5b..a33ce9a50808 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../open-motif/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../open-motif/pkg-descr
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index 3303ced975ec..4156020ee737 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -10,12 +10,13 @@ CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Pango library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= cairo fontconfig libthai xorglibs
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index d2ee2604ea6e..0f6ccd86cbe0 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -7,19 +7,21 @@ DISTVERSIONSUFFIX= -1_18.el6
PORTREVISION= 6
CATEGORIES= x11-toolkits linux
MASTER_SITES= LOCAL/tijl/atrpms:amd64,i386
-SRC_DISTFILES= # unavailable
DIST_SUBDIR= atrpms
MAINTAINER= emulation@FreeBSD.org
COMMENT= Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
-DATADIR= ${PREFIX}/usr/share/qt47
-DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
USE_LINUX_RPM= yes
+SRC_DISTFILES= # unavailable
+
+DATADIR= ${PREFIX}/usr/share/qt47
+DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
post-patch:
@${RM} -r ${WRKSRC}/usr/share/icons
diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile
index 15680933fba9..6c15a720e199 100644
--- a/x11-toolkits/linux-c6-tk85/Makefile
+++ b/x11-toolkits/linux-c6-tk85/Makefile
@@ -11,14 +11,15 @@ PKGNAMESUFFIX= 85
MAINTAINER= emulation@FreeBSD.org
COMMENT= Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
-DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R}
-DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
USE_LINUX_RPM_BAD_PERMS= yes
+DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R}
+DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile
index 7b7f1ae92b97..c60a51c5bbd3 100644
--- a/x11-toolkits/linux-c7-gtk2/Makefile
+++ b/x11-toolkits/linux-c7-gtk2/Makefile
@@ -5,20 +5,21 @@ PORTNAME= gtk2
PORTVERSION= 2.24.31
DISTVERSIONSUFFIX= -1.el7
CATEGORIES= x11-toolkits linux
-LIB_DISTNAMES= ${DISTNAME} \
- ${PORTNAME}-immodules-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= atk gdkpixbuf2 pango xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${DISTNAME} \
+ ${PORTNAME}-immodules-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr
+
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/x11-toolkits/linux-c7-openmotif/Makefile b/x11-toolkits/linux-c7-openmotif/Makefile
index bdd27c1f0d2b..7280fcee9f79 100644
--- a/x11-toolkits/linux-c7-openmotif/Makefile
+++ b/x11-toolkits/linux-c7-openmotif/Makefile
@@ -10,14 +10,14 @@ CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../open-${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../open-${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/x11-toolkits/linux-c7-pango/Makefile b/x11-toolkits/linux-c7-pango/Makefile
index 439c247d1bfe..f2c92acdec8e 100644
--- a/x11-toolkits/linux-c7-pango/Makefile
+++ b/x11-toolkits/linux-c7-pango/Makefile
@@ -9,14 +9,14 @@ CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Pango library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= cairo fontconfig freetype fribidi harfbuzz libthai xorglibs
USE_LINUX_RPM= yes
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile
index f9b4f380e9d6..4a507e4d51a9 100644
--- a/x11-toolkits/linux-c7-qt-x11/Makefile
+++ b/x11-toolkits/linux-c7-qt-x11/Makefile
@@ -6,21 +6,21 @@ PORTVERSION= 4.8.7
DISTVERSIONSUFFIX= -2.el7
CATEGORIES= x11-toolkits linux
PKGNAMESUFFIX= -x11
-LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-qt47-x11-[0-9]*
-
-DATADIR= ${PREFIX}/usr/share/${PORTNAME}4
-DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
-LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
USE_LINUX_RPM= yes
+LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+CONFLICTS= linux-c6-qt47-x11-[0-9]*
+DATADIR= ${PREFIX}/usr/share/${PORTNAME}4
+DESCR= ${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
+
post-patch:
@${RM} -r ${WRKSRC}/usr/share/icons
diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile
index 8d7784261bf2..f3a751a0c765 100644
--- a/x11-toolkits/linux-c7-tk85/Makefile
+++ b/x11-toolkits/linux-c7-tk85/Makefile
@@ -11,16 +11,16 @@ PKGNAMESUFFIX= 85
MAINTAINER= emulation@FreeBSD.org
COMMENT= Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
-
-DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R}
-DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
USE_LINUX_RPM_BAD_PERMS= yes
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R}
+DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
diff --git a/x11/linux-c6-pixman/Makefile b/x11/linux-c6-pixman/Makefile
index ea6888e0020a..117c5733f124 100644
--- a/x11/linux-c6-pixman/Makefile
+++ b/x11/linux-c6-pixman/Makefile
@@ -9,9 +9,10 @@ CATEGORIES= x11 linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/x11/linux-c6-xorg-libs/Makefile b/x11/linux-c6-xorg-libs/Makefile
index 79023a09d704..b035bfd51781 100644
--- a/x11/linux-c6-xorg-libs/Makefile
+++ b/x11/linux-c6-xorg-libs/Makefile
@@ -5,6 +5,15 @@ PORTNAME= xorg-libs
PORTVERSION= 7.4
PORTREVISION= 10
CATEGORIES= x11 linux
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c6
+USE_LDCONFIG= yes
+USE_LINUX= fontconfig
+USE_LINUX_RPM= yes
+
LIB_DISTNAMES= libICE-1.0.6-1.el6 \
libSM-1.2.1-2.el6 \
libX11-1.6.4-3.el6 \
@@ -73,14 +82,6 @@ SRC_DISTFILES= libICE-1.0.6-1.el6${SRC_SUFX}:SOURCE \
libxcb-1.12-4.el6${SRC_SUFX}:SOURCE \
libxkbfile-1.0.6-1.1.el6${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
-
-USES= linux:c6
-USE_LDCONFIG= yes
-USE_LINUX= fontconfig
-USE_LINUX_RPM= yes
-
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/x11/linux-c7-pixman/Makefile b/x11/linux-c7-pixman/Makefile
index bbafcaaa843c..88082635bd38 100644
--- a/x11/linux-c7-pixman/Makefile
+++ b/x11/linux-c7-pixman/Makefile
@@ -9,9 +9,10 @@ CATEGORIES= x11 linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER})
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
.include <bsd.port.mk>
diff --git a/x11/linux-c7-xorg-libs/Makefile b/x11/linux-c7-xorg-libs/Makefile
index 86f19cba6ac0..706e9abeff3c 100644
--- a/x11/linux-c7-xorg-libs/Makefile
+++ b/x11/linux-c7-xorg-libs/Makefile
@@ -5,6 +5,15 @@ PORTNAME= xorg-libs
PORTVERSION= 7.7
PORTREVISION= 6
CATEGORIES= x11 linux
+
+MAINTAINER= emulation@FreeBSD.org
+COMMENT= Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
+
+USES= linux:c7
+USE_LDCONFIG= yes
+USE_LINUX= fontconfig
+USE_LINUX_RPM= yes
+
LIB_DISTNAMES= libICE-1.0.9-9.el7 \
libSM-1.2.2-2.el7 \
libX11-1.6.5-2.el7 \
@@ -76,16 +85,8 @@ SRC_DISTFILES= libICE-1.0.9-9.el7${SRC_SUFX}:SOURCE \
libxkbfile-1.0.9-3.el7${SRC_SUFX}:SOURCE \
libxshmfence-1.2-1.el7${SRC_SUFX}:SOURCE
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
-
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX= fontconfig
-USE_LINUX_RPM= yes
-
OPTIONS_DEFINE= DOCS
post-patch: