 @@ -1,212 +1,213 @@
-# $NetBSD: package.mk,v 1.8 2015/02/01 11:24:58 obache Exp $
+# $NetBSD: package.mk,v 1.9 2015/02/16 10:50:33 jperkin Exp $
 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
 .  if ${PKG_SUFX} == ".tgz"
 PKG_COMPRESSION=	gzip
 .  elif ${PKG_SUFX} == ".tbz"
 PKG_COMPRESSION=	bzip2
 .  else
 WARNINGS+=		"Unsupported value for PKG_SUFX"
 .  endif
 .endif
 PKG_SUFX?=		.tgz
 FILEBASE?=		${PKGBASE}
 PKGFILE?=		${PKGREPOSITORY}/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 .if ${_USE_DESTDIR} == "no"
 . if !empty(SIGN_PACKAGES:Mgpg)
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 . elif !empty(SIGN_PACKAGES:Mx509)
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 . else
 STAGE_PKGFILE?=		${PKGFILE}
 . endif
 .else
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 .endif
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
 PKGREPOSITORYSUBDIR?=	All
 ######################################################################
 ### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### package-check-installed verifies that the package is installed on
 ### the system.
 ###
 .PHONY: package-check-installed
 package-check-installed:
 	${RUN} ${PKG_INFO} -qe ${PKGNAME} \
 	|| ${FAIL_MSG} "${PKGNAME} is not installed."
 ######################################################################
 ### package-create (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### package-create creates the binary package.
 ###
 .PHONY: package-create
 package-create: ${PKGFILE} package-links
 ######################################################################
 ### stage-package-create (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### stage-package-create creates the binary package for stage install.
 ###
 .PHONY: stage-package-create
 .if ${_USE_DESTDIR} == "no"
 stage-package-create:	package-create
 .else
 stage-package-create:	stage-install ${STAGE_PKGFILE}
 .endif
 _PKG_ARGS_PACKAGE+=	${_PKG_CREATE_ARGS}
 _PKG_ARGS_PACKAGE+=	-F ${PKG_COMPRESSION}
 .if ${_USE_DESTDIR} == "no"
 _PKG_ARGS_PACKAGE+=	-p ${PREFIX}
 .else
 _PKG_ARGS_PACKAGE+=	-I ${PREFIX} -p ${DESTDIR}${PREFIX}
 .  if ${_USE_DESTDIR} == "user-destdir"
 _PKG_ARGS_PACKAGE+=	-u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
 .  endif
 .endif
 ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
 	${RUN} ${MKDIR} ${.TARGET:H}
 	@${STEP_MSG} "Creating binary package ${.TARGET}"
 	${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};	\
 	if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then		\
 		${MV} -f "$$tmpname" ${.TARGET};			\
 	else								\
 		exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode;	\
 	fi
 .if ${PKGFILE} != ${STAGE_PKGFILE}
 ${PKGFILE}: ${STAGE_PKGFILE}
 	${RUN} ${MKDIR} ${.TARGET:H}
 . if !empty(SIGN_PACKAGES:U:Mgpg)
 	@${STEP_MSG} "Creating signed binary package ${.TARGET} (GPG)"
 	${PKG_ADMIN} gpg-sign-package ${STAGE_PKGFILE} ${PKGFILE}
 . elif !empty(SIGN_PACKAGES:U:Mx509)
 	@${STEP_MSG} "Creating signed binary package ${.TARGET} (X509)"
 	${PKG_ADMIN} x509-sign-package ${STAGE_PKGFILE} ${PKGFILE}	\
 		${X509_KEY} ${X509_CERTIFICATE}
 . else
 	@${STEP_MSG} "Creating binary package ${.TARGET}"
 	${LN} -f ${STAGE_PKGFILE} ${PKGFILE} 2>/dev/null || \
 		${CP} -pf ${STAGE_PKGFILE} ${PKGFILE}
 . endif
 .endif
 ######################################################################
 ### package-remove (PRIVATE)
 ######################################################################
 ### package-remove removes the binary package from the package
 ### repository.
 ###
 .PHONY: package-remove
 package-remove:
 	${RUN} ${RM} -f ${PKGFILE}
 ######################################################################
 ### stage-package-remove (PRIVATE)
 ######################################################################
 ### stage-package-remove removes the binary package for stage install
 ###
 .PHONY: stage-package-remove
 stage-package-remove:
 	${RUN} ${RM} -f ${STAGE_PKGFILE}
 ######################################################################
 ### package-links (PRIVATE)
 ######################################################################
 ### package-links creates symlinks to the binary package from the
 ### non-primary categories to which the package belongs.
 ###
 package-links: delete-package-links
 .for _dir_ in ${CATEGORIES:S/^/${PACKAGES}\//}
 	${RUN} ${MKDIR} ${_dir_:Q}
 	${RUN} [ -d ${_dir_:Q} ]					\
 	|| ${FAIL_MSG} "Can't create directory "${_dir_:Q}"."
 	${RUN} ${RM} -f ${_dir_:Q}/${PKGFILE:T}
 	${RUN} ${LN} -s ../${PKGREPOSITORYSUBDIR}/${PKGFILE:T} ${_dir_:Q}
 .endfor
 ######################################################################
 ### delete-package-links (PRIVATE)
 ######################################################################
 ### delete-package-links removes the symlinks to the binary package from
 ### the non-primary categories to which the package belongs.
 ###
 delete-package-links:
 	${RUN} ${FIND} ${PACKAGES} -type l -name ${PKGFILE:T} -print	\
 	| ${XARGS} ${RM} -f
 ######################################################################
 ### tarup (PUBLIC)
 ######################################################################
 ### tarup is a public target to generate a binary package from an
 ### installed package instance.
 ###
 _PKG_TARUP_CMD= ${LOCALBASE}/bin/pkg_tarup
 .PHONY: tarup
 tarup: package-remove tarup-pkg package-links
 ######################################################################
 ### tarup-pkg (PRIVATE)
 ######################################################################
 ### tarup-pkg creates a binary package from an installed package instance
 ### using "pkg_tarup".
 ###
 tarup-pkg:
 	${RUN} [ -x ${_PKG_TARUP_CMD} ] || exit 1;			\
 	${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX}	\
 		PKGREPOSITORY=${PKGREPOSITORY}				\
 		${_PKG_TARUP_CMD} -f ${FILEBASE} ${PKGNAME}
 ######################################################################
 ### package-install (PUBLIC)
 ######################################################################
 ### When DESTDIR support is active, package-install uses package to
 ### create a binary package and installs it.
 ### Otherwise it is identical to calling package.
 ###
 .PHONY: package-install real-package-install su-real-package-install
 .if defined(_PKGSRC_BARRIER)
 package-install: package real-package-install
 .else
 package-install: barrier
 .endif
 .PHONY: stage-package-install
 .if defined(_PKGSRC_BARRIER)
 stage-package-install: stage-package-create real-package-install
 .else
 stage-package-install: barrier
 .endif
 .if ${_USE_DESTDIR} != "no"
 .  if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 real-package-install: su-real-package-install
 .  else
 real-package-install: su-target
 .  endif
 .else
 real-package-install:
 	@${DO_NADA}
 .endif
 MAKEFLAGS.su-real-package-install=	PKGNAME_REQD=${PKGNAME_REQD:Q}
 su-real-package-install:
 	@${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 	@${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
 	${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
 	@${ECHO} "Fixing recorded cwd..."
 	@${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
 	@${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
 .else
 	${RUN} case ${_AUTOMATIC:Q}"" in					\
 	[yY][eE][sS])	${PKG_ADD} -A ${STAGE_PKGFILE} ;;		\
 	*)		${PKG_ADD} ${STAGE_PKGFILE} ;;			\
 	esac
 .endif