Check-in [d674efab64]

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

Overview
Comment:Fix typo
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d674efab6458f6699889b785e51ca02a72df6c9d
User & Date: bapt 2013-09-21 23:54:22
Context
2013-09-22
00:47
Fix info pages with pkg_install check-in: 1fe847151c user: bapt tags: trunk
2013-09-21
23:54
Fix typo check-in: d674efab64 user: bapt tags: trunk
23:50
Remove useless comments check-in: 464e66becb user: bapt tags: trunk
Changes

Changes to stage.patch.

1
2
3
4
5
6
7
8
9
10
11
..
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
...
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
...
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
Index: bsd.licenses.mk
===================================================================
diff --git a/head/Mk/bsd.licenses.mk b/head/Mk/bsd.licenses.mk
--- a/head/Mk/bsd.licenses.mk	(revision 327785)
+++ b/head/Mk/bsd.licenses.mk	(working copy)
@@ -749,14 +749,14 @@
 .endif
 
 install-license:
-	@${MKDIR} ${_LICENSE_DIR}
-	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
................................................................................
+	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}
 .	endfor
 .endif
 # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
Index: bsd.pkgng.mk
===================================================================
diff --git a/head/Mk/bsd.pkgng.mk b/head/Mk/bsd.pkgng.mk
--- a/head/Mk/bsd.pkgng.mk	(revision 327785)
+++ b/head/Mk/bsd.pkgng.mk	(working copy)
@@ -36,14 +36,7 @@
 		${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
 	fi
 
-.if !target(fake-pkg)
-fake-pkg:
................................................................................
 .endif
+.endif
 
 .endif # defined(_POSTMKINCLUDED)
Index: bsd.port.mk
===================================================================
diff --git a/head/Mk/bsd.port.mk b/head/Mk/bsd.port.mk
--- a/head/Mk/bsd.port.mk	(revision 327785)
+++ b/head/Mk/bsd.port.mk	(working copy)
@@ -1121,6 +1121,10 @@
 USESDIR?=		${PORTSDIR}/Mk/Uses
 LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
 
+.if defined(FORCE_STAGE)
+.undef NO_STAGE
................................................................................
 # Utility targets follow
 
 .if !target(check-already-installed)
@@ -3989,9 +4034,12 @@
 .if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
 .if defined(USE_LDCONFIG)
 .if defined(USE_LINUX_PREFIX)
+.if defined(NO_STAGE}
 	@${ECHO_MSG} "===>   Running linux ldconfig"
 	${LDCONFIG_CMD}
+.endif
 .else
+.if defined(NO_STAGE)
 .if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Running ldconfig"
................................................................................
+	@(${MKDIR} "${STAGEDIR}${DESKTOPDIR}" 2> /dev/null) || \
 		(${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1)
 	@set -- ${DESKTOP_ENTRIES} XXX; \
 	if [ -z "${_DESKTOPDIR_REL}" ]; then \
Index: bsd.python.mk
===================================================================
diff --git a/head/Mk/bsd.python.mk b/head/Mk/bsd.python.mk
--- a/head/Mk/bsd.python.mk	(revision 327785)
+++ b/head/Mk/bsd.python.mk	(working copy)
@@ -534,6 +534,9 @@
 PYDISTUTILS_CONFIGUREARGS?=
 PYDISTUTILS_BUILDARGS?=
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
+.if !defined(NO_STAGE)
+PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
................................................................................
+.endif
 PYDISTUTILS_PKGNAME?=	${PORTNAME}
 PYDISTUTILS_PKGVERSION?=${PORTVERSION}
 PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
Index: bsd.sanity.mk
===================================================================
diff --git a/head/Mk/bsd.sanity.mk b/head/Mk/bsd.sanity.mk
--- a/head/Mk/bsd.sanity.mk	(revision 327785)
+++ b/head/Mk/bsd.sanity.mk	(working copy)
@@ -96,6 +96,14 @@
 DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
 .endif
 
+.if !defined(NO_STAGE) && defined(_MANPAGES)
+DEV_WARNING+=	"MAN* macros are deprecated when using stage directory"



|







 







|







 







|







 







|







 







|







 







|







1
2
3
4
5
6
7
8
9
10
11
..
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
...
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
...
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
Index: bsd.licenses.mk
===================================================================
diff --git a/head/Mk/bsd.licenses.mk b/head/Mk/bsd.licenses.mk
--- a/head/Mk/bsd.licenses.mk	(revision 327843)
+++ b/head/Mk/bsd.licenses.mk	(working copy)
@@ -749,14 +749,14 @@
 .endif
 
 install-license:
-	@${MKDIR} ${_LICENSE_DIR}
-	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
................................................................................
+	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}
 .	endfor
 .endif
 # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
Index: bsd.pkgng.mk
===================================================================
diff --git a/head/Mk/bsd.pkgng.mk b/head/Mk/bsd.pkgng.mk
--- a/head/Mk/bsd.pkgng.mk	(revision 327843)
+++ b/head/Mk/bsd.pkgng.mk	(working copy)
@@ -36,14 +36,7 @@
 		${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
 	fi
 
-.if !target(fake-pkg)
-fake-pkg:
................................................................................
 .endif
+.endif
 
 .endif # defined(_POSTMKINCLUDED)
Index: bsd.port.mk
===================================================================
diff --git a/head/Mk/bsd.port.mk b/head/Mk/bsd.port.mk
--- a/head/Mk/bsd.port.mk	(revision 327843)
+++ b/head/Mk/bsd.port.mk	(working copy)
@@ -1121,6 +1121,10 @@
 USESDIR?=		${PORTSDIR}/Mk/Uses
 LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
 
+.if defined(FORCE_STAGE)
+.undef NO_STAGE
................................................................................
 # Utility targets follow
 
 .if !target(check-already-installed)
@@ -3989,9 +4034,12 @@
 .if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
 .if defined(USE_LDCONFIG)
 .if defined(USE_LINUX_PREFIX)
+.if defined(NO_STAGE)
 	@${ECHO_MSG} "===>   Running linux ldconfig"
 	${LDCONFIG_CMD}
+.endif
 .else
+.if defined(NO_STAGE)
 .if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Running ldconfig"
................................................................................
+	@(${MKDIR} "${STAGEDIR}${DESKTOPDIR}" 2> /dev/null) || \
 		(${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1)
 	@set -- ${DESKTOP_ENTRIES} XXX; \
 	if [ -z "${_DESKTOPDIR_REL}" ]; then \
Index: bsd.python.mk
===================================================================
diff --git a/head/Mk/bsd.python.mk b/head/Mk/bsd.python.mk
--- a/head/Mk/bsd.python.mk	(revision 327843)
+++ b/head/Mk/bsd.python.mk	(working copy)
@@ -534,6 +534,9 @@
 PYDISTUTILS_CONFIGUREARGS?=
 PYDISTUTILS_BUILDARGS?=
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
+.if !defined(NO_STAGE)
+PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
................................................................................
+.endif
 PYDISTUTILS_PKGNAME?=	${PORTNAME}
 PYDISTUTILS_PKGVERSION?=${PORTVERSION}
 PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
Index: bsd.sanity.mk
===================================================================
diff --git a/head/Mk/bsd.sanity.mk b/head/Mk/bsd.sanity.mk
--- a/head/Mk/bsd.sanity.mk	(revision 327843)
+++ b/head/Mk/bsd.sanity.mk	(working copy)
@@ -96,6 +96,14 @@
 DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
 .endif
 
+.if !defined(NO_STAGE) && defined(_MANPAGES)
+DEV_WARNING+=	"MAN* macros are deprecated when using stage directory"