Author: bdrewery Date: Thu Apr 21 16:30:28 2016 New Revision: 298417 URL: https://svnweb.freebsd.org/changeset/base/298417
Log: Remove redundant logic from the pkg-base merge. These will be set from the logic right above it. Reviewed by: gjb Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Apr 21 16:30:25 2016 (r298416) +++ head/Makefile.inc1 Thu Apr 21 16:30:28 2016 (r298417) @@ -195,10 +195,6 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .endif .if !defined(PKG_VERSION) -REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION -BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH -SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ - ${SRCDIR}/sys/sys/param.h .if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*} TIMENOW= %Y%m%d%H%M%S EXTRA_REVISION= .s${TIMENOW:gmtime} _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"