devel/uboot: Rename to devel/uboot-mkimage

- Rename devel/u-boot to devel/uboot-mkimage
- Accordingly, update MOVED and add SUBDIR in devel/Makefile

While I'm here:

- Update to 2010.12
- Update PORTNAME and MAINTAINER
- Remove custom do-patch and do-build targets
- Use BUILD_WRKSRC and MAKEFILE instead
- Update BSDmakefile
- Add patch-include__compiler.h
- Trim Makefile header
- pkg-descr: Tab->space for WWW:

PR:		ports/178137
Approved by:	eadler, rm (mentors)
Approved by:	maintainer timeout (16 days)
Obtained from:	ray
Discussed with:	ray

9 files changed, 53 insertions, 28 deletions

diff --git a/MOVED b/MOVED
index 66f99343e9b4..f2e2377f3134 100644
--- a/MOVED
+++ b/MOVED
@@ -4253,3 +4253,4 @@ devel/libgsf-gnome||2013-05-05|No longer supported by newer libgsf version
 textproc/ruby-sablot||2013-05-07|Has expired: Does not work with Ruby 1.9
 japanese/jisx0213-fonts|/japanese/font-jisx0213|2013-05-08|Renamed
 x11-drivers/xf86-video-ati613||2013-05-10|Has expired: Old version, use xf86-video-ati instead
+devel/u-boot|devel/uboot-mkimage|2013-05-11|Port does not build full uboot distribution, only mkimage
diff --git a/devel/Makefile b/devel/Makefile
index 233e186f724a..78d507289265 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4337,8 +4337,8 @@
     SUBDIR += trac-bitten
     SUBDIR += trio
     SUBDIR += truc
-    SUBDIR += u-boot
     SUBDIR += uatraits
+    SUBDIR += uboot-mkimage 
     SUBDIR += uclmmbase
     SUBDIR += ucommon
     SUBDIR += ucpp
diff --git a/devel/u-boot/distinfo b/devel/u-boot/distinfo
deleted file mode 100644
index b657027a12dd..000000000000
--- a/devel/u-boot/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (u-boot-1.2.0.tar.bz2) = 62192ddf019c5d24f6538b33c9e69b6e5792bf5b0f464c0149061e2f0871108b
-SIZE (u-boot-1.2.0.tar.bz2) = 6929112
diff --git a/devel/u-boot/files/BSDmakefile b/devel/u-boot/files/BSDmakefile
deleted file mode 100644
index 8db790b3ed88..000000000000
--- a/devel/u-boot/files/BSDmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CFLAGS+=	-I../include -DUSE_HOSTCC
-
-all: mkimage
-
-mkimage: mkimage.o crc32.o
-	$(CC) $(CFLAGS) -o $(.TARGET) $(.ALLSRC)
-
-crc32.o: ../lib_generic/crc32.c ../include/zlib.h
-
-clean:
-	rm -f mkimage mkimage.o crc32.o
diff --git a/devel/u-boot/Makefile b/devel/uboot-mkimage/Makefile
index b3b9ac5ecf32..a5d050b888bb 100644
--- a/devel/u-boot/Makefile
+++ b/devel/uboot-mkimage/Makefile
@@ -1,29 +1,25 @@
-# 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
-
-do-build:
-	@cd ${WRKSRC}/tools && make
+post-extract:
+	${CP} ${PATCHDIR}/BSDmakefile ${WRKSRC}/tools
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/mkimage ${PREFIX}/bin
diff --git a/devel/uboot-mkimage/distinfo b/devel/uboot-mkimage/distinfo
new file mode 100644
index 000000000000..c15a974417ea
--- /dev/null
+++ b/devel/uboot-mkimage/distinfo
@@ -0,0 +1,2 @@
+SHA256 (u-boot-2010.12.tar.bz2) = 1705772db7a18635693676abb8818542167cb131921c456a1edd0ed47e6b77fe
+SIZE (u-boot-2010.12.tar.bz2) = 8238700
diff --git a/devel/uboot-mkimage/files/BSDmakefile b/devel/uboot-mkimage/files/BSDmakefile
new file mode 100644
index 000000000000..67b59fba18f4
--- /dev/null
+++ b/devel/uboot-mkimage/files/BSDmakefile
@@ -0,0 +1,28 @@
+CFLAGS+=	-I. -I../include -DUSE_HOSTCC
+
+all: mkimage
+
+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/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
diff --git a/devel/uboot-mkimage/files/patch-include__compiler.h b/devel/uboot-mkimage/files/patch-include__compiler.h
new file mode 100644
index 000000000000..641a05f8786f
--- /dev/null
+++ b/devel/uboot-mkimage/files/patch-include__compiler.h
@@ -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
diff --git a/devel/u-boot/pkg-descr b/devel/uboot-mkimage/pkg-descr
index 90047a866393..7751c04e8278 100644
--- a/devel/u-boot/pkg-descr
+++ b/devel/uboot-mkimage/pkg-descr
@@ -1,4 +1,4 @@
 mkimage adds a header to a kernel image with information and checksums for
 the u-boot bootloader used in embedded systems.
 
-WWW: http://www.denx.de/wiki/UBoot
+WWW: http://www.denx.de/wiki/U-Boot/WebHome