[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-ubin/files: freebsd-ubin-9.1-grep.patch freebsd-ubin-9.1-bsdar.patch freebsd-ubin-9.1-kdump-ioctl.patch freebsd-ubin-9.1-minigzip.patch

[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-ubin/files: freebsd-ubin-9.1-grep.patch freebsd-ubin-9.1-bsdar.patch freebsd-ubin-9.1-kdump-ioctl.patch freebsd-ubin-9.1-minigzip.patch

[Alexis Ballier (aballier)]

aballier    12/09/11 17:07:42

  Added:                freebsd-ubin-9.1-grep.patch
                        freebsd-ubin-9.1-bsdar.patch
                        freebsd-ubin-9.1-kdump-ioctl.patch
                        freebsd-ubin-9.1-minigzip.patch
  Log:
  bump to 9.1_rc1 from bsd overlay by Yuta SATOH, bug #426838
  
  (Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch?rev=1.1&content-type=text/plain

Index: freebsd-ubin-9.1-grep.patch
===================================================================
diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile
--- work.orig/usr.bin/grep/Makefile	2012-07-16 04:59:01.000000000 +0900
+++ work/usr.bin/grep/Makefile	2012-07-16 05:00:15.000000000 +0900
@@ -40,13 +40,6 @@
 	grep.1 lzfgrep.1
 .endif
 
-LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
-	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
-	${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
-	${BINDIR}/${PROG} ${BINDIR}/lzgrep \
-	${BINDIR}/${PROG} ${BINDIR}/lzegrep \
-	${BINDIR}/${PROG} ${BINDIR}/lzfgrep
-
 LDADD=	-lz -llzma
 DPADD=	${LIBZ} ${LIBLZMA}
 



1.1                  sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch?rev=1.1&content-type=text/plain

Index: freebsd-ubin-9.1-bsdar.patch
===================================================================
diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile
--- work.orig/usr.bin/ar/Makefile	2012-07-16 03:59:48.000000000 +0900
+++ work/usr.bin/ar/Makefile	2012-07-16 04:02:38.000000000 +0900
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-PROG=	ar
+PROG=	freebsd-ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 
 DPADD=	${LIBARCHIVE} ${LIBELF}
@@ -10,10 +10,7 @@
 
 CFLAGS+=-I. -I${.CURDIR}
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED?=	yes
-.endif
-LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
-MLINKS= ar.1 ranlib.1
+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
+MLINKS= freebsd-ar.1 freebsd-ranlib.1
 
 .include <bsd.prog.mk>



1.1                  sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch?rev=1.1&content-type=text/plain

Index: freebsd-ubin-9.1-kdump-ioctl.patch
===================================================================
diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile
--- work.orig/usr.bin/kdump/Makefile	2012-07-12 13:24:01.000000000 +0900
+++ work/usr.bin/kdump/Makefile	2012-07-16 03:54:14.000000000 +0900
@@ -21,7 +21,7 @@
 
 ioctl.c: mkioctls
 	env CPP="${CPP}" \
-	   sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	   sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
 
 kdump_subr.c: mksubr
 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile
--- work.orig/usr.bin/truss/Makefile	2012-07-12 13:24:03.000000000 +0900
+++ work/usr.bin/truss/Makefile	2012-07-16 03:54:40.000000000 +0900
@@ -24,7 +24,7 @@
 
 ioctl.c: ${.CURDIR}/../kdump/mkioctls
 	env CPP="${CPP}" \
-	    sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	    sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	i386-linux.c linux_syscalls.h



1.1                  sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch?rev=1.1&content-type=text/plain

Index: freebsd-ubin-9.1-minigzip.patch
===================================================================
diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile
--- work.orig/usr.bin/minigzip/Makefile	2012-07-16 04:39:31.000000000 +0900
+++ work/usr.bin/minigzip/Makefile	2012-07-16 04:45:30.000000000 +0900
@@ -10,4 +10,6 @@
 DPADD=	${LIBZ}
 LDADD=	-lz
 
+CFLAGS+= -I${.CURDIR}/../../lib/libz
+
 .include <bsd.prog.mk>