r1170 - in trunk/freebsd6-buildutils/debian: . patches
Author: rmh
Date: 2006-02-11 11:54:59 +0000 (Sat, 11 Feb 2006)
New Revision: 1170
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/control
trunk/freebsd6-buildutils/debian/dirs
trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd6-buildutils/debian/rules
Log:
* Move /usr/share/freebsd6-buildutils to /usr/share.
- control (Conflicts): Add pmake.
- patches/01_make_fixes.diff (usr.bin/make/pathnames.h): Remove
PATH_DEFSYSPATH redefinition.
- rules: Install mk and Mk in /usr/share.
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-11 10:19:00 UTC (rev 1169)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-11 11:54:59 UTC (rev 1170)
@@ -22,8 +22,13 @@
solution, like s,sys/queue.h,bsd/queue.h,g)
* rules:
- Only apply patches with *.diff suffix.
+ * Move /usr/share/freebsd6-buildutils to /usr/share.
+ - control (Conflicts): Add pmake.
+ - patches/01_make_fixes.diff (usr.bin/make/pathnames.h): Remove
+ PATH_DEFSYSPATH redefinition.
+ - rules: Install mk and Mk in /usr/share.
- -- Robert Millan <rmh@aybabtu.com> Fri, 10 Feb 2006 17:20:42 +0100
+ -- Robert Millan <rmh@aybabtu.com> Sat, 11 Feb 2006 12:52:47 +0000
freebsd5-buildutils (5.4-3) unstable; urgency=low
Modified: trunk/freebsd6-buildutils/debian/control
===================================================================
--- trunk/freebsd6-buildutils/debian/control 2006-02-11 10:19:00 UTC (rev 1169)
+++ trunk/freebsd6-buildutils/debian/control 2006-02-11 11:54:59 UTC (rev 1170)
@@ -9,7 +9,7 @@
Package: freebsd6-buildutils
Architecture: any
Depends: ${shlibs:Depends}, bsdmainutils, dash, unzip, patchutils, gcc-3.4
-Conflicts: freebsd5-buildutils, freebsd-buildutils
+Conflicts: freebsd5-buildutils, freebsd-buildutils, pmake
Provides: freebsd-buildutils
Description: Utilities for building FreeBSD 6.x sources
This package contains the FreeBSD 6.x counterparts of some standard build
Modified: trunk/freebsd6-buildutils/debian/dirs
===================================================================
--- trunk/freebsd6-buildutils/debian/dirs 2006-02-11 10:19:00 UTC (rev 1169)
+++ trunk/freebsd6-buildutils/debian/dirs 2006-02-11 11:54:59 UTC (rev 1170)
@@ -1,4 +1,4 @@
-usr/share/freebsd6-buildutils
+usr/share
usr/sbin
usr/bin
usr/share/man/man1
Modified: trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff 2006-02-11 10:19:00 UTC (rev 1169)
+++ trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff 2006-02-11 11:54:59 UTC (rev 1170)
@@ -169,15 +169,3 @@
SHAREMODE?= ${NOBINMODE}
MANDIR?= ${SHAREDIR}/man/man
-diff -ur ../foo.old/src/usr.bin/make/pathnames.h ./src/usr.bin/make/pathnames.h
---- ../foo.old/src/usr.bin/make/pathnames.h 2005-03-11 14:02:38.000000000 +0100
-+++ ./src/usr.bin/make/pathnames.h 2005-12-17 12:49:11.000000000 +0100
-@@ -50,7 +50,7 @@
- #endif /* ! PATH_DEFSYSMK */
-
- #ifndef PATH_DEFSYSPATH
--#define PATH_DEFSYSPATH "/usr/share/mk"
-+#define PATH_DEFSYSPATH "/usr/share/freebsd6-buildutils/mk"
- #endif /* ! PATH_DEFSYSPATH */
-
- #endif /* pathnames_h_235b888a */
Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules 2006-02-11 10:19:00 UTC (rev 1169)
+++ trunk/freebsd6-buildutils/debian/rules 2006-02-11 11:54:59 UTC (rev 1170)
@@ -88,8 +88,8 @@
$(PMAKE) install \
DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
- cp -af $(CURDIR)/build-tree/ports \
- $(CURDIR)/debian/$(package)/usr/share/$(package)
+ cp -af $(CURDIR)/build-tree/ports/Mk \
+ $(CURDIR)/debian/$(package)/usr/share/
# rename awk
mv $(CURDIR)/debian/$(package)/usr/bin/nawk \
@@ -111,10 +111,6 @@
done
rmdir $(CURDIR)/debian/$(package)/usr/sbin
- # make stuff
- mv $(CURDIR)/debian/$(package)/usr/share/mk \
- $(CURDIR)/debian/$(package)/usr/share/$(package)/mk
-
clean:
dh_testdir
dh_testroot
Reply to: