Framework: sync with upstream

Taken from: FreeBSD

GIDs

@@ -103,7 +103,7 @@ pootle:*:158:
 nocat:*:159:
 _ypldap:*:160:
 solr:*:161:
-# free: 162
+octoprint:*:162:
 # free: 163
 # free: 164
 # free: 165
@@ -131,7 +131,7 @@ dnslog:*:186:
 swift:*:187:
 netxms:*:188:
 leofs:*:189:
-# free: 190
+keystone:*:190
 # free: 191
 moinmoin:*:192:
 cups:*:193:

MOVED

@@ -8680,5 +8680,24 @@ net/py-uritemplate.py|net/py-uritemplate|2016-10-12|Upstream has consolidated on
 misc/fortune_strfile||2016-10-14|Has expired: unmaintained and duplicated from base
 mail/elmo-devel|mail/elmo|2016-10-15|Has expired: Same version as mail/elmo, use it instead
 math/libR||2016-10-16|Has expired: math/R LIBR option is now on by default
+security/libbzrtp|security/bzrtp|2016-10-17|Renamed
 devel/gaphor||2016-10-18|Has expired: runtime failure uncorrected for 1 year after first report
 editors/winefish||2016-10-18|Has expired: upstream disappeared (project dead?), segfaults on multiple arches
+misc/jive||2016-10-20|Has expired: Offensive
+devel/pecl-spread||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-mcve||2016-10-20|Has expired: Works only with EOL php 5.5
+security/pecl-tcpwrap||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-shape||2016-10-20|Has expired: Works only with EOL php 5.5
+textproc/pecl-enchant||2016-10-20|Has expired: Works only with EOL php 5.5
+databases/pecl-mysqlnd_ms||2016-10-20|Has expired: Works only with EOL php 5.5
+textproc/pecl-html_parse||2016-10-20|Has expired: Works only with EOL php 5.5
+mail/pecl-esmtp||2016-10-20|Has expired: Works only with EOL php 5.5
+net/pecl-cvsclient||2016-10-20|Has expired: Works only with EOL php 5.5
+databases/pecl-mdbtools||2016-10-20|Has expired: Works only with EOL php 5.5
+databases/pecl-mysqlnd_qc||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-operator||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-parsekit||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-hidef||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-automap||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-bbcode||2016-10-20|Has expired: Works only with EOL php 5.5
+devel/pecl-bcompiler||2016-10-20|Has expired: Works only with EOL php 5.5

Mk/Scripts/qa.sh

@@ -642,7 +642,7 @@ proxydeps() {
 				# Check that the .so we need has a SONAME
 				if [ "${dep_file_pkg}" != "${PKGORIGIN}" ]; then
 					if ! readelf -d "${dep_file}" | grep -q SONAME; then
-						err "${file} is linked to ${dep_file} which does not have a SONAME.  ${dep_file_pkg} needs to be fixed."
+						err "${file} is linked to ${dep_file} which does not have a SONAME.  ${dep_file_pkg} needs to be fixed."
 					fi
 				fi
 

Mk/Uses/linux.mk

@@ -13,6 +13,7 @@
 #		infrastructure ports are made available.  Possible values:
 #		yes	Default LIB_DISTFILES and empty BIN_DISTFILES.
 #		nolib	Default BIN_DISTFILES and empty LIB_DISTFILES.
+#		noarch	Like nolib but distfiles are architecture neutral.
 # Additional variables when USE_LINUX_RPM is defined:
 # BIN_DISTFILES	List of distfiles to install.
 # LIB_DISTFILES	List of distfiles to install both the 32 and 64 bit version of.
@@ -46,6 +47,7 @@ EXPIRATION_DATE=	2016-12-31
 .else
 .if ${LINUX_DEFAULT:M*_64}
 LINUX_ARCH=		x86_64
+LINUX_ARCH32=		i386
 .if ${ARCH} != amd64 || ${OPSYS} != FreeBSD || ${OSVERSION} < 1002507 \
  || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 )
 IGNORE=			Linux ${LINUX_DEFAULT} only supported on FreeBSD/amd64 10.3 or higher
