kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert broken changes:

Browse source 
1. It doesn't work unprivileged.
2. We don't have stage numbers in pkgsrc, don't introduce them here either.
This commit is contained in:
Aleksej Saushev 2011-11-07 05:51:45 +00:00 committed by Thomas Klausner
parent 011ba9b0f3
commit 13b37f9fed
2 changed files with 34 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
mk/cvs-package.mk
View file

@ -1,4 +1,4 @@
# $Id: cvs-package.mk,v 1.39 2011/10/07 02:52:57 makoto Exp $
# $Id: cvs-package.mk,v 1.40 2011/11/07 05:51:45 asau Exp $
#
# Please update svn-package.mk as well. It is brother Makefile frags.
#
@ -148,7 +148,11 @@ _CVS_CMD= cvs
_CVS_ENV= # empty
_CVS_ENV+= CVS_PASSFILE=${_CVS_PASSFILE}
_CVS_ENV+= CVS_RSH=${_CVS_RSH:Q}
<<<<<<< cvs-package.mk
_CVS_FLAGS= -q -z3
=======
_CVS_FLAGS= -Q -z3
>>>>>>> 1.37
_CVS_CHECKOUT_FLAGS= -P
_CVS_PASSFILE= ${WRKDIR}/.cvs_passwords
_CVS_TODAY_CMD= ${DATE} -u +'%Y-%m-%d'
@ -180,36 +184,23 @@ _CVS_TAG_FLAG.${repo}= '-D${_CVS_TODAY} 00:00 +0000'
_CVS_TAG.${repo}= ${_CVS_TODAY:Q}
. endif
_CVS_TMP_RESULT.${repo}= '/tmp/cvs-${CVS_MODULE.${repo}}-update'
# Cache support:
. if !defined(NO_CVS_CACHE.${repo}) \
|| defined(NO_CVS_CACHE.${repo}) && empty(NO_CVS_CACHE.${repo}:M[Yy][Ee][Ss])
# cache file name
. if !defined(CVS_DISTBASE.${repo})
CVS_DISTBASE.${repo}= ${CVS_MODULE.${repo}}
. endif
_CVS_DISTFILE.${repo}= ${CVS_DISTBASE.${repo}}-${_CVS_TAG.${repo}}.tar.gz
_CVS_DISTFILE.${repo}= ${PKGBASE}-${CVS_MODULE.${repo}}-${_CVS_TAG.${repo}}.tar.gz
# command to extract cache file
_CVS_EXTRACT_CACHED.${repo}= \
p="$$(ls -td ${_CVS_DISTDIR}/${CVS_DISTBASE.${repo}}-*.tar.gz | head -n 1)"; \
if [ -n "$$p" ]; then \
${STEP_MSG} "(1) Extracting cached CVS archive \"""$$p\"."; \
pax -r -z -f "$$p"; \
else \
${STEP_MSG} "(1a) No cache file found."; \
if [ -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q} ]; then \
${STEP_MSG} "(1a) Extracting cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
pax -r -z -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q}; \
exit 0; \
fi
_CVS_CHECK_UPDATE.${repo}= \
"$$(grep ^[ADMU] ${_CVS_TMP_RESULT.${repo}} | head -n 1)"
# create cache archive
_CVS_CREATE_CACHE.${repo}= \
${STEP_MSG} "(5) Creating cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
${MKDIR} ${_CVS_DISTDIR:Q}; \
pax -w -z -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q} ${CVS_MODULE.${repo}:Q}
. endif
.endfor
pre-extract: do-cvs-extract
@ -219,11 +210,16 @@ do-cvs-extract: .PHONY
${RUN} cd ${WRKDIR}; \
if [ ! -d ${_CVS_DISTDIR} ]; then mkdir -p ${_CVS_DISTDIR:Q}; fi; \
${_CVS_EXTRACT_CACHED.${repo}}; \
p="$$(cd ${_CVS_DISTDIR} && ls -t ${PKGBASE}-${CVS_MODULE.${repo}}-* | head -n 1)"; \
if [ -n "$$p" ]; then \
${STEP_MSG} "(1b) Extracting cached CVS archive \"""$$p\"."; \
pax -r -z -f ${_CVS_DISTDIR:Q}/"$$p"; \
fi; \
case ${CVS_ROOT.${repo}:Q} in \
:pserver:*) \
[ -f ${_CVS_PASSFILE} ] || ${TOUCH} ${_CVS_PASSFILE}; \
${STEP_MSG} "Logging in to "${CVS_ROOT.${repo}:Q}"."; \
${SETENV} ${_CVS_ENV} ${_CVS_CMD} ${_CVS_FLAGS} \
${SETENV} ${_CVS_ENV} ${_CVS_CMD} ${_CVS_FLAGS} \
-d ${CVS_ROOT.${repo}:Q} login \
;; \
*) ;; \
@ -237,20 +233,9 @@ do-cvs-extract: .PHONY
checkout ${_CVS_CHECKOUT_FLAGS} \
${_CVS_TAG_FLAG.${repo}} \
-d ${repo} \
${CVS_MODULE.${repo}:Q} > ${_CVS_TMP_RESULT.${repo}}; \
if [ ! "$$p" = 0 ];then \
if [ ! -z ${_CVS_TMP_RESULT.${repo}} ];then \
if [ -n ${_CVS_CHECK_UPDATE.${repo}} ]; then \
${CVS_MODULE.${repo}:Q}; \
${_CVS_CREATE_CACHE.${repo}}; \
else \
${STEP_MSG} "(6a) Skip creating cache file for no update."; \
fi; \
else \
${STEP_MSG} "(6b) Skip creating cache file."; \
fi; \
else \
${STEP_MSG} "(6c) Skip creating cache file for no update."; \
fi;
.endfor
.endif

