Check-in [a99484943c]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix staging of licenses
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a99484943cfb9d9bca6308d0d9eeaadd8fa2a5da
User & Date: bdrewery 2012-06-07 02:51:10
Context
2012-06-07
03:04
Fix 'Unassociated shell command' in 'make fake-pkg' check-in: 03e5129017 user: bdrewery tags: trunk
02:51
Fix staging of licenses check-in: a99484943c user: bdrewery tags: trunk
02:46
Fix staging of rc scripts check-in: e7256f39a0 user: bdrewery tags: trunk
Changes

Changes to ports/Mk/bsd.licenses.mk.

746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
.		if defined(_LICENSE_FILE_${lic})
PLIST_FILES+=	${_LICENSE_DIR_REL}/${lic}
.		endif
.	endfor
.endif

install-license:
	@${MKDIR} ${_LICENSE_DIR}
	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${_LICENSE_REPORT}
.if ${_LICENSE_COMB} == "single"
	@${INSTALL_DATA} ${_LICENSE_FILE} ${_LICENSE_DIR}/${_LICENSE}
.else
.	for lic in ${_LICENSE}
	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${_LICENSE_DIR}/${lic}
.	endfor
.endif
# XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
# XXX Important, keep the whitespace behind "@cwd "!
	@${ECHO_CMD} "@cwd " >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST}







|
|
|

|


|







746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
.		if defined(_LICENSE_FILE_${lic})
PLIST_FILES+=	${_LICENSE_DIR_REL}/${lic}
.		endif
.	endfor
.endif

install-license:
	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR}
	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG}
	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${STAGEDIR}${_LICENSE_REPORT}
.if ${_LICENSE_COMB} == "single"
	@${INSTALL_DATA} ${_LICENSE_FILE} ${STAGEDIR}${_LICENSE_DIR}/${_LICENSE}
.else
.	for lic in ${_LICENSE}
	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}
.	endfor
.endif
# XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
# XXX Important, keep the whitespace behind "@cwd "!
	@${ECHO_CMD} "@cwd " >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST}

Changes to ports/Mk/bsd.port.mk.

4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
.else

_INSTALL_DEP=	build
_INSTALL_SEQ=	install-message check-install-conflicts run-depends lib-depends apply-slist pre-install \
				pre-install-script generate-plist check-already-installed
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
				pre-su-install-script create-users-groups do-install \
				install-desktop-entries install-license \
				post-install post-install-script add-plist-info \
				add-plist-docs add-plist-examples add-plist-data \
				add-plist-post fix-plist-sequence compress-man \
				install-ldconfig-file fake-pkg security-check
_PACKAGE_DEP=	install
_PACKAGE_SEQ=	package-message pre-package pre-package-script \
				do-package post-package-script







|







4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
.else

_INSTALL_DEP=	build
_INSTALL_SEQ=	install-message check-install-conflicts run-depends lib-depends apply-slist pre-install \
				pre-install-script generate-plist check-already-installed
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
				pre-su-install-script create-users-groups do-install \
				install-desktop-entries \
				post-install post-install-script add-plist-info \
				add-plist-docs add-plist-examples add-plist-data \
				add-plist-post fix-plist-sequence compress-man \
				install-ldconfig-file fake-pkg security-check
_PACKAGE_DEP=	install
_PACKAGE_SEQ=	package-message pre-package pre-package-script \
				do-package post-package-script