Import of pkgsrc-2014Q1

mk/pkgformat/pkg/depends.mk

@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.3 2013/05/09 23:37:26 riastradh Exp $
+# $NetBSD: depends.mk,v 1.4 2014/03/08 11:46:14 obache Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -162,13 +162,13 @@ _DEPENDS_INSTALL_CMD=							\
 
 ${_DEPENDS_FILE}:
 	${RUN} ${MKDIR} ${.TARGET:H}
-	${RUN} ${_LIST_DEPENDS_CMD} > ${.TARGET}
+	${RUN} ${_LIST_DEPENDS_CMD} > ${.TARGET} || (${RM} -f ${.TARGET} && ${FALSE})
 
 ${_RDEPENDS_FILE}: ${_DEPENDS_FILE}
-	${RUN} ${_RESOLVE_DEPENDS_CMD} > ${.TARGET}
+	${RUN} ${_RESOLVE_DEPENDS_CMD} > ${.TARGET} || (${RM} -f ${.TARGET} && ${FALSE})
 
 ${_RRDEPENDS_FILE}: ${_RDEPENDS_FILE}
-	${RUN} ${_REDUCE_RESOLVED_DEPENDS_CMD} > ${.TARGET}
+	${RUN} ${_REDUCE_RESOLVED_DEPENDS_CMD} > ${.TARGET} || (${RM} -f ${.TARGET} && ${FALSE})
 
 # _pkgformat-install-dependencies:
 #	Installs any missing dependencies.

mk/pkgformat/pkg/metadata.mk

@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.5 2013/03/07 13:15:29 obache Exp $
+# $NetBSD: metadata.mk,v 1.8 2014/03/02 07:18:36 obache Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -24,7 +24,7 @@ _BUILD_DATE_cmd=	${DATE} "+%Y-%m-%d %H:%M:%S %z"
 _BUILD_HOST_cmd=	${UNAME} -a
 _METADATA_TARGETS+=	${_BUILD_INFO_FILE}
 
-${_BUILD_INFO_FILE}: plist
+${_BUILD_INFO_FILE}: ${_PLIST_NOKEYWORDS}
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}${RM} -f ${.TARGET}.tmp
 	${RUN} (${_BUILD_DEFS:NPATH:@v@${ECHO} ${v}=${${v}:Q} ;@})	\
@@ -70,6 +70,10 @@ ${_BUILD_INFO_FILE}: plist
 		fi;							\
 		linklibs=`${AWK} '/.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \
 		for i in $$linklibs; do					\
+			case "$$i" in					\
+			${CHECK_SHLIBS_SKIP:U:@p@${DESTDIR}${PREFIX}/${p}) continue ;;@}	\
+			*);;						\
+			esac;						\
 			if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then	\
 				${TEST} ${PKG_DEVELOPER:Uno:Q}"" = "no" || \
 					${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \
@@ -293,7 +297,7 @@ ${_PRESERVE_FILE}:
 _SIZE_PKG_FILE=		${PKG_DB_TMPDIR}/+SIZE_PKG
 _METADATA_TARGETS+=	${_SIZE_PKG_FILE}
 
-${_SIZE_PKG_FILE}: plist
+${_SIZE_PKG_FILE}: ${PLIST}
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN} \
 	${CAT} ${PLIST} |						\
@@ -386,7 +390,6 @@ _CONTENTS_TARGETS+=	${_DEPENDS_FILE}
 _CONTENTS_TARGETS+=	${_DESCR_FILE}
 _CONTENTS_TARGETS+=	${_MESSAGE_FILE}
 _CONTENTS_TARGETS+=	${_DEPENDS_PLIST}
-_CONTENTS_TARGETS+=	plist
 _CONTENTS_TARGETS+=	${_PRESERVE_FILE}
 _CONTENTS_TARGETS+=	${_SIZE_ALL_FILE}
 _CONTENTS_TARGETS+=	${_SIZE_PKG_FILE}

mk/pkgformat/pkg/package.mk

@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.2 2013/05/23 13:18:56 obache Exp $
+# $NetBSD: package.mk,v 1.3 2013/08/10 06:05:57 obache Exp $
 
 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -49,7 +49,7 @@ package-create: package-remove ${PKGFILE} package-links
 .if ${_USE_DESTDIR} == "no"
 stage-package-create:	package-create
 .else
-stage-package-create:	stage-install stage-package-remove ${STAGE_PKGFILE}
+stage-package-create:	stage-install ${STAGE_PKGFILE}
 .endif
 
 _PKG_ARGS_PACKAGE+=	${_PKG_CREATE_ARGS}