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         -Index: bsd.default-versions.mk
            1  +Index: bsd.java.mk
     2      2   ===================================================================
     3         -diff --git a/head/Mk/bsd.default-versions.mk b/head/Mk/bsd.default-versions.mk
     4         ---- a/head/Mk/bsd.default-versions.mk	(revision 327602)
     5         -+++ b/head/Mk/bsd.default-versions.mk	(working copy)
     6         -@@ -19,5 +19,6 @@
            3  +diff --git a/head/Mk/bsd.java.mk b/head/Mk/bsd.java.mk
            4  +--- a/head/Mk/bsd.java.mk	(revision 327645)
            5  ++++ b/head/Mk/bsd.java.mk	(working copy)
            6  +@@ -387,11 +387,10 @@
            7  + MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
            8  + BUILD_DEPENDS+=		${ANT}:${PORTSDIR}/devel/apache-ant
            9  + ALL_TARGET?=
           10  +-.			if !target(do-build)
           11  +-do-build:
           12  +-					@(cd ${BUILD_WRKSRC}; \
           13  +-						${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
           14  +-.			endif
           15  ++MAKE_CMD=			${ANT}
           16  ++MAKE_FLAGS=			#
           17  ++MAKEFILE=			#
           18  ++_MAKE_JOBS=			#
           19  + .		endif
     7     20    
     8         - PERL5_DEFAULT?=		5.14
     9         - RUBY_DEFAULT?=		1.9
    10         -+TCLTK_DEFAULT?=		8.6
    11         - 
    12         - .endif
           21  + #-----------------------------------------------------------------------------
    13     22   Index: bsd.licenses.mk
    14     23   ===================================================================
    15     24   diff --git a/head/Mk/bsd.licenses.mk b/head/Mk/bsd.licenses.mk
    16         ---- a/head/Mk/bsd.licenses.mk	(revision 327600)
           25  +--- a/head/Mk/bsd.licenses.mk	(revision 327645)
    17     26   +++ b/head/Mk/bsd.licenses.mk	(working copy)
    18     27   @@ -749,14 +749,14 @@
    19     28    .endif
    20     29    
    21     30    install-license:
    22     31   -	@${MKDIR} ${_LICENSE_DIR}
    23     32   -	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
................................................................................
    34     43   +	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR}/${lic}
    35     44    .	endfor
    36     45    .endif
    37     46    # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)
    38     47   Index: bsd.ocaml.mk
    39     48   ===================================================================
    40     49   diff --git a/head/Mk/bsd.ocaml.mk b/head/Mk/bsd.ocaml.mk
    41         ---- a/head/Mk/bsd.ocaml.mk	(revision 327600)
           50  +--- a/head/Mk/bsd.ocaml.mk	(revision 327645)
    42     51   +++ b/head/Mk/bsd.ocaml.mk	(working copy)
    43     52   @@ -1,7 +1,7 @@
    44     53    # ex:ts=4
    45     54    #
    46     55    # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
    47     56   -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.4 2011-12-15 19:47:53 tabthorpe Exp $
    48     57   +# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.5 2012/11/17 05:54:17 svnexp Exp $
    49     58    #
    50     59    # bsd.ocaml.mk - Support for the Objective Caml language packages
    51     60    #
    52     61   Index: bsd.pkgng.mk
    53     62   ===================================================================
    54     63   diff --git a/head/Mk/bsd.pkgng.mk b/head/Mk/bsd.pkgng.mk
    55         ---- a/head/Mk/bsd.pkgng.mk	(revision 327600)
           64  +--- a/head/Mk/bsd.pkgng.mk	(revision 327645)
    56     65   +++ b/head/Mk/bsd.pkgng.mk	(working copy)
    57     66   @@ -36,14 +36,7 @@
    58     67    		${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
    59     68    	fi
    60     69    
    61     70   -.if !target(fake-pkg)
    62     71   -fake-pkg:
................................................................................
   174    183    .endif
   175    184   +.endif
   176    185    
   177    186    .endif # defined(_POSTMKINCLUDED)
   178    187   Index: bsd.port.mk
   179    188   ===================================================================
   180    189   diff --git a/head/Mk/bsd.port.mk b/head/Mk/bsd.port.mk
   181         ---- a/head/Mk/bsd.port.mk	(revision 327603)
          190  +--- a/head/Mk/bsd.port.mk	(revision 327645)
   182    191   +++ b/head/Mk/bsd.port.mk	(working copy)
   183    192   @@ -1114,6 +1114,10 @@
   184    193    USESDIR?=		${PORTSDIR}/Mk/Uses
   185    194    LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
   186    195    
   187    196   +.if defined(FORCE_STAGE)
   188    197   +.undef NO_STAGE
................................................................................
   250    259   +	fi; \
   251    260   +	if [ -f ${PKGREQ} ]; then \
   252    261   +		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -r ${PKGREQ}"; \
   253    262   +	fi; \
   254    263   +	if [ -f ${PKGMESSAGE} ]; then \
   255    264   +		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
   256    265   +	fi; \
   257         -+	if ${PKG_CMD} -s ${STAGEDIR} ${PKG_ARGS} ${PKGFILE}; then \
          266  ++	if ${PKG_CMD} -S ${STAGEDIR} ${PKG_ARGS} ${PKGFILE}; then \
   258    267   +		if [ -d ${PACKAGES} ]; then \
   259    268   +			cd ${.CURDIR} && eval ${MAKE} package-links; \
   260    269   +		fi; \
   261    270   +	else \
   262    271   +		cd ${.CURDIR} && eval ${MAKE} delete-package; \
   263    272   +		exit 1; \
   264    273   +	fi
................................................................................
   352    361   +
   353    362   +.else # pkg_install
   354    363   +
   355    364   +_PACKAGE_DEP=	stage
   356    365   +_PACKAGE_SEQ=	package-message pre-package pre-package-script do-package post-package-script
   357    366   +
   358    367   +_INSTALL_DEP=	package
   359         -+_INSTALL_SEQ=	install-message run-depends lib-depends install-package done-message
          368  ++_INSTALL_SEQ=	install-message run-depends lib-depends install-package
   360    369   +.endif
   361    370   +
   362    371   +.else
   363    372   +
   364    373    _INSTALL_DEP=	build
   365    374    _INSTALL_SEQ=	install-message check-install-conflicts run-depends lib-depends apply-slist pre-install \
   366    375    				pre-install-script generate-plist check-already-installed
................................................................................
   536    545   +	@(${MKDIR} "${STAGEDIR}${DESKTOPDIR}" 2> /dev/null) || \
   537    546    		(${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1)
   538    547    	@set -- ${DESKTOP_ENTRIES} XXX; \
   539    548    	if [ -z "${_DESKTOPDIR_REL}" ]; then \
   540    549   Index: bsd.python.mk
   541    550   ===================================================================
   542    551   diff --git a/head/Mk/bsd.python.mk b/head/Mk/bsd.python.mk
   543         ---- a/head/Mk/bsd.python.mk	(revision 327600)
          552  +--- a/head/Mk/bsd.python.mk	(revision 327645)
   544    553   +++ b/head/Mk/bsd.python.mk	(working copy)
   545    554   @@ -534,6 +534,9 @@
   546    555    PYDISTUTILS_CONFIGUREARGS?=
   547    556    PYDISTUTILS_BUILDARGS?=
   548    557    PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
   549    558   +.if !defined(NO_STAGE)
   550    559   +PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
   551    560   +.endif
   552    561    PYDISTUTILS_PKGNAME?=	${PORTNAME}
   553    562    PYDISTUTILS_PKGVERSION?=${PORTVERSION}
   554    563    PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
   555         -Index: bsd.sanity.mk
   556         -===================================================================
   557         -diff --git a/head/Mk/bsd.sanity.mk b/head/Mk/bsd.sanity.mk
   558         ---- a/head/Mk/bsd.sanity.mk	(revision 327606)
   559         -+++ b/head/Mk/bsd.sanity.mk	(working copy)
   560         -@@ -91,6 +91,11 @@
   561         - DEV_WARNING+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
   562         - .endif
   563         - 
   564         -+.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \
   565         -+   defined(USE_TK)  || defined(USE_TK_BUILD)  || defined(USE_TK_RUN)  || defined(USE_TK_WRAPPER)
   566         -+DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
   567         -+.endif
   568         -+
   569         - .if defined(_PREMKINCLUDED)
   570         - DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
   571         - .endif
   572    564   Index: bsd.stage.mk
   573    565   ===================================================================
   574    566   diff --git a/head/Mk/bsd.stage.mk b/head/Mk/bsd.stage.mk
   575    567   new file mode 10644
   576    568   --- /dev/null	(revision 0)
   577    569   +++ b/head/Mk/bsd.stage.mk	(working copy)
   578    570   @@ -0,0 +1,82 @@