[Glibc-bsd-commits] r1856 - in trunk/freebsd6-buildutils: . debian debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2007-01-08 20:02:19 +0100 (Mon, 08 Jan 2007)
New Revision: 1856

Modified:
   trunk/freebsd6-buildutils/debian/changelog
   trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
   trunk/freebsd6-buildutils/fetch
Log:
* freebsd6-buildutils 
  new upstream version (RELENG_6_2_0_RELEASE) 
  (almost, for now tested against RELENG_6_2)



Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog	2007-01-08 17:05:30 UTC (rev 1855)
+++ trunk/freebsd6-buildutils/debian/changelog	2007-01-08 19:02:19 UTC (rev 1856)
@@ -1,3 +1,11 @@
+freebsd6-buildutils (6.2-0.1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream version (RELENG_6_2_0_RELEASE) 
+    (almost, for now tested against RELENG_6_2)
+
+ -- Robert Millan <rmh at aybabtu.com>  Sat,  6 May 2006 13:10:05 +0200
+
 freebsd6-buildutils (6.0-0.2) unreleased; urgency=low
 
   * Add cruft to bsd.own.mk necessary to build latest kernel.

Modified: trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff	2007-01-08 17:05:30 UTC (rev 1855)
+++ trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff	2007-01-08 19:02:19 UTC (rev 1856)
@@ -35,14 +35,22 @@
  INSTALLINFOFLAGS+=--quiet
  INFOSECTION?=   Miscellaneous
  ICOMPRESS_CMD?=	${COMPRESS_CMD}
-@@ -145,10 +145,8 @@
+@@ -145,18 +145,8 @@
  .for x in ${INFO}
  INSTALLINFODIRS+= ${x:S/$/-install/}
  ${x:S/$/-install/}:
+-.if !empty(.MAKEFLAGS:M-j)
+-	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
 -	${INSTALLINFO} ${INSTALLINFOFLAGS} \
 -	    --defsection=${INFOSECTION} \
 -	    --defentry=${INFOENTRY_${x}} \
 -	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+-.else
+-	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+-	    --defsection=${INFOSECTION} \
+-	    --defentry=${INFOENTRY_${x}} \
+-	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+-.endif
 +	mkdir -p ${DESTDIR}${INFODIR}
 +	install -m 644 ${x}.info ${DESTDIR}${INFODIR}/
  .endfor

Modified: trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff	2007-01-08 17:05:30 UTC (rev 1855)
+++ trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff	2007-01-08 19:02:19 UTC (rev 1856)
@@ -1,32 +1,19 @@
 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
-@@ -1028,7 +1028,7 @@
- 
- # Get the architecture
- .if !defined(ARCH)
--ARCH!=	${UNAME} -p
-+ARCH!= ${UNAME} -m | sed -e s/^i[4-9]86$$/i386/g
- .endif
- 
- # Kludge for pre-3.0 systems
-@@ -1913,15 +1913,7 @@
+@@ -2103,11 +2103,7 @@
  # Miscellaneous overridable commands:
  GMAKE?=			gmake
  XMKMF?=			xmkmf -a
 -.if exists(md5)
 -MD5?=			md5
--.elif exists(md5)
--MD5?=			md5
--.elif exists(md5)
--MD5?=			md5
 -.else
 -MD5?=			md5
 -.endif
 +MD5?=			md5sum
- MD5_FILE?=		${MASTERDIR}/distinfo
- 
- MAKE_FLAGS?=	-f
+ .if exists(sha256)
+ SHA256?=		sha256
+ .elif exists(${LOCALBASE_REL}sha256)
 @@ -3084,7 +3076,7 @@
  .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
  	@if [ -f "${AUDITFILE}" ]; then \
@@ -93,20 +80,11 @@
 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
-@@ -48,7 +48,7 @@
- 
- .if !defined(NOPRECIOUSMAKEVARS)
- .if !defined(ARCH)
--ARCH!=	uname -p
-+ARCH!=	uname -m | sed -e s/^i[4-9]86$$/i386/g
- .endif
- .if !defined(OSREL)
- OSREL!=	uname -r | sed -e 's/[-(].*//'
 @@ -61,7 +61,7 @@
  .endif
  .endif
  .if !defined(PORTOBJFORMAT)
--PORTOBJFORMAT!= test -x objformat && objformat || echo aout
+-PORTOBJFORMAT!= test -x ${DESTDIR}objformat && ${DESTDIR}objformat || echo aout
 +PORTOBJFORMAT!= which objformat >/dev/null && objformat || echo aout
  .endif
  .endif

Modified: trunk/freebsd6-buildutils/fetch
===================================================================
--- trunk/freebsd6-buildutils/fetch	2007-01-08 17:05:30 UTC (rev 1855)
+++ trunk/freebsd6-buildutils/fetch	2007-01-08 19:02:19 UTC (rev 1856)
@@ -12,7 +12,7 @@
   action="checkout"
 fi
 
-cvs ${action} -r RELEASE_6_0_0 ports/Mk
+cvs ${action} -r RELEASE_6_2_0 ports/Mk
 for i in \
     src/share/mk \
     src/usr.bin/cksum \
@@ -27,7 +27,7 @@
     src/usr.sbin/kgzip \
     src/usr.sbin/mtree \
   ; do
-  cvs ${action} -r RELENG_6_0_0_RELEASE $i
+  cvs ${action} -r RELENG_6_2_0_RELEASE
   test -e $i
 done