svn commit: r317846 - in head: . devel devel/u-boot devel/uboot-mkimage devel/uboot-mkimage/files

Sat May 11 01:16:52 UTC 2013

Author: koobs
Date: Sat May 11 01:16:50 2013
New Revision: 317846
URL: http://svnweb.freebsd.org/changeset/ports/317846

Log:
  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

Added:
  head/devel/uboot-mkimage/
     - copied from r314358, head/devel/u-boot/
  head/devel/uboot-mkimage/files/patch-include__compiler.h   (contents, props changed)
Deleted:
  head/devel/u-boot/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/uboot-mkimage/Makefile   (contents, props changed)
  head/devel/uboot-mkimage/distinfo   (contents, props changed)
  head/devel/uboot-mkimage/files/BSDmakefile   (contents, props changed)
  head/devel/uboot-mkimage/pkg-descr   (contents, props changed)

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri May 10 23:15:18 2013	(r317845)
+++ head/MOVED	Sat May 11 01:16:50 2013	(r317846)
@@ -4253,3 +4253,4 @@ devel/libgsf-gnome||2013-05-05|No longer
 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

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri May 10 23:15:18 2013	(r317845)
+++ head/devel/Makefile	Sat May 11 01:16:50 2013	(r317846)
@@ -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

Modified: head/devel/uboot-mkimage/Makefile
==============================================================================
--- head/devel/u-boot/Makefile	Sat Mar 16 14:24:04 2013	(r314358)
+++ head/devel/uboot-mkimage/Makefile	Sat May 11 01:16:50 2013	(r317846)
@@ -1,29 +1,25 @@
-# New ports collection makefile for:   u-boot-mkimage
-# Date created:        18 September 2007
-# Whom:                Marius Nuennerich <mn at bsdgroup.de>
-#
+# Created by: Marius Nuennerich <mn at 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 at bsdgroup.de
+MAINTAINER=	ray at 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

Modified: head/devel/uboot-mkimage/distinfo
==============================================================================
--- head/devel/u-boot/distinfo	Sat Mar 16 14:24:04 2013	(r314358)
+++ head/devel/uboot-mkimage/distinfo	Sat May 11 01:16:50 2013	(r317846)
@@ -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

Modified: head/devel/uboot-mkimage/files/BSDmakefile
==============================================================================
--- head/devel/u-boot/files/BSDmakefile	Sat Mar 16 14:24:04 2013	(r314358)
+++ head/devel/uboot-mkimage/files/BSDmakefile	Sat May 11 01:16:50 2013	(r317846)
@@ -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

Added: head/devel/uboot-mkimage/files/patch-include__compiler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/uboot-mkimage/files/patch-include__compiler.h	Sat May 11 01:16:50 2013	(r317846)
@@ -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

Modified: head/devel/uboot-mkimage/pkg-descr
==============================================================================
--- head/devel/u-boot/pkg-descr	Sat Mar 16 14:24:04 2013	(r314358)
+++ head/devel/uboot-mkimage/pkg-descr	Sat May 11 01:16:50 2013	(r317846)
@@ -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
