[Glibc-bsd-commits] r2059 - in trunk/freebsd6-buildutils: . debian debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Tue Dec 4 17:09:55 UTC 2007
Author: ps-guest
Date: 2007-12-04 17:09:55 +0000 (Tue, 04 Dec 2007)
New Revision: 2059
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
trunk/freebsd6-buildutils/fetch
Log:
* freebsd6--buildutils based on upcoming FreeBSD 6.3
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2007-12-04 16:39:17 UTC (rev 2058)
+++ trunk/freebsd6-buildutils/debian/changelog 2007-12-04 17:09:55 UTC (rev 2059)
@@ -1,3 +1,10 @@
+freebsd6-buildutils (6.3-0.1) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_6_3_0_RELEASE)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 3 Dec 2007 13:38:31 +0100
+
freebsd6-buildutils (6.2-1) unreleased; urgency=low
[ Petr Salinger ]
Modified: trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2007-12-04 16:39:17 UTC (rev 2058)
+++ trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2007-12-04 17:09:55 UTC (rev 2059)
@@ -248,18 +248,6 @@
return string;
}
+#endif /* __FreeBSD__ */
-diff -ur src.old/usr.sbin/mtree/mtree.c src/usr.sbin/mtree/mtree.c
---- src.old/usr.sbin/mtree/mtree.c 2004-06-04 21:29:28.000000000 +0200
-+++ src/usr.sbin/mtree/mtree.c 2006-02-09 19:27:56.000000000 +0100
-@@ -164,7 +164,7 @@
- if (dir && chdir(dir))
- err(1, "%s", dir);
-
-- if ((cflag || sflag) && !getwd(fullpath))
-+ if ((cflag || sflag) && !getcwd(fullpath, MAXPATHLEN))
- errx(1, "%s", fullpath);
-
- if (cflag) {
diff -ur src.old/usr.sbin/mtree/mtree.h src/usr.sbin/mtree/mtree.h
--- src.old/usr.sbin/mtree/mtree.h 2005-03-29 13:44:17.000000000 +0200
+++ src/usr.sbin/mtree/mtree.h 2006-02-09 19:27:56.000000000 +0100
Modified: trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2007-12-04 16:39:17 UTC (rev 2058)
+++ trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2007-12-04 17:09:55 UTC (rev 2059)
@@ -1,7 +1,7 @@
diff -ur ports.old/Mk/bsd.port.mk ports/Mk/bsd.port.mk
--- ports.old/Mk/bsd.port.mk 2006-02-13 14:38:58.000000000 +0100
+++ ports/Mk/bsd.port.mk 2006-02-13 14:40:38.000000000 +0100
-@@ -2103,11 +2103,7 @@
+@@ -2124,11 +2124,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
XMKMF?= xmkmf -a
@@ -13,8 +13,8 @@
+MD5?= md5sum
.if exists(sha256)
SHA256?= sha256
- .elif exists(${LOCALBASE_REL}sha256)
-@@ -3084,7 +3076,7 @@
+ .elif exists(${LOCALBASE}sha256)
+@@ -3336,7 +3332,7 @@
.if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
@if [ -f "${AUDITFILE}" ]; then \
audit_created=`${_EXTRACT_AUDITFILE} | \
@@ -23,52 +23,70 @@
audit_expiry=`date -u -v-14d "+%Y%m%d"`; \
if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \
-@@ -3114,7 +3106,7 @@
+@@ -3440,7 +3436,7 @@
+ @cd ${_DISTDIR};\
+ ${_PATCH_SITES_ENV} ; \
+ for _file in ${PATCHFILES}; do \
+- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
++ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
+ select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
+ force_fetch=false; \
+ filebasename=$${file##*/}; \
+@@ -4415,7 +4411,7 @@
@(cd ${_DISTDIR}; \
${_MASTER_SITES_ENV} ; \
for _file in ${DISTFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- force_fetch=false; \
- filebasename=`${BASENAME} $$file`; \
-@@ -3181,7 +3173,7 @@
+ if [ ! -f $$file -a ! -f $${file##*/} ]; then \
+ if [ ! -z "$$select" ] ; then \
+@@ -4452,7 +4448,7 @@
@(cd ${_DISTDIR}; \
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- force_fetch=false; \
- filebasename=`${BASENAME} $$file`; \
-@@ -4078,7 +4070,7 @@
+ if [ ! -f $$file -a ! -f $${file##*/} ]; then \
+ if [ ! -z "$$select" ] ; then \
+@@ -4488,7 +4484,7 @@
@(cd ${_DISTDIR}; \
- ${_MASTER_SITES_ENV} ; \
- for _file in ${DISTFILES}; do \
+ ${_MASTER_SITES_ENV}; \
+ for _file in ${DISTFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
+ if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4110,7 +4102,7 @@
+@@ -4519,7 +4515,7 @@
@(cd ${_DISTDIR}; \
- ${_PATCH_SITES_ENV} ; \
- for _file in ${PATCHFILES}; do \
+ ${_PATCH_SITES_ENV} ; \
+ for _file in ${PATCHFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
+ if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4851,7 +4843,7 @@
+@@ -5173,7 +5169,7 @@
+ .endif
+
+ BUILD-DEPENDS-LIST= \
+- for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
++ for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
+ if [ -d $$dir ]; then \
+ ${ECHO_CMD} $$dir; \
+ else \
+@@ -5489,7 +5485,7 @@
done
@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
- @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
+ @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
- ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \
+ ${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
done
.endfor
-@@ -4885,7 +4877,7 @@
+@@ -5540,7 +5536,7 @@
add-plist-docs:
.if defined(PORTDOCS) && !defined(NOPORTDOCS)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -77,18 +95,24 @@
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
fi
.for x in ${PORTDOCS}
-diff -ur ports.old/Mk/bsd.port.subdir.mk ports/Mk/bsd.port.subdir.mk
---- ports.old/Mk/bsd.port.subdir.mk 2006-02-13 14:38:58.000000000 +0100
-+++ ports/Mk/bsd.port.subdir.mk 2006-02-13 14:39:23.000000000 +0100
-@@ -61,7 +61,7 @@
- .endif
- .endif
- .if !defined(PORTOBJFORMAT)
--PORTOBJFORMAT!= test -x ${DESTDIR}objformat && ${DESTDIR}objformat || echo aout
-+PORTOBJFORMAT!= which objformat >/dev/null && objformat || echo aout
- .endif
- .endif
-
+@@ -5563,7 +5559,7 @@
+ add-plist-examples:
+ .if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
+ @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
+- [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
++ [ "`${SED} -n -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
+ ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
+ fi
+ .for x in ${PORTEXAMPLES}
+@@ -5587,7 +5583,7 @@
+ add-plist-data:
+ .if defined(PORTDATA) && !defined(NOPORTDATA)
+ @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
+- [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
++ [ "`${SED} -n -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
+ ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
+ fi
+ .for x in ${PORTDATA}
diff -ur src/share/mk.old/bsd.port.mk src/share/mk/bsd.port.mk
--- src/share/mk.old/bsd.port.mk 2006-02-17 14:36:48.000000000 +0100
+++ src/share/mk/bsd.port.mk 2006-02-17 14:37:53.000000000 +0100
Modified: trunk/freebsd6-buildutils/fetch
===================================================================
--- trunk/freebsd6-buildutils/fetch 2007-12-04 16:39:17 UTC (rev 2058)
+++ trunk/freebsd6-buildutils/fetch 2007-12-04 17:09:55 UTC (rev 2059)
@@ -1,7 +1,11 @@
#!/bin/bash
set -ex
-export CVSROOT=freebsdanoncvs at anoncvs.freebsd.org:/home/ncvs
+ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+RELENG=RELENG_6_3_0_RELEASE
+RPORTS=RELEASE_6_3_0
+RELENG=RELENG_6_3
+RPORTS=HEAD
rm -rf src ports
@@ -12,7 +16,7 @@
action="checkout"
fi
-cvs ${action} -r RELEASE_6_2_0 ports/Mk
+cvs -d $ANONCVS ${action} -r $RPORTS ports/Mk
for i in \
src/share/mk \
src/usr.bin/cksum \
@@ -27,7 +31,7 @@
src/usr.sbin/kgzip \
src/usr.sbin/mtree \
; do
- cvs ${action} -r RELENG_6_2_0_RELEASE $i
+ cvs -d $ANONCVS ${action} -r $RELENG $i
test -e $i
done
More information about the Glibc-bsd-commits
mailing list