From owner-svn-ports-head@freebsd.org Fri Feb 2 16:45:55 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5299EE30B8; Fri, 2 Feb 2018 16:45:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75578737E0; Fri, 2 Feb 2018 16:45:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 702DB1E4DC; Fri, 2 Feb 2018 16:45:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w12Gjt29069608; Fri, 2 Feb 2018 16:45:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w12Gjtef069607; Fri, 2 Feb 2018 16:45:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201802021645.w12Gjtef069607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 2 Feb 2018 16:45:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460716 - head/comms/lirc X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/comms/lirc X-SVN-Commit-Revision: 460716 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 16:45:56 -0000 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 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