config: split off skim.conf, easier to follow

build/distfiles.sh

@@ -31,10 +31,15 @@ SELF=distfiles
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-PORTS_LIST="ports-mgmt/pkg
-security/openssl
-security/libressl
-$(cat ${CONFIGDIR}/ports.conf)"
+PORTS_LIST=$(
+cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
+    while read PORT_ORIGIN PORT_BROKEN; do
+	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
+		continue
+	fi
+	echo ${PORT_ORIGIN}
+done
+)
 
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
@@ -58,13 +63,8 @@ echo "CLEAN_FETCH_ENV=yes" >> ${STAGEDIR}/etc/make.conf
 trap : 2
 
 if ! chroot ${STAGEDIR} /bin/sh -es << EOF; then PORTS_LIST=; fi
-echo "${PORTS_LIST}" | while read PORT_ORIGIN PORT_BROKEN; do
-	if [ "\$(echo \${PORT_ORIGIN} | colrm 2)" = "#" ]; then
-		continue
-	fi
-
+echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
 	echo ">>> Fetching \${PORT_ORIGIN}..."
-
 	make -C ${PORTSDIR}/\${PORT_ORIGIN} fetch-recursive
 done
 EOF

build/ports.sh

@@ -32,7 +32,7 @@ SELF=ports
 . ./common.sh && $(${SCRUB_ARGS})
 
 PORTS_LIST=$(
-cat ${CONFIGDIR}/ports.conf  | while read PORT_ORIGIN PORT_BROKEN; do
+cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_BROKEN; do
 	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
 		continue
 	fi

build/skim.sh

@@ -36,18 +36,13 @@ setup_stage ${STAGEDIR}
 export __MAKE_CONF=${CONFIGDIR}/make.conf
 
 PORTS_LIST=$(
-	# the ports formerly known as `sync'
-	echo devel/gettext
-	echo security/libressl
-	echo security/openssl
-	echo security/vuxml
-	# all the ports that ought to be built
-	cat ${CONFIGDIR}/ports.conf  | while read PORT_ORIGIN PORT_BROKEN; do
-		if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
-			continue
-		fi
-		echo ${PORT_ORIGIN}
-	done
+cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
+    while read PORT_ORIGIN PORT_BROKEN; do
+	if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
+		continue
+	fi
+	echo ${PORT_ORIGIN}
+done
 )
 
 git_update ${PORTSREFDIR} origin/master

config/16.1/skim.conf

@@ -0,0 +1,5 @@
+# the ports formerly known as `sync'
+ports-mgmt/pkg
+security/libressl
+security/openssl
+security/vuxml

config/16.7/skim.conf

@@ -0,0 +1,7 @@
+# the ports formerly known as `sync'
+ports-mgmt/pkg
+security/libressl
+security/openssl
+security/vuxml
+# custom patches in our tree
+www/havp