@@ -84,9 +86,14 @@ linux_gnutls_DEP=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnu
 linux_gtk2_DEP=			linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
 linux_hicontheme_DEP=		linux-${linux_ARGS}-hicolor-icon-theme>0:x11-themes/linux-${linux_ARGS}-hicolor-icon-theme
 linux_jasper_DEP=		linux-${linux_ARGS}-jasper>0:graphics/linux-${linux_ARGS}-jasper
+linux_jbigkit_DEP=		linux-${linux_ARGS}-jbigkit>0:graphics/linux-${linux_ARGS}-jbigkit
 linux_jpeg_DEP=			linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg
 linux_libasyncns_DEP=		linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
+.if ${linux_ARGS:Mf10} || ${linux_ARGS:Mc6}
 linux_libaudiofile_DEP=		linux-${linux_ARGS}-libaudiofile>0:audio/linux-${linux_ARGS}-libaudiofile
+.else
+linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-audiofile
+.endif
 linux_libgcrypt_DEP=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
 linux_libgfortran_DEP=		linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
 linux_libglu_DEP=		linux-${linux_ARGS}-libGLU>0:graphics/linux-${linux_ARGS}-libGLU
@@ -117,9 +124,15 @@ linux_pango_DEP=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-p
 linux_pixman_DEP=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
 linux_png_DEP=			linux-${linux_ARGS}-png>0:graphics/linux-${linux_ARGS}-png
 linux_pulseaudio-libs_DEP=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
-linux_qt47_DEP=			linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47
-linux_qt47-webkit_DEP=		linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit
-linux_qt47-x11_DEP=		linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11
+.if ${linux_ARGS:Mc6}
+linux_qt_DEP=			linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47
+linux_qt-x11_DEP=		linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11
+linux_qtwebkit_DEP=		linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit
+.else
+linux_qt_DEP=			linux-${linux_ARGS}-qt>0:devel/linux-${linux_ARGS}-qt
+linux_qt-x11_DEP=		linux-${linux_ARGS}-qt-x11>0:x11-toolkits/linux-${linux_ARGS}-qt-x11
+linux_qtwebkit_DEP=		linux-${linux_ARGS}-qtwebkit>0:www/linux-${linux_ARGS}-qtwebkit
+.endif
 linux_scimlibs_DEP=		linux-${linux_ARGS}-scim-libs>0:textproc/linux-${linux_ARGS}-scim-libs
 linux_sdl12_DEP=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
 linux_sdlimage_DEP=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
@@ -165,7 +178,11 @@ MASTER_SITE_SUBDIR=	releases/${LINUX_DIST_VER}/Everything/${LINUX_ARCH}/os/Packa
 .endif
 DIST_SUBDIR?=		rpm/${LINUX_ARCH}/fedora/${LINUX_DIST_VER}
 
+.if ${USE_LINUX_RPM} == noarch
+LINUX_RPM_ARCH?=	noarch
+.else
 LINUX_RPM_ARCH?=	i386
+.endif
 
 .elif ${linux_ARGS} == c6
 
@@ -178,7 +195,9 @@ MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
 .endif
 DIST_SUBDIR?=		rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER}
 
-.if ${LINUX_ARCH} == x86_64
+.if ${USE_LINUX_RPM} == noarch
+LINUX_RPM_ARCH?=	noarch
+.elif ${LINUX_ARCH} == x86_64
 LINUX_RPM_ARCH?=	x86_64
 LINUX_RPM_ARCH32?=	i686
 .else
@@ -201,7 +220,9 @@ MASTER_SITE_SUBDIR+=	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 .endif
 DIST_SUBDIR?=		rpm/centos/${LINUX_DIST_VER}/${LINUX_ARCH}
 
-.if ${LINUX_ARCH} == x86_64
+.if ${USE_LINUX_RPM} == noarch
+LINUX_RPM_ARCH?=	noarch
+.elif ${LINUX_ARCH} == x86_64
 LINUX_RPM_ARCH?=	x86_64
 LINUX_RPM_ARCH32?=	i686
 .else
@@ -230,12 +251,21 @@ _INCLUDE_USES_LINUX_POST_MK=	yes
 
 .ifdef USE_LINUX_RPM
 
-.if ${USE_LINUX_RPM} == nolib
-BIN_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+.if ${USE_LINUX_RPM} == noarch
+NO_ARCH=		yes
 .else
