r1182 - in trunk/freebsd6-buildutils: . debian debian/patches
Author: rmh
Date: 2006-02-13 12:22:09 +0000 (Mon, 13 Feb 2006)
New Revision: 1182
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/control
trunk/freebsd6-buildutils/debian/links
trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
trunk/freebsd6-buildutils/debian/patches/05_disable_hardlinks.diff
trunk/freebsd6-buildutils/debian/rules
trunk/freebsd6-buildutils/fetch
Log:
* Our awk wasn't actualy from FreeBSD, but imported from original-awk.
Let's use that directly instead.
- control (Depends): Add original-awk.
- links: Add link to original-awk.
- patches/00_upstream.diff: Remove hunks that apply to awk.
- patches/05_disable_hardlinks.diff: Ditto.
- rules: Remove commands that work with awk.
- fetch: Remove awk dirs from checkout/update.
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-13 12:22:09 UTC (rev 1182)
@@ -40,8 +40,16 @@
- patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well).
* patches/11_optreset.diff: New. Replace unportable optreset mangling
with reset_getopt () from libbsd.
+ * Our awk wasn't actualy from FreeBSD, but imported from original-awk.
+ Let's use that directly instead.
+ - control (Depends): Add original-awk.
+ - links: Add link to original-awk.
+ - patches/00_upstream.diff: Remove hunks that apply to awk.
+ - patches/05_disable_hardlinks.diff: Ditto.
+ - rules: Remove commands that work with awk.
+ - fetch: Remove awk dirs from checkout/update.
- -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 11:03:00 +0100
+ -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 14:20:35 +0100
freebsd5-buildutils (5.4-3) unstable; urgency=low
Modified: trunk/freebsd6-buildutils/debian/control
===================================================================
--- trunk/freebsd6-buildutils/debian/control 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/control 2006-02-13 12:22:09 UTC (rev 1182)
@@ -8,7 +8,7 @@
Package: freebsd6-buildutils
Architecture: any
-Depends: ${shlibs:Depends}, bsdmainutils, dash, unzip, patchutils, gcc-3.4
+Depends: ${shlibs:Depends}, bsdmainutils, unzip, patchutils, dash, gcc-3.4, original-awk
Conflicts: freebsd5-buildutils, freebsd-buildutils, pmake
Provides: freebsd-buildutils
Description: Utilities for building FreeBSD 6.x sources
Modified: trunk/freebsd6-buildutils/debian/links
===================================================================
--- trunk/freebsd6-buildutils/debian/links 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/links 2006-02-13 12:22:09 UTC (rev 1182)
@@ -1,2 +1,3 @@
bin/dash usr/lib/freebsd/sh
usr/bin/gcc-3.4 usr/lib/freebsd/cc
+usr/bin/original-awk usr/lib/freebsd/awk
Modified: trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2006-02-13 12:22:09 UTC (rev 1182)
@@ -1,14 +1,3 @@
-diff -ur src.old/contrib/one-true-awk/b.c src/contrib/one-true-awk/b.c
---- src.old/contrib/one-true-awk/b.c 2005-05-16 21:11:31.000000000 +0200
-+++ src/contrib/one-true-awk/b.c 2006-02-09 19:27:55.000000000 +0100
-@@ -25,6 +25,7 @@
- /* lasciate ogne speranza, voi ch'entrate. */
-
- #define DEBUG
-+#define _ISOC99_SOURCE /* isblank (glibc) */
-
- #include <ctype.h>
- #include <stdio.h>
diff -ur src.old/usr.bin/cksum/cksum.c src/usr.bin/cksum/cksum.c
--- src.old/usr.bin/cksum/cksum.c 2003-03-14 00:32:28.000000000 +0100
+++ src/usr.bin/cksum/cksum.c 2006-02-09 19:27:55.000000000 +0100
Modified: trunk/freebsd6-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/05_disable_hardlinks.diff 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/patches/05_disable_hardlinks.diff 2006-02-13 12:22:09 UTC (rev 1182)
@@ -1,15 +1,3 @@
-diff -ur src.old/usr.bin/awk/Makefile src/usr.bin/awk/Makefile
---- src.old/usr.bin/awk/Makefile 2003-03-17 09:07:54.000000000 +0100
-+++ src/usr.bin/awk/Makefile 2004-03-11 23:27:58.000000000 +0100
-@@ -11,7 +11,7 @@
- DPADD= ${LIBM}
- LDADD= -lm
-
--LINKS= ${BINDIR}/nawk ${BINDIR}/awk
-+SIMLINKS= ${BINDIR}/nawk ${BINDIR}/awk
- MLINKS= nawk.1 awk.1
-
- CLEANFILES= maketab proctab.c ytab.h
diff -ur src.old/usr.bin/cksum/Makefile src/usr.bin/cksum/Makefile
--- src.old/usr.bin/cksum/Makefile 2002-02-08 23:31:36.000000000 +0100
+++ src/usr.bin/cksum/Makefile 2004-03-11 23:28:08.000000000 +0100
Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/debian/rules 2006-02-13 12:22:09 UTC (rev 1182)
@@ -42,12 +42,6 @@
cd build-tree/src/usr.bin/yacc ; \
$(PMAKE) $(MAKE_BUILD_FLAGS)
- cd build-tree/src/contrib/one-true-awk ; \
- $(YACC) -d -o awkgram.c ../../contrib/one-true-awk/awkgram.y
- cd build-tree/src/usr.bin/awk ; \
- ln -sf ../../contrib/one-true-awk/awkgram.h ytab.h ; \
- $(PMAKE) $(MAKE_BUILD_FLAGS)
-
cd build-tree/src/usr.bin/cksum ; $(PMAKE) $(MAKE_BUILD_FLAGS)
cd build-tree/src/usr.bin/lex ; \
@@ -77,7 +71,7 @@
dh_clean -k
dh_installdirs
- for i in awk cksum lex make mkdep yacc file2c brandelf ; do \
+ for i in cksum lex make mkdep yacc file2c brandelf ; do \
cd $(CURDIR)/build-tree/src/usr.bin/$$i; \
$(PMAKE) install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin ; \
done
@@ -92,10 +86,6 @@
cp -af $(CURDIR)/build-tree/ports/Mk \
$(CURDIR)/debian/$(package)/usr/share/
- # rename awk
- mv $(CURDIR)/debian/$(package)/usr/bin/nawk \
- $(CURDIR)/debian/$(package)/usr/bin/awk
-
# remove trash
rm -rf $(CURDIR)/debian/$(package)/usr/include \
$(CURDIR)/debian/$(package)/usr/share/man \
Modified: trunk/freebsd6-buildutils/fetch
===================================================================
--- trunk/freebsd6-buildutils/fetch 2006-02-13 12:04:08 UTC (rev 1181)
+++ trunk/freebsd6-buildutils/fetch 2006-02-13 12:22:09 UTC (rev 1182)
@@ -14,7 +14,6 @@
cvs ${action} -r RELEASE_6_0_0 ports/Mk
for i in \
- src/usr.bin/awk src/contrib/one-true-awk \
src/share/mk \
src/usr.bin/cksum \
src/usr.bin/file2c \
Reply to: