Attachment 147260 Details for Bug 193588 – malo-firmware-1.4_2.diff

[patch] malo-firmware-1.4_2.diff

malo-firmware-1.4_2.diff (text/plain), 4.17 KB, created by Carlos J Puga Medina on 2014-09-12 23:42:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-09-12 23:42:46 UTC

Size: 4.17 KB

patch

obsolete

>diff -urN /usr/ports/net/malo-firmware-1.4.old/Makefile /usr/ports/net/malo-firmware-1.4/Makefile
>--- /usr/ports/net/malo-firmware-1.4.old/Makefile	2008-03-19 12:30:58.000000000 +0100
>+++ /usr/ports/net/malo-firmware-1.4/Makefile	2014-09-13 01:33:44.000000000 +0200
>@@ -1,55 +1,53 @@
>-# New ports collection makefile for:	malo-firmware-kmod
>-# Date created:				Mar 7 2006
>-# Whom:					Weongyo Jeong <weongyo@FreeBSD.org>
>-#
>+# Created by: Weongyo Jeong <weongyo@FreeBSD.org>
> # $FreeBSD$
>-#
> 
>-PORTNAME?=	malo-firmware
>+PORTNAME=	malo-firmware
> PORTVERSION=	${FWVERSION}
>-PORTREVISION?=	1
>-CATEGORIES=	net kld
>+PORTREVISION=	2
>+CATEGORIES=	net
> MASTER_SITES=	http://weongyo.org/project/malo/
> PKGNAMESUFFIX=	-kmod
>-FWNAME?=	malo-fw-${FWVERSION}
>-FWVERSION?=	3.0.0.39
>-DISTFILES=	${FWNAME}.tar.gz
>+DISTFILES=	${FWNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	weongyo@FreeBSD.org
>-COMMENT?=	Marvell Libertas 88W8335 IEEE 802.11b/g Firmware Kernel Module
>+COMMENT=	Marvell Libertas 88W8335 IEEE 802.11b/g Firmware Kernel Module
> 
>-DRIVERNAME?=	malofw
>-FIRMS?=		malo8335-h:malo8335-m
>+FWNAME=		malo-fw-${FWVERSION}
>+FWVERSION=	3.0.0.39
> 
>+USES=		kmod
>+DRIVERNAME=	malofw
>+FIRMS=		malo8335-h:malo8335-m
> WRKSRC=		${WRKDIR}
>-KMODDIR=	/boot/modules
> KMODVERSION=	${FWVERSION:C/^(...)$/\1.0/:S/.//g}
> PLIST_SUB=	DRIVERNAME="${DRIVERNAME}" \
> 		KMODDIR="${KMODDIR}"
> CFLAGS+=	-D_KERNEL
> 
>-NO_PACKAGE=	"this is a modified version of a restricted firmware"
>+NO_PACKAGE=	This is a modified version of a restricted firmware
> 
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-	@${MKDIR} ${WRKSRC}/${DRIVERNAME}
>-	@${MV} ${WRKSRC}/${FIRMS:C/:.*//} \
>+	${MKDIR} ${WRKSRC}/${DRIVERNAME}
>+	${MV} ${WRKSRC}/${FIRMS:C/:.*//} \
> 		${WRKSRC}/${DRIVERNAME}/${FIRMS:C/:.*//}
>-	@${MV} ${WRKSRC}/${FIRMS:C/.*://} \
>+	${MV} ${WRKSRC}/${FIRMS:C/.*://} \
> 		${WRKSRC}/${DRIVERNAME}/${FIRMS:C/.*://}
>-	@${ECHO_CMD} "KMOD= ${DRIVERNAME}" > ${WRKSRC}/${DRIVERNAME}/Makefile
>-	@${ECHO_CMD} "FIRMWS= ${FIRMS:C/:.*//}:${FIRMS:C/:.*//}:${KMODVERSION} \\" >> \
>+	${ECHO_CMD} "KMOD= ${DRIVERNAME}" > ${WRKSRC}/${DRIVERNAME}/Makefile
>+	${ECHO_CMD} "FIRMWS= ${FIRMS:C/:.*//}:${FIRMS:C/:.*//}:${KMODVERSION} \\" >> \
> 		${WRKSRC}/${DRIVERNAME}/Makefile
>-	@${ECHO_CMD} "	${FIRMS:C/.*://}:${FIRMS:C/.*://}:${KMODVERSION}" >> \
>+	${ECHO_CMD} "	${FIRMS:C/.*://}:${FIRMS:C/.*://}:${KMODVERSION}" >> \
> 		${WRKSRC}/${DRIVERNAME}/Makefile
>-	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> \
>+	${ECHO_CMD} ".include <bsd.kmod.mk>" >> \
> 		${WRKSRC}/${DRIVERNAME}/Makefile
> 
> do-build:
>-	@cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${KMODDIR}" make all
>+	cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${KMODDIR}" make all
> 
> do-install:
>-	@cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${KMODDIR}" make install
>+	${MKDIR} ${STAGEDIR}${KMODDIR}
>+	cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${STAGEDIR}${KMODDIR}" make ${INSTALL}
>+	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${KMODDIR}/${DRIVERNAME}.ko
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/net/malo-firmware-1.4.old/distinfo /usr/ports/net/malo-firmware-1.4/distinfo
>--- /usr/ports/net/malo-firmware-1.4.old/distinfo	2008-03-19 12:30:58.000000000 +0100
>+++ /usr/ports/net/malo-firmware-1.4/distinfo	2014-09-13 00:34:50.000000000 +0200
>@@ -1,3 +1,2 @@
>-MD5 (malo-fw-3.0.0.39.tar.gz) = 8f45836c8405a8ca096a33db002c93ea
> SHA256 (malo-fw-3.0.0.39.tar.gz) = fdb70aa628250922bb3f2a912b5dc7c54304a8120cb72191b49f497b4653954a
> SIZE (malo-fw-3.0.0.39.tar.gz) = 31796
>diff -urN /usr/ports/net/malo-firmware-1.4.old/pkg-descr /usr/ports/net/malo-firmware-1.4/pkg-descr
>--- /usr/ports/net/malo-firmware-1.4.old/pkg-descr	2008-03-19 12:30:58.000000000 +0100
>+++ /usr/ports/net/malo-firmware-1.4/pkg-descr	2014-09-01 02:00:25.000000000 +0200
>@@ -4,4 +4,4 @@
> 
> This firmware files are comed from OpenBSD malo driver.
> 
>-	http://www.nazgul.ch/malo/malo-firmware-1.4.tgz
>+WWW: http://www.nazgul.ch/malo/
>diff -urN /usr/ports/net/malo-firmware-1.4.old/pkg-plist /usr/ports/net/malo-firmware-1.4/pkg-plist
>--- /usr/ports/net/malo-firmware-1.4.old/pkg-plist	2008-03-19 12:30:58.000000000 +0100
>+++ /usr/ports/net/malo-firmware-1.4/pkg-plist	2014-09-13 01:31:02.000000000 +0200
>@@ -1,2 +1,2 @@
>-@cwd %%KMODDIR%%
>-%%DRIVERNAME%%.ko
>+%%KMODDIR%%/linker.hints
>+%%KMODDIR%%/%%DRIVERNAME%%.ko

Actions: View | Diff

Attachments on bug 193588: 147248 | 147260 | 149270 | 149274 | 149727 | 149760