mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00
Code Issues Releases Activity

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)

Browse Source 
Let's wait a bit before activating it.

Reported by:	mat
This commit is contained in:
Baptiste Daroussin 2013-12-10 19:05:41 +00:00
parent ed439807d2
commit 48d34b8d40
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336083
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mk/bsd.licenses.mk
View File

@ -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

6
Mk/bsd.pkgng.mk
View File

@ -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