Index: bsd.linux-apps.mk
===================================================================
--- bsd.linux-apps.mk	(revision 418638)
+++ bsd.linux-apps.mk	(working copy)
@@ -41,11 +41,11 @@
 
 #new
 . if defined(OVERRIDE_LINUX_NONBASE_PORTS)
-.        if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
+.        if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64"
 LINUX_DIST_SUFFIX=      -${OVERRIDE_LINUX_NONBASE_PORTS}
 LINUX_BASEPORT_NAME=	-${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//}
 .        else
-IGNORE=         valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\", \"c6\", and \"c6_64\"
+IGNORE=         valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"c7\", \"c7_64", \"f10\", \"c6\", and \"c6_64\"
 .        endif
 . elif defined(USE_LINUX)
 LINUX_DIST_SUFFIX=      -${USE_LINUX}
Index: bsd.linux-rpm.mk
===================================================================
--- bsd.linux-rpm.mk	(revision 418638)
+++ bsd.linux-rpm.mk	(working copy)
@@ -12,6 +12,8 @@
 #					  e.g. 10 for fedora 10
 #					  Valid values for "centos": all version numbers
 #					  e.g. 6.8 for centos 6.8
+#					  Valid values for "centos7": all version numbers
+#					  e.g. 7.2.1511 for centos 7.2.1511
 #					  This is used to set MASTER_SITE_{,SRC_}SUBDIR
 #					  if it isn't already set.
 # MASTER_SITE_SRC_SUBDIR
@@ -61,6 +63,9 @@
 USE_LINUX?=	"f10"
 LINUX_DIST=	fedora
 LINUX_DIST_VER=	10
+.elif ${USE_LINUX} == "c7" || ${USE_LINUX} == "c7_64"
+LINUX_DIST=	centos
+LINUX_DIST_VER=	7.2.1511
 .else			# default to CentOS
 LINUX_DIST=	centos
 LINUX_DIST_VER=	6.8
@@ -88,8 +93,8 @@
 .		endif
 .	elif ${LINUX_DIST} == "centos"
 MASTER_SITES?=		${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES}
-MASTER_SITE_SUBDIR?=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
-			centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
+MASTER_SITE_SUBDIR?=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages \
+			centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages
 .		if ${LINUX_DIST_VER} == "5" #needed for Qt...
 LINUX_RPM_ARCH=		i386
 MASTER_SITE_SUBDIR=	centos/5/os/i386/Packages/
@@ -97,11 +102,16 @@
 .		if defined(PACKAGE_BUILDING)
 _SRC_GROUP=:SOURCE
 MASTER_SITES+=  http://vault.centos.org/%SUBDIR%/:SOURCE
-MASTER_SITE_SUBDIR+=	${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE
+MASTER_SITE_SUBDIR+=	${LINUX_DIST_VER}/os/Source/SPackages:SOURCE
 .		endif
 .	endif
 .endif
 
+.if ${USE_LINUX} == "c7_64"
+LINUX_REPO_ARCH=	x86_64
+LINUX_RPM_ARCH=		x86_64
+.endif
+
 PKGNAMEPREFIX?=			linux-${USE_LINUX}-
 
 # DISTFILES and SRC_DISTFILES assume that there is only one bindist
@@ -118,7 +128,7 @@
 WRKSRC:=		${WRKSRC:S/-${RPMVERSION}$//}
 
 # Define files to install.
-# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS) is off,
+# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS is off),
 # they can want to install both 32bit and 64bit things of only one package,
 # or they can want to install a 64bit only binary and e.g. 32/64bit libraries.
 
@@ -125,7 +135,8 @@
 # The following glue is supposed to handle this.
 # FIXME: Sensibly refactor this part, it looks like spaghetti.
 
-.   if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
+.   if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ( ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" || \
+${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64" )
 _32BIT_LINUX_RPM_ARCH=  i686
 .       if ${DISTFILES} == ${DISTNAME}${EXTRACT_SUFX} && ${USE_LINUX_RPM} != "nolib"
 _32BIT_LIB_DISTFILES:=   ${DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
@@ -146,7 +157,7 @@
 .	endif
 
 .if !defined(USE_LINUX_RPM_BAD_PERMS)
-EXTRACT_CMD?=			${TAR}
+EXTRACT_CMD?=		${TAR}
 EXTRACT_BEFORE_ARGS?=	--no-same-permissions --no-same-owner -xf
 EXTRACT_AFTER_ARGS?=
 .else
@@ -187,9 +198,13 @@
 _LINUX_BASE_SUFFIX=		c6
 .	elif ${USE_LINUX} == "c6_64"
 _LINUX_BASE_SUFFIX=		c6
+.	elif ${USE_LINUX} == "c7"
+_LINUX_BASE_SUFFIX==		c7
+.       elif ${USE_LINUX} == "c7_64"
+_LINUX_BASE_SUFFIX==            c7_64
 .	else
 # other linux_base ports do not provide a pkg-plist file
-IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\", \"c6\", and \"c6_64\"
+IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"c7\", \"c7_64\", \"f10\", \"c6\", and \"c6_64\"
 .  endif
 
 PLIST?=					${WRKDIR}/.PLIST.linux-rpm