Date: Tue, 10 Dec 2013 19:05:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336083 - head/Mk Message-ID: <201312101905.rBAJ5fpL073497@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Dec 10 19:05:41 2013 New Revision: 336083 URL: http://svnweb.freebsd.org/changeset/ports/336083 Log: Disable NO_ARCH for now as it prevent from upgrading from pkg 1.1 to pkg 1.2 (pkg 1.1 will not understand it and claim there invalid ABIs) Let's wait a bit before activating it. Reported by: mat Modified: head/Mk/bsd.licenses.mk head/Mk/bsd.pkgng.mk Modified: head/Mk/bsd.licenses.mk ============================================================================== --- head/Mk/bsd.licenses.mk Tue Dec 10 19:03:36 2013 (r336082) +++ head/Mk/bsd.licenses.mk Tue Dec 10 19:05:41 2013 (r336083) @@ -748,6 +748,7 @@ PLIST_FILES+= ${_LICENSE_DIR_REL}/${lic} . endfor .endif +_DO_INSTALL_SEQ+= install-license install-license: @${MKDIR} ${STAGEDIR}${_LICENSE_DIR} @${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG} @@ -764,10 +765,6 @@ install-license: @${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST} -.else -install-license: - @${DO_NADA} - .endif .else # !LICENSE Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Tue Dec 10 19:03:36 2013 (r336082) +++ head/Mk/bsd.pkgng.mk Tue Dec 10 19:05:41 2013 (r336083) @@ -45,9 +45,9 @@ create-manifest: @${ECHO_CMD} " "${COMMENT:Q} >> ${MANIFESTF} @${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF} @${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF} -.if defined(NO_ARCH) - @${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF} -.endif +#.if defined(NO_ARCH) +# @${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF} +#.endif .if defined(WWW) @${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101905.rBAJ5fpL073497>