Date: Sun, 11 Feb 2018 16:18:38 +0100 From: Michal Meloun <melounmichal@gmail.com> To: Dmitry Marakasov <amdmi3@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r460716 - head/comms/lirc Message-ID: <026a209a-e474-35f5-0b08-e1f4853d758a@freebsd.org> In-Reply-To: <201802021645.w12Gjtef069607@repo.freebsd.org> References: <201802021645.w12Gjtef069607@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 02.02.2018 17:45, Dmitry Marakasov wrote: > Author: amdmi3 > Date: Fri Feb 2 16:45:55 2018 > New Revision: 460716 > URL: https://svnweb.freebsd.org/changeset/ports/460716 > > Log: > - Switch to USES=localbase > - Pet portlint > - Switch to options helpers > - Fix plist for MINIMAL case > - Properly optionize svgalib dependency handling This breaks comms/lirc on armv6 and armv7. ===> Building package for lirc-0.9.0_8,1 pkg-static: Unable to access file /wrkdirs/usr/ports/comms/lirc/work/stage/usr/local/%%SMODE2%%bin/smode2:No such file or directory *** Error code 1 Michal > > Modified: > head/comms/lirc/Makefile > > Modified: head/comms/lirc/Makefile > ============================================================================== > --- head/comms/lirc/Makefile Fri Feb 2 16:42:40 2018 (r460715) > +++ head/comms/lirc/Makefile Fri Feb 2 16:45:55 2018 (r460716) > @@ -3,7 +3,7 @@ > > PORTNAME= lirc > PORTVERSION= 0.9.0 > -PORTREVISION= 7 > +PORTREVISION= 8 > PORTEPOCH= 1 > CATEGORIES= comms > MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION} > @@ -13,58 +13,60 @@ COMMENT= Linux Infrared Remote Control > > BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat > > -INSTALL_TARGET= install-strip > -USES= alias autoreconf gmake libtool python tar:bzip2 > -USE_XORG= sm x11 > +USES= alias autoreconf gmake libtool localbase python tar:bzip2 > +USE_XORG= sm x11 ice > USE_CSTD= gnu89 > +INSTALL_TARGET= install-strip > USE_LDCONFIG= yes > > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --enable-sandboxed --with-devdir=/var/run/lirc \ > --sysconfdir=${PREFIX}/etc > -CPPFLAGS+= -I${LOCALBASE}/include > -LIBS+= -L${LOCALBASE}/lib > > -OPTIONS_DEFINE= MINIMAL DEBUG UARTLIRC DOCS EXAMPLES > - > -MINIMAL_DESC= Build with minmal dependencies > -UARTLIRC_DESC= Install serial LIRC driver > - > USE_RC_SUBR= lircd > PORTDOCS= html images irxevent.keys lirc.css lirc.hwdb > PORTEXAMPLES= remotes > SUB_FILES= pkg-message lircd.conf > > -.if exists(${LOCALBASE}/lib/libvga.so.1) > -LIB_DEPENDS+= libvga.so:graphics/svgalib > -PLIST_SUB+= SMODE2= > -.else > -PLIST_SUB+= SMODE2="@comment " > -.endif > +OPTIONS_DEFINE= MINIMAL DEBUG UARTLIRC DOCS EXAMPLES > +OPTIONS_DEFINE_i386= SMODE2 # requires svgalib which is... > +OPTIONS_DEFINE_amd64= SMODE2 # ...only available on x86 > +OPTIONS_SUB= yes > > -MINIMAL_LIB_DEPENDS_OFF= libftdi.so:devel/libftdi \ > +MINIMAL_DESC= Build with minimal dependencies > +UARTLIRC_DESC= Install serial LIRC driver > +SMODE2_DESC= Build smode2 (shows signal waveform), requires svgalib > + > +MINIMAL_LIB_DEPENDS_OFF=libftdi.so:devel/libftdi \ > libirman.so:comms/libirman > MINIMAL_CONFIGURE_OFF= --with-driver=userspace > MINIMAL_CONFIGURE_ON= --with-driver=dvico > > DEBUG_CONFIGURE_ENABLE= debug > > -UARTLIRC_RUN_DEPENDS= uartlirc>=0.3:comms/uartlirc > +SMODE2_LIB_DEPENDS= libvga.so:graphics/svgalib > > +UARTLIRC_RUN_DEPENDS= uartlirc>=0.3:comms/uartlirc > + > post-patch: > @${REINPLACE_CMD} \ > -e 's/`$${LIBUSB_CONFIG} --libs`/-lusb/' \ > -e 's/`$${LIBUSB_CONFIG} --cflags`//' \ > ${WRKSRC}/configure.ac > > +post-install: > + ${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample > + @${MKDIR} ${STAGEDIR}/var/run/lirc > + > +post-install-MINIMAL-on: > + # bacause --with-driver is specified, it installs remotes/dvico/lircd.conf.fusionHDTV to etc/lircd/ > + # remove to not break the plist, but remote configs handling should probably be fixed... > + @${RM} -r ${STAGEDIR}${PREFIX}/etc/lirc > + > post-install-DOCS-on: > - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/) > - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}/) > - @(cd ${WRKSRC}/doc && ${INSTALL_DATA} irxevent.keys lirc.css lirc.hwdb ${STAGEDIR}${DOCSDIR}/) > + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "html images irxevent.keys lirc.css lirc.hwdb" ${STAGEDIR}${DOCSDIR}/) > + > post-install-EXAMPLES-on: > @(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/) > -post-install: > - @${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample > - @${MKDIR} ${STAGEDIR}/var/run/lirc > > .include <bsd.port.mk> > _______________________________________________ > svn-ports-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-head > To unsubscribe, send any mail to "svn-ports-head-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?026a209a-e474-35f5-0b08-e1f4853d758a>