Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Dec 2016 02:31:16 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429303 - in head: devel/libopenbsd games/openbor
Message-ID:  <201612240231.uBO2VGaN068458@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Dec 24 02:31:16 2016
New Revision: 429303
URL: https://svnweb.freebsd.org/changeset/ports/429303

Log:
  devel/libopenbsd, games/openbor: unbreak BOOTSTRAP build
  
  $ make clean all BOOTSTRAP= -C devel/libopenbsd
  ===>  Cleaning for libopenbsd-r298107
  ===>  License ISCL accepted by the user
  ===>   libopenbsd-r298107 depends on file: /usr/local/sbin/pkg - found
  ===>   libopenbsd-r298107 depends on executable: svn - found
  /bin/mkdir -p /usr/ports/devel/libopenbsd/work
  svn export -r298107 https://svn.freebsd.org/base/head/lib/libopenbsd/ /usr/ports/devel/libopenbsd/work/libopenbsd-r298107
  A    work/libopenbsd-r298107
  A    work/libopenbsd-r298107/sys
  A    work/libopenbsd-r298107/Makefile
  A    work/libopenbsd-r298107/imsg.c
  A    work/libopenbsd-r298107/sys/sysctl.h
  A    work/libopenbsd-r298107/getdtablecount.c
  A    work/libopenbsd-r298107/unistd.h
  A    work/libopenbsd-r298107/README
  A    work/libopenbsd-r298107/imsg-buffer.c
  A    work/libopenbsd-r298107/imsg.h
  A    work/libopenbsd-r298107/imsg_init.3
  A    work/libopenbsd-r298107/ohash.h
  A    work/libopenbsd-r298107/Makefile.depend
  A    work/libopenbsd-r298107/ohash_init.3
  A    work/libopenbsd-r298107/ohash_interval.3
  A    work/libopenbsd-r298107/ohash.c
  Exported revision 298107.
  (cd /usr/ports/devel/libopenbsd/work && /usr/bin/tar cJvf  /usr/ports/distfiles//libopenbsd-r298107.tar.xz  --uid 0 --gid 0 libopenbsd-r298107)
  a libopenbsd-r298107
  a libopenbsd-r298107/imsg.c
  a libopenbsd-r298107/imsg.h
  a libopenbsd-r298107/imsg_init.3
  a libopenbsd-r298107/ohash_init.3
  a libopenbsd-r298107/Makefile.depend
  a libopenbsd-r298107/Makefile
  a libopenbsd-r298107/ohash.c
  a libopenbsd-r298107/ohash.h
  a libopenbsd-r298107/ohash_interval.3
  a libopenbsd-r298107/getdtablecount.c
  a libopenbsd-r298107/imsg-buffer.c
  a libopenbsd-r298107/README
  a libopenbsd-r298107/unistd.h
  a libopenbsd-r298107/sys
  a libopenbsd-r298107/sys/sysctl.h
  /usr/bin/sed -i.bak -i '' '/^PORTVERSION=/s/r.*/r298107/'  /usr/ports/devel/libopenbsd/Makefile
  ===> Fetching all distfiles required by libopenbsd-r298107 for building
  ===>  Extracting for libopenbsd-r298107
  => SHA256 Checksum mismatch for libopenbsd-r298107.tar.xz.
  ===>  Refetch for 1 more times files: libopenbsd-r298107.tar.xz
  ===>  License ISCL accepted by the user
  ===>   libopenbsd-r298107 depends on file: /usr/local/sbin/pkg - found
  ===>   libopenbsd-r298107 depends on executable: svn - found
  /bin/mkdir -p /usr/ports/devel/libopenbsd/work
  svn export -r298107 https://svn.freebsd.org/base/head/lib/libopenbsd/ /usr/ports/devel/libopenbsd/work/libopenbsd-r298107
  svn: E155000: Destination directory exists; please remove the directory or use --force to overwrite
  svn: E155000: '/usr/ports/devel/libopenbsd/work/libopenbsd-r298107' already exists
  *** Error code 1

Modified:
  head/devel/libopenbsd/Makefile   (contents, props changed)
  head/games/openbor/Makefile   (contents, props changed)

Modified: head/devel/libopenbsd/Makefile
==============================================================================
--- head/devel/libopenbsd/Makefile	Sat Dec 24 01:29:39 2016	(r429302)
+++ head/devel/libopenbsd/Makefile	Sat Dec 24 02:31:16 2016	(r429303)
@@ -35,14 +35,18 @@ SVN_REV?=	${PORTVERSION:S/r//}
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+=	svn:devel/subversion
 
+NO_CHECKSUM=	yes
+
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r${SVN_REV} ${_MASTER_SITES_svn} ${WRKSRC}
 	(cd ${WRKDIR} && ${TAR} cJvf \
 		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		--uid 0 --gid 0 ${DISTNAME})
+. ifmake makesum
 	${REINPLACE_CMD} -i '' '/^PORTVERSION=/s/r.*/r${SVN_REV}/' \
 		${MASTERDIR}/Makefile
+. endif
 . if ${USER} == ${MAINTAINER:C/@.*//}
 	-scp ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		freefall.freebsd.org:public_distfiles/

Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile	Sat Dec 24 01:29:39 2016	(r429302)
+++ head/games/openbor/Makefile	Sat Dec 24 02:31:16 2016	(r429303)
@@ -69,14 +69,18 @@ SVN_REV?=	${PORTVERSION:E:S/r//}
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+=	svn:devel/subversion
 
+NO_CHECKSUM=	yes
+
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r${SVN_REV} ${_MASTER_SITES_svn} ${WRKSRC}
 	(cd ${WRKDIR} && ${TAR} cJvf \
 		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		--uid 0 --gid 0 ${DISTNAME})
+. ifmake makesum
 	${REINPLACE_CMD} -i '' '/^PORTVERSION=/s/r.*/r${SVN_REV}/' \
 		${MASTERDIR}/Makefile
+. endif
 . if ${USER} == ${MAINTAINER:C/@.*//}
 	-scp ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		freefall.freebsd.org:public_distfiles/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612240231.uBO2VGaN068458>