Check-in [9f27b2a19d]

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

Overview
Comment:Remove bsd.java.mk pollution, add entries to bsd.sanity.mk to help sanitizing the ports when converting
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9f27b2a19d3bf74e787f08d94c9eec39c39cbea8
User & Date: bapt 2013-09-19 21:45:42
Context
2013-09-19
22:04
Fix info handling in stage check-in: 6ac02a07d5 user: bapt tags: trunk
21:45
Remove bsd.java.mk pollution, add entries to bsd.sanity.mk to help sanitizing the ports when converting check-in: 9f27b2a19d user: bapt tags: trunk
20:14
Fix makeplist @dirrm finding check-in: 22ff4439c5 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
24
25
26
27
28
...
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
................................................................................
 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 @@
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>




























1
2
3
4
5
6
7
...
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





















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
................................................................................
 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 327645)
+++ 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"
+.endif
+
+.if !defined(NO_STAGE) && defined(_MLINKS)
+DEV_WARNING+=	"MLINKS* macros are deprecated when using stage directory"
+.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 @@