Check-in [599871a874]

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

Overview
Comment:Really out of the stagedir
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:599871a874a047798666d2fd0de96cb7df950858
User & Date: bapt 2013-09-19 12:34:04
Context
2013-09-19
18:15
Fix package building with stage and pkgng check-in: f81dd2951c user: bapt tags: trunk
12:34
Really out of the stagedir check-in: 599871a874 user: bapt tags: trunk
12:33
Create package out of the STAGEDIR check-in: 915fcdbebd user: bapt tags: trunk
Changes

Changes to stage.patch.

255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
+	fi; \
+	if [ -f ${PKGREQ} ]; then \
+		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -r ${PKGREQ}"; \
+	fi; \
+	if [ -f ${PKGMESSAGE} ]; then \
+		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
+	fi; \
+	if ${PKG_CMD} ${PKG_ARGS} ${PKGFILE}; then \
+		if [ -d ${PACKAGES} ]; then \
+			cd ${.CURDIR} && eval ${MAKE} package-links; \
+		fi; \
+	else \
+		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		exit 1; \
+	fi







|







255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
+	fi; \
+	if [ -f ${PKGREQ} ]; then \
+		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -r ${PKGREQ}"; \
+	fi; \
+	if [ -f ${PKGMESSAGE} ]; then \
+		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
+	fi; \
+	if ${PKG_CMD} -s ${STAGEDIR} ${PKG_ARGS} ${PKGFILE}; then \
+		if [ -d ${PACKAGES} ]; then \
+			cd ${.CURDIR} && eval ${MAKE} package-links; \
+		fi; \
+	else \
+		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		exit 1; \
+	fi