+ONLY_FOR_ARCHS?=	i386 amd64
+.endif
+
+.if ${USE_LINUX_RPM} == yes
 LIB_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+.else
+BIN_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
 .endif
-.ifdef LINUX_RPM_ARCH32
+.ifdef LINUX_ARCH32 && EXTRACT_SUFX32
+.for fmakehack in ${LINUX_ARCH32}
+.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \
+ && empty(NOT_FOR_ARCHS:M${fmakehack})
 DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
 			${LIB_DISTFILES} ${BIN_DISTFILES}
 EXTRACT_ONLY?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
@@ -244,6 +274,11 @@ EXTRACT_ONLY?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
 DISTFILES?=		${LIB_DISTFILES} ${BIN_DISTFILES}
 EXTRACT_ONLY?=		${LIB_DISTFILES} ${BIN_DISTFILES}
 .endif
+.endfor
+.else
+DISTFILES?=		${LIB_DISTFILES} ${BIN_DISTFILES}
+EXTRACT_ONLY?=		${LIB_DISTFILES} ${BIN_DISTFILES}
+.endif
 .ifdef PACKAGE_BUILDING
 SRC_DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} \
 			${BIN_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/}
@@ -260,8 +295,7 @@ EXTRACT_BEFORE_ARGS=	<
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
 .endif
 
-ONLY_FOR_ARCHS?=	i386 amd64
-.if ${linux_ARGS} != f10
+.if ${linux_ARGS} != f10 && ${USE_LINUX_RPM} != noarch
 PLIST?=			${PKGDIR}/pkg-plist.${LINUX_ARCH}
 .endif
 
@@ -273,4 +307,12 @@ do-install:
 
 .endif # USE_LINUX_RPM
 
+# With fmake :M${var} only works when ${var} is a for loop variable.
+.for fmakehack in ${LINUX_ARCH:S/x86_64/amd64/}
+.if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \
+ || !empty(NOT_FOR_ARCHS:M${fmakehack})
+IGNORE=			does not run on Linux/${LINUX_ARCH}
+.endif
+.endfor
+
 .endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK

Mk/bsd.sites.mk

@@ -239,6 +239,12 @@ MASTER_SITE_EPEL+= \
 	http://dl.fedoraproject.org/pub/epel/6/SRPMS/:SOURCE
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_EPEL7)
+MASTER_SITE_EPEL7+= \
+	http://dl.fedoraproject.org/pub/epel/7/${LINUX_ARCH}/%SUBDIR%/ \
+	http://dl.fedoraproject.org/pub/epel/7/SRPMS/%SUBDIR%/:SOURCE
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)
 MASTER_SITE_FEDORA_LINUX+= \
 	http://archives.fedoraproject.org/pub/archive/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \

UIDs

@@ -108,7 +108,7 @@ pootle:*:158:158::0:0:Pootle User:/var/db/pootle:/usr/sbin/nologin
 nocat:*:159:159::0:0:NoCat Daemon:/libexec/nocat:/sbin/nologin
 _ypldap:*:160:160::0:0:YP Ldap unprivileged user:/var/empty:/usr/sbin/nologin
 solr:*:161:161::0:0:Apache Solr System:/var/db/solr:/usr/sbin/nologin
-# free: 162
+octoprint:*:162:162::0:0:OctoPrint Daemon:/usr/local/octoprint:/usr/sbin/nologin
 # free: 163
 # free: 164
 # free: 165
@@ -136,7 +136,7 @@ dnslog:*:186:186::0:0:dnslog pseudo-user:/nonexistent:/usr/sbin/nologin
 swift:*:187:187::0:0:Swift daemon pseudo-user:/nonexistent:/usr/sbin/nologin
 netxms:*:188:188::0:0:netxms pseudo-user:/nonexistent:/usr/sbin/nologin
 leofs:*:189:189::0:0:LeoFS daemons pseudo-user:/var/db/leofs:/usr/sbin/nologin
-# free: 190
+keystone:*:190:190::0:0:Keystone pseudo-user:/var/lib/keystone:/usr/sbin/nologin
 # free: 191
 moinmoin:*:192:192::0:0:MoinMoin User:/nonexistent:/usr/sbin/nologin
 cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin