ports/186334: sysutils/flashrom add STAGE support, disable BUSPIRATE, enable FTDI

[Hakisho Nukama]

>Number:         186334
>Category:       ports
>Synopsis:       sysutils/flashrom add STAGE support, disable BUSPIRATE, enable FTDI
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 01 12:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Hakisho Nukama
>Release:        10.0-RELEASE
>Organization:
n/a
>Environment:
>Description:
- add STAGE support
- new OPTION_*_DEPENDS usage
- disable BUSPIRATE due to a bug reported by idwer
- enable FTDI programmer
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rup /usr/ports/sysutils/flashrom/Makefile sysutils/flashrom/Makefile
--- /usr/ports/sysutils/flashrom/Makefile	2013-09-20 23:05:58.000000000 +0000
+++ sysutils/flashrom/Makefile	2014-01-31 13:49:05.781194278 +0000
@@ -1,69 +1,53 @@
 # Created by: Alexander Logvinov <ports at logvinov.com>
-# $FreeBSD: sysutils/flashrom/Makefile 327772 2013-09-20 23:05:58Z bapt $
+# $FreeBSD$
 
-PORTNAME=	flashrom
-PORTVERSION=	0.9.7
-CATEGORIES=	sysutils
-MASTER_SITES=	http://download.flashrom.org/releases/
+PORTNAME=		flashrom
+PORTVERSION=		0.9.7
+CATEGORIES=		sysutils
+MASTER_SITES=		http://download.flashrom.org/releases/
 
-MAINTAINER=	nukama+maintainer at gmail.com
-COMMENT=	Utility for reading, writing, verifying, and erasing flash ROM chips
+MAINTAINER=		nukama+maintainer at gmail.com
+COMMENT=		Utility for reading, writing, verifying, and erasing flash ROM chips
 
-LICENSE=	GPLv2
+LICENSE=		GPLv2
 
-LIB_DEPENDS=	pci:${PORTSDIR}/devel/libpci
+LIB_DEPENDS=		libpci.so:${PORTSDIR}/devel/libpci
 
-OPTIONS_DEFINE=	DMIDECODE DOCS FTDI
-OPTIONS_DEFAULT=	DMIDECODE DOCS
+OPTIONS_DEFINE=		DMIDECODE FTDI BUSPIRATE
+OPTIONS_DEFAULT=	DMIDECODE FTDI
 
-DMIDECODE_DESC=	Use dmidecode to gather DMI information
-FTDI_DESC=	Enable external FT2232SPI flasher support
+DMIDECODE_DESC=		Use dmidecode to gather DMI information
+FTDI_DESC=		Enable external FT2232SPI flasher support
+BUSPIRATE_DESC=		Enable buspirate support (broken)
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_JOBS_UNSAFE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lc
+USES=			gmake
+USE_BZIP2=		yes
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib -lc
+MAKE_ENV=		CONFIG_BUSPIRATE_SPI=no
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=		amd64 i386
 
-PORTDOCS=	ChangeLog COPYING README
-PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=		ChangeLog COPYING README
+PLIST_FILES=		bin/${PORTNAME} \
+			man/man8/${PORTNAME}.8.gz
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN8=		${PORTNAME}.8
-.endif
+DMIDECODE_RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+FTDI_LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+FTDI_USES=		pkgconfig
+FTDI_LDFLAGS=		-lz
+FTDI_MAKE_ENV_OFF=	2_SPI=no
 
-.if ${PORT_OPTIONS:MDMIDECODE}
-RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
-.endif
-
-.if ${PORT_OPTIONS:MFTDI}
-USES+=		pkgconfig
-LIB_DEPENDS+=	ftdi:${PORTSDIR}/devel/libftdi
-.endif
-
-post-patch:
-.if ${PORT_OPTIONS:MFTDI}
-	@${REINPLACE_CMD} -e 's|-lusb")|-lusb") -lz|' ${WRKSRC}/Makefile
-.else
-	@${REINPLACE_CMD} -e 's|2_SPI ?= yes|2_SPI ?= no|' ${WRKSRC}/Makefile
-.endif
+BUSPIRATE_MAKE_ENV=	CONFIG_BUSPIRATE_SPI=yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NO_INSTALL_MANPAGES)
-	${MKDIR} ${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: