Attachment 133642 Details for Bug 178137 – file.diff

[patch] file.diff

file.diff (text/plain), 5.14 KB, created by Kubilay Kocak on 2013-04-25 10:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kubilay Kocak

Created: 2013-04-25 10:00:00 UTC

Size: 5.14 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 314363)
>+++ MOVED	(working copy)
>@@ -4168,3 +4168,4 @@
> net-mgmt/zabbix-frontend|net-mgmt/zabbix2-frontend|2013-03-15|Has expired: no longer supported by upstream
> net-mgmt/zabbix-proxy|net-mgmt/zabbix2-proxy|2013-03-15|Has expired: no longer supported by upstream
> net-mgmt/zabbix-server|net-mgmt/zabbix2-server|2013-03-15|Has expired: no longer supported by upstream
>+devel/u-boot|devel/uboot-mkimage|2013-03-17|Port doesn't build main target of distribution
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 314363)
>+++ devel/Makefile	(working copy)
>@@ -4304,8 +4304,8 @@
>     SUBDIR += trac-bitten
>     SUBDIR += trio
>     SUBDIR += truc
>-    SUBDIR += u-boot
>     SUBDIR += uatraits
>+    SUBDIR += uboot-mkimage 
>     SUBDIR += uclmmbase
>     SUBDIR += ucommon
>     SUBDIR += ucpp
>Index: devel/u-boot/Makefile (deleted)
>===================================================================
>Index: devel/u-boot/distinfo (deleted)
>===================================================================
>Index: devel/u-boot/files/BSDmakefile (deleted)
>===================================================================
>Index: devel/u-boot/pkg-descr (deleted)
>===================================================================
>Index: devel/uboot-mkimage/Makefile
>===================================================================
>--- devel/uboot-mkimage/Makefile	(working copy)
>+++ devel/uboot-mkimage/Makefile	(working copy)
>@@ -1,30 +1,26 @@
>-# New ports collection makefile for:   u-boot-mkimage
>-# Date created:        18 September 2007
>-# Whom:                Marius Nuennerich <mn@bsdgroup.de>
>-#
>+# Created by: Marius Nuennerich <mn@bsdgroup.de>
> # $FreeBSD$
>-#
> 
>-PORTNAME=	u-boot
>-PORTVERSION=	1.2.0
>+PORTNAME=	uboot
>+DISTVERSION=	2010.12
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/ \
> 		http://people.bsdgroup.de/~as/freebsd/distfiles/
> PKGNAMESUFFIX=	-mkimage
>+DISTNAME=	u-boot-${PORTVERSION}
> 
>-MAINTAINER=	mn@bsdgroup.de
>+MAINTAINER=	ray@FreeBSD.org
> COMMENT=	The mkimage utility of the u-boot bootloader
> 
> USE_BZIP2=	yes
>+BUILD_WRKSRC=	${WRKSRC}/tools
>+MAKEFILE=	BSDmakefile
> 
> PLIST_FILES=	bin/mkimage
> 
>-do-patch:
>-	@${CP} ${PATCHDIR}/BSDmakefile ${WRKSRC}/tools
>+post-extract:
>+	${CP} ${PATCHDIR}/BSDmakefile ${WRKSRC}/tools
> 
>-do-build:
>-	@cd ${WRKSRC}/tools && make
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/tools/mkimage ${PREFIX}/bin
> 
>Index: devel/uboot-mkimage/distinfo
>===================================================================
>--- devel/uboot-mkimage/distinfo	(working copy)
>+++ devel/uboot-mkimage/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (u-boot-1.2.0.tar.bz2) = 62192ddf019c5d24f6538b33c9e69b6e5792bf5b0f464c0149061e2f0871108b
>-SIZE (u-boot-1.2.0.tar.bz2) = 6929112
>+SHA256 (u-boot-2010.12.tar.bz2) = 1705772db7a18635693676abb8818542167cb131921c456a1edd0ed47e6b77fe
>+SIZE (u-boot-2010.12.tar.bz2) = 8238700
>Index: devel/uboot-mkimage/files/BSDmakefile
>===================================================================
>--- devel/uboot-mkimage/files/BSDmakefile	(working copy)
>+++ devel/uboot-mkimage/files/BSDmakefile	(working copy)
>@@ -1,11 +1,28 @@
>-CFLAGS+=	-I../include -DUSE_HOSTCC
>+CFLAGS+=	-I. -I../include -DUSE_HOSTCC
> 
> all: mkimage
> 
>-mkimage: mkimage.o crc32.o
>+mkimage: mkimage.o crc32.o default_image.o fit_image.o image.o imximage.o \
>+	kwbimage.o md5.o os_support.o sha1.o fdt.o fdt_ro.o fdt_rw.o \
>+	fdt_strerror.o fdt_wip.o
> 	$(CC) $(CFLAGS) -o $(.TARGET) $(.ALLSRC)
> 
>-crc32.o: ../lib_generic/crc32.c ../include/zlib.h
>+crc32.o: ../lib/crc32.c ../include/u-boot/zlib.h
>+default_image.o:	default_image.c
>+fit_image.o:		fit_image.c
>+image.o:		../common/image.c
>+imximage.o:		imximage.c
>+kwbimage.o:		kwbimage.c
>+md5.o:			../lib/md5.c
>+os_support.o:		os_support.c
>+sha1.o:			../lib/sha1.c
> 
>+fdt.o:			../lib/libfdt/fdt.c
>+fdt_ro.o:		../lib/libfdt/fdt_ro.c
>+fdt_rw.o:		../lib/libfdt/fdt_rw.c
>+fdt_strerror.o:		../lib/libfdt/fdt_strerror.c
>+fdt_wip.o:		../lib/libfdt/fdt_wip.c
>+
>+
> clean:
> 	rm -f mkimage mkimage.o crc32.o
>Index: devel/uboot-mkimage/files/patch-include__compiler.h
>===================================================================
>--- devel/uboot-mkimage/files/patch-include__compiler.h	(revision 0)
>+++ devel/uboot-mkimage/files/patch-include__compiler.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- ./include/compiler.h.orig	2010-12-22 21:22:14.000000000 +0200
>++++ ./include/compiler.h	2011-01-13 13:50:35.000000000 +0200
>+@@ -44,7 +44,7 @@
>+ #ifdef __linux__
>+ # include <endian.h>
>+ # include <byteswap.h>
>+-#elif defined(__MACH__)
>++#elif defined(__MACH__) || defined(__FreeBSD__)
>+ # include <machine/endian.h>
>+ typedef unsigned long ulong;
>+ #endif
>
>Property changes on: devel/uboot-mkimage/files/patch-include__compiler.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 178137: 133642