Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2014 16:07:36 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342459 - head/sysutils/flashrom
Message-ID:  <201402031607.s13G7a9d048923@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402031607.s13G7a9d048923>