Framework: partially sync with upstream

Taken from: FreeBSD

Mk/Scripts/do-depends.sh

@@ -132,11 +132,11 @@ for _line in ${dp_RAWDEPENDS} ; do
 		target=${last}
 		if [ -n "${dp_DEPENDS_PRECLEAN}" ]; then
 			target="clean ${target}"
-			depends_args="NOCLEANDEPENDS=yes"
+			depends_args="${depends_args:+${depends_args} }NOCLEANDEPENDS=yes"
 		fi
 		if [ -n "${dp_DEPENDS_CLEAN}" ]; then
 			target="${target} clean"
-			depends_args="NOCLEANDEPENDS=yes"
+			depends_args="${depends_args:+${depends_args} }NOCLEANDEPENDS=yes"
 		fi
 	fi
 

Mk/Scripts/do-users-groups.sh

@@ -117,7 +117,8 @@ if [ -n "${USERS}" ]; then
 				/|/nonexistent|/var/empty)
 					;;
 				*)
-					echo "${dp_INSTALL} -d -g $gid -o $uid $homedir" >> "${dp_UG_INSTALL}"
+					group=$(awk -F: -v gid=${gid} '$3 == gid { print $1 }' ${dp_GID_FILES})
+					echo "${dp_INSTALL} -d -g $group -o $login $homedir" >> "${dp_UG_INSTALL}"
 					;;
 			esac
 		done <<-eot

Mk/bsd.port.mk

@@ -1465,6 +1465,16 @@ PKG_NOTES+=	no_provide_shlib
 PKG_NOTE_no_provide_shlib=	yes
 .endif
 
+.if defined(DEPRECATED)
+PKG_NOTES+=	deprecated
+PKG_NOTE_deprecated=${DEPRECATED}
+.endif
+
+.if defined(EXPIRATION_DATE)
+PKG_NOTES+=	expiration_date
+PKG_NOTE_expiration_date=	${EXPIRATION_DATE}
+.endif
+
 TEST_ARGS?=		${MAKE_ARGS}
 TEST_ENV?=		${MAKE_ENV}