Author: rmh
Date: 2006-02-13 12:48:44 +0000 (Mon, 13 Feb 2006)
New Revision: 1183
Removed:
trunk/freebsd6-buildutils/debian/patches/10_linux_utils.diff
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/control
trunk/freebsd6-buildutils/debian/links
trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
trunk/freebsd6-buildutils/debian/rules
Log:
* Add gmake (as alias for gnu make).
- control (Depends): Add make.
- links: Add gmake link.
* Massive cleanup in ports/Mk patches.
- rules: Add sed rules that superceed most of the changes.
- patches/09_ports_path.diff: Remove most of the patch, and re-diff.
- patches/10_linux_utils.diff: Merge into 09_ports_path.diff
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-13 12:22:09 UTC (rev
1182)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-13 12:48:44 UTC (rev
1183)
@@ -48,8 +48,15 @@
- patches/05_disable_hardlinks.diff: Ditto.
- rules: Remove commands that work with awk.
- fetch: Remove awk dirs from checkout/update.
+ * Add gmake (as alias for gnu make).
+ - control (Depends): Add make.
+ - links: Add gmake link.
+ * Massive cleanup in ports/Mk patches.
+ - rules: Add sed rules that superceed most of the changes.
+ - patches/09_ports_path.diff: Remove most of the patch, and re-diff.
+ - patches/10_linux_utils.diff: Merge into 09_ports_path.diff
- -- Robert Millan <[EMAIL PROTECTED]> Mon, 13 Feb 2006 14:20:35 +0100
+ -- Robert Millan <[EMAIL PROTECTED]> Mon, 13 Feb 2006 14:44:41 +0100
freebsd5-buildutils (5.4-3) unstable; urgency=low
Modified: trunk/freebsd6-buildutils/debian/control
===================================================================
--- trunk/freebsd6-buildutils/debian/control 2006-02-13 12:22:09 UTC (rev
1182)
+++ trunk/freebsd6-buildutils/debian/control 2006-02-13 12:48:44 UTC (rev
1183)
@@ -8,7 +8,14 @@
Package: freebsd6-buildutils
Architecture: any
-Depends: ${shlibs:Depends}, bsdmainutils, unzip, patchutils, dash, gcc-3.4,
original-awk
+Depends: ${shlibs:Depends}, bsdmainutils, unzip, patchutils, dash, gcc-3.4,
original-awk, make
+#
+# The following dependencies are needed because of symlinks in
/usr/lib/freebsd:
+# sh -> dash
+# cc -> gcc-3.4
+# awk -> original-awk
+# gmake -> make
+#
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:22:09 UTC (rev
1182)
+++ trunk/freebsd6-buildutils/debian/links 2006-02-13 12:48:44 UTC (rev
1183)
@@ -1,3 +1,4 @@
bin/dash usr/lib/freebsd/sh
usr/bin/gcc-3.4 usr/lib/freebsd/cc
usr/bin/original-awk usr/lib/freebsd/awk
+usr/bin/make usr/lib/freebsd/gmake
Modified: trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-13
12:22:09 UTC (rev 1182)
+++ trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-13
12:48:44 UTC (rev 1183)
@@ -1,111 +1,8 @@
-diff -ur ../foo.old/ports/Mk/bsd.port.mk ./ports/Mk/bsd.port.mk
---- ../foo.old/ports/Mk/bsd.port.mk 2005-11-08 10:02:51.000000000 +0100
-+++ ./ports/Mk/bsd.port.mk 2005-12-17 00:07:52.000000000 +0100
-@@ -473,7 +473,7 @@
- # files.
- # Default: ${.CURDIR}
- # PORTSDIR - The root of the ports tree.
--# Default: /usr/ports
-+# Default: /usr/share/freebsd6-buildutils/ports
- # DISTDIR - Where to search for and store copies of original
sources
- # Default: ${PORTSDIR}/distfiles
- # PACKAGES - A top level directory where all packages go (rather
than
-@@ -960,9 +960,9 @@
- .endif
- .endif
+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 @@
--AWK?= /usr/bin/awk
-+AWK?= freebsd-awk
- BASENAME?= /usr/bin/basename
--BRANDELF?= /usr/bin/brandelf
-+BRANDELF?= freebsd-brandelf
- .if exists(/usr/bin/bzip2)
- BZCAT?= /usr/bin/bzcat
- BZIP2_CMD?= /usr/bin/bzip2
-@@ -972,56 +972,56 @@
- BZIP2DEPENDS= yes
- .endif
- CAT?= /bin/cat
--CHGRP?= /usr/bin/chgrp
-+CHGRP?= chgrp
- CHMOD?= /bin/chmod
--CHOWN?= /usr/sbin/chown
-+CHOWN?= chown
- COMM?= /usr/bin/comm
- CP?= /bin/cp
--CPIO?= /usr/bin/cpio
-+CPIO?= cpio
- CUT?= /usr/bin/cut
--DC?= /usr/bin/dc
-+DC?= dc
- DIALOG?= /usr/bin/dialog
- DIFF?= /usr/bin/diff
- DIRNAME?= /usr/bin/dirname
--EGREP?= /usr/bin/egrep
--EXPR?= /bin/expr
-+EGREP?= egrep
-+EXPR?= expr
- FALSE?= false # Shell builtin
- FILE?= /usr/bin/file
- FIND?= /usr/bin/find
- FMT?= /usr/bin/fmt
--GREP?= /usr/bin/grep
--GUNZIP_CMD?= /usr/bin/gunzip -f
--GZCAT?= /usr/bin/gzcat
-+GREP?= grep
-+GUNZIP_CMD?= gunzip -f
-+GZCAT?= zcat
- GZIP?= -9
--GZIP_CMD?= /usr/bin/gzip -nf ${GZIP}
-+GZIP_CMD?= gzip -nf ${GZIP}
- HEAD?= /usr/bin/head
- ID?= /usr/bin/id
--IDENT?= /usr/bin/ident
-+IDENT?= ident
- LDCONFIG?= /sbin/ldconfig
- LN?= /bin/ln
- LS?= /bin/ls
- MKDIR?= /bin/mkdir -p
--MKTEMP?= /usr/bin/mktemp
-+MKTEMP?= mktemp
- MV?= /bin/mv
- OBJCOPY?= /usr/bin/objcopy
- OBJDUMP?= /usr/bin/objdump
- PASTE?= /usr/bin/paste
- PAX?= /bin/pax
- PRINTF?= /usr/bin/printf
--REALPATH?= /bin/realpath
-+REALPATH?= realpath
- RM?= /bin/rm
- RMDIR?= /bin/rmdir
--SED?= /usr/bin/sed
-+SED?= sed
- SETENV?= /usr/bin/env
- SH?= /bin/sh
- SORT?= /usr/bin/sort
- STRIP_CMD?= /usr/bin/strip
--SU_CMD?= /usr/bin/su root -c
-+SU_CMD?= su root -c
- TAIL?= /usr/bin/tail
- TEST?= test # Shell builtin
- TR?= /usr/bin/tr
- TRUE?= true # Shell builtin
--UNAME?= /usr/bin/uname
-+UNAME?= uname
- .if exists(/usr/bin/unzip)
- UNZIP_CMD?= /usr/bin/unzip
- .else
-@@ -1030,7 +1030,7 @@
- .endif
- WHICH?= /usr/bin/which
- XARGS?= /usr/bin/xargs
--YACC?= /usr/bin/yacc
-+YACC?= freebsd-yacc
-
- # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
- # or "true" if the make flag -s is given. Use ECHO_CMD where you mean
-@@ -1045,7 +1045,7 @@
-
# Get the architecture
.if !defined(ARCH)
-ARCH!= ${UNAME} -p
@@ -113,108 +10,104 @@
.endif
# Kludge for pre-3.0 systems
-@@ -1198,7 +1198,7 @@
- # These need to be absolute since we don't know how deep in the ports
- # tree we are and thus can't go relative. They can, of course, be overridden
- # by individual Makefiles or local system make configuration.
--PORTSDIR?= /usr/ports
-+PORTSDIR?= /usr/share/freebsd6-buildutils/ports
- LOCALBASE?= ${DESTDIR}/usr/local
- X11BASE?= ${DESTDIR}/usr/X11R6
- LINUXBASE?= ${DESTDIR}/compat/linux
-@@ -1836,15 +1836,7 @@
+@@ -1913,15 +1913,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
XMKMF?= xmkmf -a
--.if exists(/sbin/md5)
--MD5?= /sbin/md5
--.elif exists(/bin/md5)
--MD5?= /bin/md5
--.elif exists(/usr/bin/md5)
--MD5?= /usr/bin/md5
+-.if exists(md5)
+-MD5?= md5
+-.elif exists(md5)
+-MD5?= md5
+-.elif exists(md5)
+-MD5?= md5
-.else
-MD5?= md5
-.endif
+MD5?= md5sum
- .if exists(/sbin/sha256)
- SHA256?= /sbin/sha256
- .elif exists(${LOCALBASE}/sbin/sha256)
-@@ -1969,7 +1961,7 @@
- MTREE_FILE= /etc/mtree/BSD.local.dist
+ MD5_FILE?= ${MASTERDIR}/distinfo
+
+ MAKE_FLAGS?= -f
+@@ -3084,7 +3076,7 @@
+ .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
+ @if [ -f "${AUDITFILE}" ]; then \
+ audit_created=`${_EXTRACT_AUDITFILE} | \
+- ${SED} -nEe "1s/^#CREATED:
*([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
++ ${SED} -ne "1s/^#CREATED:
*([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
+ 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 @@
+ @(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 @@
+ @(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 @@
+ @(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'` ; \
+ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
+ if [ ! -z "$$select" ] ; then \
+@@ -4110,7 +4102,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'` ; \
+ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
+ if [ ! -z "$$select" ] ; then \
+@@ -4851,7 +4843,7 @@
+ done
+ @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
- .endif
--MTREE_CMD?= /usr/sbin/mtree
-+MTREE_CMD?= /usr/bin/freebsd-mtree
- MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
+- @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}; \
+ done
+ .endfor
+@@ -4885,7 +4877,7 @@
+ add-plist-docs:
+ .if defined(PORTDOCS) && !defined(NOPORTDOCS)
+ @if ${EGREP} -qe '[EMAIL PROTECTED]' ${TMPPLIST} && \
+- [ "`${SED} -En -e '/[EMAIL PROTECTED] ]*/s,,,p' ${TMPPLIST} |
${TAIL} -n 1`" != "${PREFIX}" ]; then \
++ [ "`${SED} -n -e '/[EMAIL PROTECTED] ]*/s,,,p' ${TMPPLIST} |
${TAIL} -n 1`" != "${PREFIX}" ]; then \
+ ${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
+@@ -48,7 +48,7 @@
- # Determine whether or not we can use rootly owner/group functions.
-diff -ur ../foo.old/ports/Mk/bsd.port.subdir.mk ./ports/Mk/bsd.port.subdir.mk
---- ../foo.old/ports/Mk/bsd.port.subdir.mk 2005-11-08 10:02:51.000000000
+0100
-+++ ./ports/Mk/bsd.port.subdir.mk 2005-12-16 23:59:10.000000000 +0100
-@@ -48,10 +48,10 @@
-
.if !defined(NOPRECIOUSMAKEVARS)
.if !defined(ARCH)
--ARCH!= /usr/bin/uname -p
-+ARCH!= /bin/uname -m
+-ARCH!= uname -p
++ARCH!= uname -m
.endif
.if !defined(OSREL)
--OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//'
-+OSREL!= /bin/uname -r | sed -e 's/[-(].*//'
- .endif
- .if !defined(OSVERSION)
- .if exists(/sbin/sysctl)
+ OSREL!= uname -r | sed -e 's/[-(].*//'
@@ -61,7 +61,7 @@
.endif
.endif
.if !defined(PORTOBJFORMAT)
--PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
+-PORTOBJFORMAT!= test -x objformat && objformat || echo aout
+PORTOBJFORMAT!= which objformat >/dev/null && objformat || echo aout
.endif
.endif
-@@ -73,11 +73,11 @@
- .else
- PKG_INFO?= /usr/sbin/pkg_info
- .endif
--SED?= /usr/bin/sed
-+SED?= /bin/sed
- PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
-
- .if !defined(OPSYS)
--OPSYS!= /usr/bin/uname -s
-+OPSYS!= /bin/uname -s
- .endif
-
- ECHO_MSG?= echo
-@@ -255,7 +255,7 @@
- .if (${OPSYS} == "NetBSD")
- PORTSDIR ?= /usr/opt
- .else
--PORTSDIR ?= /usr/ports
-+PORTSDIR ?= /usr/share/freebsd6-buildutils/ports
- .endif
- TEMPLATES ?= ${PORTSDIR}/Templates
- .if defined(PORTSTOP)
-diff -ur ../foo.old/src/share/mk/bsd.port.mk ./src/share/mk/bsd.port.mk
---- ../foo.old/src/share/mk/bsd.port.mk 2004-07-02 22:47:18.000000000
+0200
-+++ ./src/share/mk/bsd.port.mk 2005-12-16 23:59:10.000000000 +0100
-@@ -1,6 +1,6 @@
- # $FreeBSD: ./src/share/mk/bsd.port.mk,v 1.307 2004/07/02 20:47:18 eik Exp $
-
--PORTSDIR?= /usr/ports
-+PORTSDIR?= /usr/share/freebsd6-buildutils/ports
- BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
-
- .include <bsd.own.mk>
-diff -ur ../foo.old/src/share/mk/bsd.port.subdir.mk
./src/share/mk/bsd.port.subdir.mk
---- ../foo.old/src/share/mk/bsd.port.subdir.mk 2004-07-02 22:47:18.000000000
+0200
-+++ ./src/share/mk/bsd.port.subdir.mk 2005-12-16 23:59:10.000000000 +0100
-@@ -1,6 +1,6 @@
- # $FreeBSD: ./src/share/mk/bsd.port.subdir.mk,v 1.31 2004/07/02 20:47:18 eik
Exp $
-
--PORTSDIR?= /usr/ports
-+PORTSDIR?= /usr/share/freebsd6-buildutils/ports
- BSDPORTSUBDIRMK?= ${PORTSDIR}/Mk/bsd.port.subdir.mk
-
- .include "${BSDPORTSUBDIRMK}"
Deleted: trunk/freebsd6-buildutils/debian/patches/10_linux_utils.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/10_linux_utils.diff
2006-02-13 12:22:09 UTC (rev 1182)
+++ trunk/freebsd6-buildutils/debian/patches/10_linux_utils.diff
2006-02-13 12:48:44 UTC (rev 1183)
@@ -1,66 +0,0 @@
-diff -ur ../foo.old/ports/Mk/bsd.port.mk ./ports/Mk/bsd.port.mk
---- ../foo.old/ports/Mk/bsd.port.mk 2005-12-17 00:08:37.000000000 +0100
-+++ ./ports/Mk/bsd.port.mk 2005-12-17 00:08:42.000000000 +0100
-@@ -2994,7 +2994,7 @@
- .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
- @if [ -f "${AUDITFILE}" ]; then \
- audit_created=`${_EXTRACT_AUDITFILE} | \
-- ${SED} -nEe "1s/^#CREATED:
*([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
-+ ${SED} -ne "1s/^#CREATED:
*([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
- audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \
- if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
- ${ECHO_MSG} "===> WARNING: Vulnerability database out
of date, checking anyway"; \
-@@ -3024,7 +3024,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`; \
-@@ -3091,7 +3091,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`; \
-@@ -3988,7 +3988,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'` ; \
- if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -4020,7 +4020,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'` ; \
- if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -4843,7 +4843,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}; \
- done
- .endfor
-@@ -4877,7 +4877,7 @@
- add-plist-docs:
- .if defined(PORTDOCS) && !defined(NOPORTDOCS)
- @if ${EGREP} -qe '[EMAIL PROTECTED]' ${TMPPLIST} && \
-- [ "`${SED} -En -e '/[EMAIL PROTECTED] ]*/s,,,p' ${TMPPLIST} |
${TAIL} -n 1`" != "${PREFIX}" ]; then \
-+ [ "`${SED} -n -e '/[EMAIL PROTECTED] ]*/s,,,p' ${TMPPLIST} |
${TAIL} -n 1`" != "${PREFIX}" ]; then \
- ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
- fi
- .for x in ${PORTDOCS}
Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules 2006-02-13 12:22:09 UTC (rev
1182)
+++ trunk/freebsd6-buildutils/debian/rules 2006-02-13 12:48:44 UTC (rev
1183)
@@ -24,10 +24,20 @@
mkdir build-tree
tar -C build-tree -xzf src.tar.gz
find build-tree -type d -name CVS | xargs rm -rf
- find build-tree -type f | (while read i ; do sed -i $$i \
+ find build-tree -type f | (set -e ; while read i ; do sed -i $$i \
-e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e
"s/^LDADD=/LDADD+=/g" \
-e "s/getline/bsd_&/g" \
; done)
+ set -e ; for i in \
+ build-tree/ports/Mk/bsd.port.mk \
+ build-tree/ports/Mk/bsd.port.subdir.mk \
+ ; do sed -i $$i \
+ -e "s,/usr/bin/,,g" \
+ -e "s,/usr/sbin/,,g" \
+ -e "s,/bin/,,g" \
+ -e "s,/sbin/,,g" \
+ -e "s,/usr/ports,/usr/share/$(package)/ports,g" \
+ ; done
set -e ; cd build-tree && \
for i in $(CURDIR)/debian/patches/*.diff ; do \
echo "--- Patch $$i ---" ; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