62
mk/svn-package.mk
View file

@ -1,11 +1,7 @@
# $Id: svn-package.mk,v 1.15 2011/10/06 03:57:03 makoto Exp $
#
# Please update cvs-package.mk as well. It is brother Makefile frags.
#
# $Id: svn-package.mk,v 1.16 2011/11/07 05:51:45 asau Exp $
# This file provides simple access to Subversion repositories, so that packages
# can be created from Subversion instead of from released tarballs. Whenever a
# package is fetched from Subversion, an archive is created from it and saved
# in ${DISTDIR}/svn-packages, to save bandwidth.
# can be created from Subversion instead of from released tarballs.
#
# === User-settable variables ===
#
@ -89,7 +85,6 @@ BUILD_DEPENDS+= subversion-base>=1.0:../../devel/subversion-base
#
DISTFILES?= # empty
PKGNAME?= ${DISTNAME:C,-[0-9].*,,}-svn-${_SVN_PKGVERSION}
# Enforce PKGREVISION unless SVN_TAG is set
.if empty(SVN_TAG)
. if defined(CHECKOUT_DATE)
@ -135,7 +130,7 @@ _SVN_RSH= ssh
_SVN_CMD= svn
_SVN_ENV= # empty
_SVN_ENV+= SVN_RSH=${_SVN_RSH:Q}
_SVN_FLAGS=
_SVN_FLAGS= -q
_SVN_CHECKOUT_FLAGS= --config-dir=${_SVN_CONFIG_DIR} --non-interactive
_SVN_CONFIG_DIR= ${WRKDIR}/.subversion
_SVN_TODAY_CMD= ${DATE} -u +'%Y-%m-%d'
@ -144,6 +139,7 @@ _SVN_PKGVERSION_CMD= ${DATE} -u +'%Y.%m.%d'
_SVN_PKGVERSION= ${_SVN_PKGVERSION_CMD:sh}
_SVN_DISTDIR= ${DISTDIR}/svn-packages
#
# Generation of repository-specific variables
#
@ -164,33 +160,26 @@ _SVN_TAG_FLAG.${repo}= -r{${_SVN_TODAY} 00:00 +0000}
_SVN_TAG.${repo}= ${_SVN_TODAY}
. endif
_SVN_TMP_RESULT.${repo}= '/tmp/svn-${SVN_MODULE.${repo}}-update'
# Cache support:
. if !defined(NO_SVN_CACHE.${repo}) \
|| defined(NO_SVN_CACHE.${repo}) && empty(NO_SVN_CACHE.${repo}:M[Yy][Ee][Ss])
# cache file name
. if !defined(SVN_DISTBASE.${repo})
SVN_DISTBASE.${repo}= ${SVN_MODULE.${repo}}
SVN_DISTBASE.${repo}= ${PKGBASE}-${SVN_MODULE.${repo}}
. endif
_SVN_DISTFILE.${repo}= ${SVN_DISTBASE.${repo}}-${_SVN_TAG.${repo}}.tar.gz
# command to extract cache file
_SVN_EXTRACT_CACHED.${repo}= \
p="$$(ls -td ${_SVN_DISTDIR}/${SVN_DISTBASE.${repo}}-*.tar.gz | head -n 1)"; \
if [ -n "$$p" ]; then \
${STEP_MSG} "(1) Extracting cached SVN archive \"""$$p\"."; \
pax -r -z -f "$$p"; \
else \
${STEP_MSG} "(1a) No cache file found."; \
if [ -f ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} ]; then \
${STEP_MSG} "Extracting cached Subversion archive "${_SVN_DISTFILE.${repo}:Q}"."; \
pax -r -z -f ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}; \
exit 0; \
fi
_SVN_CHECK_UPDATE.${repo}= \
"$$(grep ^[ADMU] ${_SVN_TMP_RESULT.${repo}} | head -n 1)"
# create cache archive
_SVN_CREATE_CACHE.${repo}= \
${STEP_MSG} "(5) Creating cached Subversion archive "${_SVN_DISTFILE.${repo}:Q}"."; \
${STEP_MSG} "Creating cached Subversion archive "${_SVN_DISTFILE.${repo}:Q}"."; \
${MKDIR} ${_SVN_DISTDIR:Q}; \
pax -w -z -f ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} ${SVN_MODULE.${repo}:Q}
. else
@ -212,33 +201,14 @@ do-svn-extract: .PHONY
${RUN} cd ${WRKDIR}; \
if [ ! -d ${_SVN_DISTDIR} ]; then mkdir -p ${_SVN_DISTDIR:Q}; fi; \
${_SVN_EXTRACT_CACHED.${repo}}; \
${STEP_MSG} "(2) Downloading "${SVN_MODULE.${repo}:Q}" from "${SVN_ROOT.${repo}:Q}"."; \
${STEP_MSG} "Downloading "${SVN_MODULE.${repo}:Q}" from "${SVN_ROOT.${repo}:Q}"."; \
${SETENV} ${_SVN_ENV} \
${_SVN_CMD} \
checkout ${_SVN_CHECKOUT_FLAGS} \
${_SVN_CMD} checkout ${_SVN_CHECKOUT_FLAGS} \
${_SVN_TAG_FLAG.${repo}:Q} \
${_SVN_FLAGS} \
${_SVN_FLAGS} \
${SVN_ROOT.${repo}:Q} \
${SVN_MODULE.${repo}:Q} > ${_SVN_TMP_RESULT.${repo}}; \
if [ ! "$$p" = 0 ];then \
if [ ! -z ${_SVN_TMP_RESULT.${repo}} ];then \
if [ -n ${_SVN_CHECK_UPDATE.${repo}} ]; then \
${_SVN_CREATE_CACHE.${repo}}; \
else \
${STEP_MSG} "(6a) Skip creating cache file for no update."; \
fi; \
else \
${STEP_MSG} "(6b) Skip creating cache file."; \
fi; \
else \
${STEP_MSG} "(6c) Skip creating cache file for no update."; \
fi;
${SVN_MODULE.${repo}:Q}; \
${_SVN_CREATE_CACHE.${repo}}
.endfor
.endif
# test is four way
# no any cache file yet -> write cache
# cache file exist and no update -> no write cache
# cache file exist, file added/delete -> write cache
# cache file exist and update there -> write cache