Check-in [492462dc2f]

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

Overview
Comment:Fix stagedir with pkg_install
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:492462dc2f6f27144b26632ad6401eee33dbb60e
User & Date: bapt 2013-09-19 18:45:11
Context
2013-09-19
20:08
Remove debug check-in: ed40a03ad3 user: bapt tags: trunk
18:45
Fix stagedir with pkg_install check-in: 492462dc2f user: bapt tags: trunk
18:15
Fix package building with stage and pkgng check-in: f81dd2951c user: bapt tags: trunk
Changes

Changes to stage.patch.

1
2
3
4
5
6
7

8
9
10









11
12

13
14
15
16
17
18
19
20
21
22
23
..
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
...
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
...
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
...
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
...
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
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
Index: bsd.default-versions.mk
===================================================================
diff --git a/head/Mk/bsd.default-versions.mk b/head/Mk/bsd.default-versions.mk
--- a/head/Mk/bsd.default-versions.mk	(revision 327602)
+++ b/head/Mk/bsd.default-versions.mk	(working copy)
@@ -19,5 +19,6 @@
 

 PERL5_DEFAULT?=		5.14
 RUBY_DEFAULT?=		1.9
+TCLTK_DEFAULT?=		8.6









 
 .endif

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 327600)
+++ 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.ocaml.mk
===================================================================
diff --git a/head/Mk/bsd.ocaml.mk b/head/Mk/bsd.ocaml.mk
--- a/head/Mk/bsd.ocaml.mk	(revision 327600)
+++ b/head/Mk/bsd.ocaml.mk	(working copy)
@@ -1,7 +1,7 @@
 # ex:ts=4
 #
 # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.4 2011-12-15 19:47:53 tabthorpe Exp $
+# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.5 2012/11/17 05:54:17 svnexp Exp $
 #
 # bsd.ocaml.mk - Support for the Objective Caml language packages
 #
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 327600)
+++ 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 327603)
+++ b/head/Mk/bsd.port.mk	(working copy)
@@ -1114,6 +1114,10 @@
 USESDIR?=		${PORTSDIR}/Mk/Uses
 LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
 
+.if defined(FORCE_STAGE)
+.undef NO_STAGE
................................................................................
+	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
................................................................................
+
+.else # pkg_install
+
+_PACKAGE_DEP=	stage
+_PACKAGE_SEQ=	package-message pre-package pre-package-script do-package post-package-script
+
+_INSTALL_DEP=	package
+_INSTALL_SEQ=	install-message run-depends lib-depends install-package done-message
+.endif
+
+.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
................................................................................
+	@(${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 327600)
+++ 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 327606)
+++ b/head/Mk/bsd.sanity.mk	(working copy)
@@ -91,6 +91,11 @@
 DEV_WARNING+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
 .endif
 
+.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \
+   defined(USE_TK)  || defined(USE_TK_BUILD)  || defined(USE_TK_RUN)  || defined(USE_TK_WRAPPER)
+DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
+.endif
+
 .if defined(_PREMKINCLUDED)
 DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
 .endif
Index: bsd.stage.mk
===================================================================
diff --git a/head/Mk/bsd.stage.mk b/head/Mk/bsd.stage.mk
new file mode 10644
--- /dev/null	(revision 0)
+++ b/head/Mk/bsd.stage.mk	(working copy)
@@ -0,0 +1,82 @@
|

|
|
|
|
<
>
|
|
|
>
>
>
>
>
>
>
>
>

<
>



|







 







|













|







 







|







 







|







 







|







 







|











<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







1
2
3
4
5
6

7
8
9
10
11
12
13
14
15
16
17
18
19
20

21
22
23
24
25
26
27
28
29
30
31
32
..
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
...
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
...
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
...
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
...
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563

















564
565
566
567
568
569
570
Index: bsd.java.mk
===================================================================
diff --git a/head/Mk/bsd.java.mk b/head/Mk/bsd.java.mk
--- a/head/Mk/bsd.java.mk	(revision 327645)
+++ b/head/Mk/bsd.java.mk	(working copy)
@@ -387,11 +387,10 @@

 MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
 BUILD_DEPENDS+=		${ANT}:${PORTSDIR}/devel/apache-ant
 ALL_TARGET?=
-.			if !target(do-build)
-do-build:
-					@(cd ${BUILD_WRKSRC}; \
-						${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
-.			endif
+MAKE_CMD=			${ANT}
+MAKE_FLAGS=			#
+MAKEFILE=			#
+_MAKE_JOBS=			#
 .		endif
 

 #-----------------------------------------------------------------------------
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 327645)
+++ 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.ocaml.mk
===================================================================
diff --git a/head/Mk/bsd.ocaml.mk b/head/Mk/bsd.ocaml.mk
--- a/head/Mk/bsd.ocaml.mk	(revision 327645)
+++ b/head/Mk/bsd.ocaml.mk	(working copy)
@@ -1,7 +1,7 @@
 # ex:ts=4
 #
 # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.4 2011-12-15 19:47:53 tabthorpe Exp $
+# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.5 2012/11/17 05:54:17 svnexp Exp $
 #
 # bsd.ocaml.mk - Support for the Objective Caml language packages
 #
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 327645)
+++ 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 327645)
+++ b/head/Mk/bsd.port.mk	(working copy)
@@ -1114,6 +1114,10 @@
 USESDIR?=		${PORTSDIR}/Mk/Uses
 LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
 
+.if defined(FORCE_STAGE)
+.undef NO_STAGE
................................................................................
+	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
................................................................................
+
+.else # pkg_install
+
+_PACKAGE_DEP=	stage
+_PACKAGE_SEQ=	package-message pre-package pre-package-script do-package post-package-script
+
+_INSTALL_DEP=	package
+_INSTALL_SEQ=	install-message run-depends lib-depends install-package
+.endif
+
+.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
................................................................................
+	@(${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 327645)
+++ 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.stage.mk
===================================================================
diff --git a/head/Mk/bsd.stage.mk b/head/Mk/bsd.stage.mk
new file mode 10644
--- /dev/null	(revision 0)
+++ b/head/Mk/bsd.stage.mk	(working copy)
@@ -0,0 +1,82 @@