build: mostly FLAVOR support, some bug in fetch-recursive

build/distfiles.sh

@@ -84,6 +84,8 @@ trap : 2
 
 if ! ${ENV_FILTER} chroot ${STAGEDIR} /bin/sh -es << EOF; then PORTS_LIST=; fi
 echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
+	# XXX incomplete FLAVOR support, error in fetch-recursive
+	PORT_ORIGIN=\${PORT_ORIGIN%%@*}
 	echo ">>> Fetching \${PORT_ORIGIN}..."
 	make -C ${PORTSDIR}/\${PORT_ORIGIN} fetch-recursive \
 	    PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \

build/ports.sh

@@ -132,8 +132,15 @@ pkg autoremove -y
 pkg create -nao ${PACKAGESDIR}/All
 
 echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
+	FLAVOR=\${PORT_ORIGIN##*@}
+	PORT=\${PORT_ORIGIN%%@*}
+	if [ \${FLAVOR} = \${PORT} ]; then
+		# not a flavour
+		FLAVOR=
+	fi
 	# check whether the package has already been built
-	PKGFILE=\$(make -C ${PORTSDIR}/\${PORT_ORIGIN} -V PKGFILE \
+	PKGFILE=\$(make -C ${PORTSDIR}/\${PORT} \
+	    -V PKGFILE FLAVOR=\${FLAVOR} \
 	    PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
 	    PRODUCT_PHP=${PRODUCT_PHP} \
 	    PACKAGES=${PACKAGESDIR} \
@@ -154,7 +161,7 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
 		fi
 	fi
 
-	make -s -C ${PORTSDIR}/\${PORT_ORIGIN} install \
+	make -s -C ${PORTSDIR}/\${PORT} install FLAVOR=\${FLAVOR} \
 	    PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
 	    PRODUCT_PHP=${PRODUCT_PHP} \
 	    PACKAGES=${PACKAGESDIR} \
@@ -173,7 +180,7 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
 		pkg create -no ${PACKAGESDIR}/All \${PKGNAME}
 	done
 
-	make -s -C ${PORTSDIR}/\${PORT_ORIGIN} clean \
+	make -s -C ${PORTSDIR}/\${PORT} clean FLAVOR=\${FLAVOR} \
 	    PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
 	    PRODUCT_PHP=${PRODUCT_PHP} \
 	    UNAME_r=\$(freebsd-version)

build/skim.sh

@@ -91,7 +91,12 @@ PORTS_COUNT=$(wc -l ${STAGEDIR}/skim | awk '{ print $1 }')
 PORTS_NUM=0
 
 while read PORT_ORIGIN PORT_BROKEN; do
-	PORT=${PORT_ORIGIN}
+	FLAVOR=${PORT_ORIGIN##*@}
+	PORT=${PORT_ORIGIN%%@*}
+	if [ ${FLAVOR} = ${PORT} ]; then
+		# not a flavour
+		FLAVOR=
+	fi
 
 	SOURCE=${PORTSDIR}
 	if [ ! -d ${PORTSDIR}/${PORT} ]; then
@@ -99,12 +104,13 @@ while read PORT_ORIGIN PORT_BROKEN; do
 	fi
 
 	PORT_DEPS=$(echo ${PORT}; ${ENV_FILTER} make -C ${SOURCE}/${PORT} \
-	    PORTSDIR=${SOURCE} ${MAKE_ARGS} all-depends-list | \
-	    awk -F"${SOURCE}/" '{print $2}')
+	    PORTSDIR=${SOURCE} FLAVOR=${FLAVOR} ${MAKE_ARGS} \
+	    all-depends-list | awk -F"${SOURCE}/" '{print $2}')
 
 	for PORT in ${PORT_DEPS}; do
 		PORT_MASTER=$(${ENV_FILTER} make -C ${SOURCE}/${PORT} \
-		    -V MASTER_PORT PORTSDIR=${SOURCE} ${MAKE_ARGS})
+		    -V MASTER_PORT FLAVOR=${FLAVOR} PORTSDIR=${SOURCE} \
+		    ${MAKE_ARGS})
 		if [ -n "${PORT_MASTER}" ]; then
 			PORT_DEPS="${PORT_DEPS} ${PORT_MASTER}"
 		fi

config/17.7/ports.conf

@@ -21,7 +21,7 @@ comms/kermit				arm
 converters/php${PRODUCT_PHP}-mbstring	arm
 databases/php${PRODUCT_PHP}-mysqli	arm
 databases/php${PRODUCT_PHP}-sqlite3
-databases/py-sqlite3
+databases/py-sqlite3@py27
 databases/redis				arm
 databases/rrdtool12
 devel/automake
@@ -43,8 +43,8 @@ devel/php${PRODUCT_PHP}-json
 devel/php-xdebug
 devel/phpunit6
 devel/pkgconf
-devel/py-Jinja2
-devel/py-ujson
+devel/py-Jinja2@py27
+devel/py-ujson@py27
 devel/scons
 dns/bind911				arm
 dns/ddclient				arm
@@ -70,7 +70,7 @@ math/php${PRODUCT_PHP}-bcmath		arm
 misc/gnu-watch				arm
 misc/help2man
 misc/mc-light				arm
-net-im/py-telepot			arm
+net-im/py-telepot@py27			arm
 net-mgmt/bandwidthd			arm
 net-mgmt/bsnmp-regex
 net-mgmt/bsnmp-ucd
@@ -113,7 +113,7 @@ net/php${PRODUCT_PHP}-ldap
 net/php${PRODUCT_PHP}-soap		arm
 net/php${PRODUCT_PHP}-sockets
 net/proxy-suite
-net/py-netaddr
+net/py-netaddr@py27
 net/quagga				arm
 net/radvd
 net/relayd				arm
@@ -145,7 +145,7 @@ security/php${PRODUCT_PHP}-filter
 security/php${PRODUCT_PHP}-hash
 security/php${PRODUCT_PHP}-mcrypt
 security/php${PRODUCT_PHP}-openssl
-security/py-fail2ban
+security/py-fail2ban@py27
 security/softether			arm
 security/softether-devel		arm
 security/strongswan
@@ -192,7 +192,7 @@ www/phalcon
 www/php${PRODUCT_PHP}-session
 www/polipo				arm
 www/privoxy				arm
-www/py-requests
+www/py-requests@py27
 www/sarg				arm
 www/squid
 www/tinyproxy				arm