[Glibc-bsd-commits] r1541 - in trunk/freebsd-libs: . debian debian/patches

[Robert Millan]

Author: rmh
Date: 2006-05-03 20:03:57 +0000 (Wed, 03 May 2006)
New Revision: 1541

Removed:
   trunk/freebsd-libs/debian/patches/07_libstand.diff
Modified:
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
Revert r1478.  libstand isn't going anywhere, actualy..

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2006-05-03 19:33:34 UTC (rev 1540)
+++ trunk/freebsd-libs/debian/control	2006-05-03 20:03:57 UTC (rev 1541)
@@ -102,9 +102,3 @@
  This package contains the header files and static library needed to
  compile applications that use libipx.
 
-#Package: libstand-dev
-#Section: libdevel
-#Architecture: kfreebsd-i386 kfreebsd-amd64
-#Description: Support library for stand-alone applications
-# libstand provides a set of supporting functions for stand-alone applications,
-# mimicking where possible the standard BSD programming environment.

Deleted: trunk/freebsd-libs/debian/patches/07_libstand.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libstand.diff	2006-05-03 19:33:34 UTC (rev 1540)
+++ trunk/freebsd-libs/debian/patches/07_libstand.diff	2006-05-03 20:03:57 UTC (rev 1541)
@@ -1,64 +0,0 @@
---- lib/libstand/Makefile~	2006-04-22 11:19:04.000000000 +0200
-+++ lib/libstand/Makefile	2006-04-22 11:33:55.000000000 +0200
-@@ -138,7 +138,8 @@
- CLEANFILES+=   _${file} _${file}.orig
- 
- _${file}: ${file} ${file}.diff
--	patch -s -b .orig -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]}
-+	cp ${.ALLSRC:M*.[ch]} ${.TARGET}
-+	patch ${.TARGET} ${.ALLSRC:M*.diff}
- .endfor
- 
- .for file in crctable.c decompress.c huffman.c randtable.c
-@@ -159,7 +160,8 @@
- CLEANFILES+=	_${file} _${file}.orig
- 
- _${file}: ${file} ${file}.diff
--	patch -s -b .orig -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]}
-+	cp ${.ALLSRC:M*.[ch]} ${.TARGET}
-+	patch ${.TARGET} ${.ALLSRC:M*.diff}
- .endfor
- 
- .for file in infback.c inffast.c inflate.c inftrees.c zutil.c
---- lib/libstand/assert.c~	2006-04-22 11:34:25.000000000 +0200
-+++ lib/libstand/assert.c	2006-04-22 11:47:07.000000000 +0200
-@@ -26,8 +26,6 @@
- 
- #include <sys/cdefs.h>
- 
--#include <assert.h>
--
- #include "stand.h"
- 
- void
---- lib/libstand/assert.c~	2006-04-22 12:04:43.000000000 +0200
-+++ lib/libstand/assert.c	2006-04-22 12:15:07.000000000 +0200
-@@ -37,5 +37,5 @@
- 	else
- 		printf("Assertion failed: (%s), function %s, file %s, line "
- 		    "%d.\n", expression, func, file, line);
--	exit();
-+	exit(1);
- }
---- lib/libstand/cd9660.c~	2006-04-22 12:15:50.000000000 +0200
-+++ lib/libstand/cd9660.c	2006-04-22 12:24:10.000000000 +0200
-@@ -41,7 +41,7 @@
-  */
- #include <sys/param.h>
- #include <string.h>
--#include <sys/dirent.h>
-+#include <dirent.h>
- #include <isofs/cd9660/iso.h>
- #include <isofs/cd9660/cd9660_rrip.h>
- 
---- lib/libstand/stand.h~	2006-04-22 12:15:50.000000000 +0200
-+++ lib/libstand/stand.h	2006-04-22 12:24:27.000000000 +0200
-@@ -65,7 +65,7 @@
- #include <sys/types.h>
- #include <sys/cdefs.h>
- #include <sys/stat.h>
--#include <sys/dirent.h>
-+#include <dirent.h>
- #include <string.h>
- 
- #define CHK(fmt, args...)	printf("%s(%d): " fmt "\n", __FUNCTION__, __LINE__ , ##args)

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-05-03 19:33:34 UTC (rev 1540)
+++ trunk/freebsd-libs/debian/rules	2006-05-03 20:03:57 UTC (rev 1541)
@@ -32,7 +32,7 @@
 
 	find $(SRC_DIR) -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" \
-		-e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*//g" \
+		-e "s/[ \t]*__\(dead2\|unused\|result\\)[ \t]*//g" \
 		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
 		-e "s,<sys/iconv\.h>,<iconv.h>,g" \
 		-e "s/^LDADD=/LDADD+=/g" \
@@ -65,9 +65,6 @@
 build-sbuf: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE)
 
-build-stand: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libstand && $(PMAKE)
-
 build-usbhid: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE)
 

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2006-05-03 19:33:34 UTC (rev 1540)
+++ trunk/freebsd-libs/fetch	2006-05-03 20:03:57 UTC (rev 1541)
@@ -14,7 +14,6 @@
 
 for i in \
     src/lib/lib{cam,geom,ipx,kvm,sbuf,usbhid} \
-    src/lib/lib{stand,z} src/contrib/bzip2 src/lib/libc/i386/{net,string} \
   ; do
   cvs ${action} -r RELENG_5_4_0_RELEASE $i
   test -e $i