Bug 186334 - sysutils/flashrom add STAGE support, disable BUSPIRATE, enable FTDI
sysutils/flashrom add STAGE support, disable BUSPIRATE, enable FTDI
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Rusmir Dusko
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-02-01 12:30 UTC by nukama
Modified: 2014-02-03 16:10 UTC (History)
0 users

See Also:


Attachments
file.diff (3.22 KB, patch)
2014-02-01 12:30 UTC, nukama
no flags Details | Diff
flashrom.diff (2.78 KB, patch)
2014-02-03 13:15 UTC, nukama
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nukama 2014-02-01 12:30:00 UTC
- add STAGE support
- new OPTION_*_DEPENDS usage
- disable BUSPIRATE due to a bug reported by idwer
- enable FTDI programmer

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2014-02-01 12:30:14 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer 2014-02-01 12:30:15 UTC
Maintainer of sysutils/flashrom,

Please note that PR ports/186334 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186334

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer 2014-02-01 12:30:16 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Rusmir Dusko freebsd_committer 2014-02-01 12:38:51 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

I'll take it.
Comment 5 nukama 2014-02-03 13:15:29 UTC
Added new diff with improvements from nemysis.
Maintainer approved.
Comment 6 Rusmir Dusko freebsd_committer 2014-02-03 16:05:41 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 7 dfilter freebsd_committer 2014-02-03 16:07:44 UTC
Author: nemysis
Date: Mon Feb  3 16:07:36 2014
New Revision: 342459
URL: http://svnweb.freebsd.org/changeset/ports/342459
QAT: https://qat.redports.org/buildarchive/r342459/

Log:
  - Bump PORTREVISION
  - Use the new format for LIB_DEPENDS
  - Reordering Options
  - USES gmake instead of USE_GMAKE
  - Move support for Buspirate into an OPTION
  - Add FTDI to default Options
  - Support STAGEDIR
  - Change DOCS
  
  PR:		ports/186334
  Submitted by:	Hakisho Nukama <nukama@gmail.com>

Modified:
  head/sysutils/flashrom/Makefile

Modified: head/sysutils/flashrom/Makefile
==============================================================================
--- head/sysutils/flashrom/Makefile	Mon Feb  3 15:47:22 2014	(r342458)
+++ head/sysutils/flashrom/Makefile	Mon Feb  3 16:07:36 2014	(r342459)
@@ -3,6 +3,7 @@
 
 PORTNAME=	flashrom
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.flashrom.org/releases/
 
@@ -11,59 +12,52 @@ COMMENT=	Utility for reading, writing, v
 
 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=		BUSPIRATE DMIDECODE DOCS FTDI
+OPTIONS_DEFAULT=	DMIDECODE FTDI
 
-DMIDECODE_DESC=	Use dmidecode to gather DMI information
-FTDI_DESC=	Enable external FT2232SPI flasher support
+BUSPIRATE_DESC=		Enable buspirate support (broken)
+DMIDECODE_DESC=		Use dmidecode to gather DMI information
+FTDI_DESC=		Enable external FT2232SPI flasher support
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_JOBS_UNSAFE=	yes
+USES=		gmake
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lc
+MAKE_ENV=	CONFIG_BUSPIRATE_SPI=no
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-PORTDOCS=	ChangeLog COPYING README
-PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	*
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN8=		${PORTNAME}.8
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.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
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	ChangeLog README
+
+DOCSRCDIR2=	${WRKSRC}/Documentation
+DOCSDIR2=	${DOCSDIR}/Documentation
+DOC_FILES2=	*.txt
+
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man8/${PORTNAME}.8.gz
+
+BUSPIRATE_MAKE_ENV=	CONFIG_BUSPIRATE_SPI=yes
+
+DMIDECODE_RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+
+FTDI_LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+FTDI_USES=		pkgconfig
+FTDI_LDFLAGS=		-lz
+FTDI_MAKE_ENV_OFF=	2_SPI=no
 
 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}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"