From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 06:27:31 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD72A14D; Wed, 4 Jun 2014 06:27:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE11E28EF; Wed, 4 Jun 2014 06:27:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s546RVYD009568; Wed, 4 Jun 2014 06:27:31 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s546RUbH009562; Wed, 4 Jun 2014 06:27:30 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406040627.s546RUbH009562@svn.freebsd.org> From: Martin Wilke Date: Wed, 4 Jun 2014 06:27:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356436 - in head/sysutils/lcdproc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 06:27:31 -0000 Author: miwi Date: Wed Jun 4 06:27:30 2014 New Revision: 356436 URL: http://svnweb.freebsd.org/changeset/ports/356436 QAT: https://qat.redports.org/buildarchive/r356436/ Log: - Update to 0.5.7 PR: 190393 Submitted by: maintainer Added: head/sysutils/lcdproc/files/patch-configure.ac (contents, props changed) Deleted: head/sysutils/lcdproc/files/patch-configure.in Modified: head/sysutils/lcdproc/Makefile head/sysutils/lcdproc/distinfo head/sysutils/lcdproc/pkg-plist Modified: head/sysutils/lcdproc/Makefile ============================================================================== --- head/sysutils/lcdproc/Makefile Wed Jun 4 06:26:01 2014 (r356435) +++ head/sysutils/lcdproc/Makefile Wed Jun 4 06:27:30 2014 (r356436) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lcdproc -PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTVERSION= 0.5.7 CATEGORIES= sysutils MASTER_SITES= SF @@ -27,18 +26,30 @@ CONFIGURE_ARGS= --enable-drivers="${LCDP SUB_FILES= pkg-message -MAN1= lcdexec.1 lcdproc.1 -MAN5= lcdproc-config.5 -MAN8= LCDd.8 - -OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP +# Options +OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP X11 USB_DESC= USB support FTDI_DESC= Build drivers using libftdi (requires USB) HID_DESC= Build drivers using libhid (requires USB) SERDISP_DESC= Build drivers using serdisplib + OPTIONS_DEFAULT=USB FREETYPE NO_OPTIONS_SORT=yes +FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 +FREETYPE_CONFIGURE_ENABLE= freetype + +PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png +PNG_CONFIGURE_ENABLE= libpng + +SERDISP_LIB_DEPENDS= libserdisp.so:${PORTSDIR}/devel/serdisplib +SERDISP_CFLAGS= -I${LOCALBASE}/include +SERDISP_LDFLAGS= -L${LOCALBASE}/lib +SERDISP_CPPFLAGS= -I${LOCALBASE}/include + +X11_USE= xorg=x11 +X11_CONFIGURE_ENABLE= libX11 + # Empty args to aclocal required! ACLOCAL_ARGS= @@ -62,6 +73,7 @@ LCDPROC_DRIVERS=bayrad \ MtxOrb \ NoritakeVFD \ pyramid \ + rawserial \ SureElec \ sdeclcd \ sed1330 \ @@ -75,7 +87,6 @@ LCDPROC_DRIVERS=bayrad \ tyan \ vlsys_m428 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MUSB} @@ -86,7 +97,7 @@ LCDPROC_DRIVERS+=IOWarrior \ shuttleVFD . if ${PORT_OPTIONS:MFTDI} -LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi +LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi PLIST_SUB+= FTDI="" LCDPROC_DRIVERS+=i2500vfd \ lis \ @@ -97,7 +108,7 @@ PLIST_SUB+= FTDI="@comment " . endif . if ${PORT_OPTIONS:MHID} -LIB_DEPENDS+= hid:${PORTSDIR}/devel/libhid +LIB_DEPENDS+= libhid.so:${PORTSDIR}/devel/libhid PLIST_SUB+= HID="" LCDPROC_DRIVERS+=mdm166a . else @@ -110,32 +121,12 @@ CONFIGURE_ARGS+= --without-libusb --disa PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment " .endif -.if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 -.else -CONFIGURE_ARGS+= --disable-freetype -.endif - -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -.else -CONFIGURE_ARGS+= --disable-libpng -.endif - -.if ${PORT_OPTIONS:MSERDISP} -LIB_DEPENDS+= serdisp:${PORTSDIR}/devel/serdisplib -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -.endif - post-patch: @${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf post-install: - ${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${PREFIX}/etc/LCDd.conf.sample - ${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${PREFIX}/etc/lcdproc.conf.sample - ${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${STAGEDIR}${PREFIX}/etc/LCDd.conf.sample + ${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${STAGEDIR}${PREFIX}/etc/lcdproc.conf.sample + ${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${STAGEDIR}${PREFIX}/etc/lcdexec.conf.sample .include Modified: head/sysutils/lcdproc/distinfo ============================================================================== --- head/sysutils/lcdproc/distinfo Wed Jun 4 06:26:01 2014 (r356435) +++ head/sysutils/lcdproc/distinfo Wed Jun 4 06:27:30 2014 (r356436) @@ -1,2 +1,2 @@ -SHA256 (lcdproc-0.5.6.tar.gz) = bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a -SIZE (lcdproc-0.5.6.tar.gz) = 998996 +SHA256 (lcdproc-0.5.7.tar.gz) = 843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804 +SIZE (lcdproc-0.5.7.tar.gz) = 1047394 Added: head/sysutils/lcdproc/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/lcdproc/files/patch-configure.ac Wed Jun 4 06:27:30 2014 (r356436) @@ -0,0 +1,89 @@ +--- ./configure.ac.orig 2014-05-17 12:08:57.000000000 +0200 ++++ ./configure.ac 2014-05-17 12:12:55.000000000 +0200 +@@ -4,6 +4,7 @@ + AC_INIT([lcdproc], [0.5.7], [lcdproc@lists.omnipotent.net]) + AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) + AM_INIT_AUTOMAKE ++PKG_PROG_PKG_CONFIG() + + AC_CONFIG_HEADERS(config.h) + +@@ -255,26 +256,62 @@ + + dnl ###################################################################### + dnl libusb support ++dnl Stolen from the gnupg project and modified for LCDproc''s need. ++dnl ++dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc. + dnl ###################################################################### + AC_MSG_CHECKING([if libusb support has been enabled]); +-AC_ARG_ENABLE(libusb, +- [AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])], +- [ if test "$enableval" != "no"; then +- enable_libusb=yes +- fi ], +- [ enable_libusb=yes ] +-) +-AC_MSG_RESULT($enable_libusb) ++AC_ARG_WITH(libusb, ++ AC_HELP_STRING([--with-libusb=DIR], ++ [look for the libusb library in DIR]), ++ [_do_libusb=$withval],[_do_libusb=yes]) ++AC_MSG_RESULT($_do_libusb) + +-if test "$enable_libusb" = "yes"; then +- ifdef([PKG_CHECK_MODULES], +- [PKG_CHECK_MODULES(LIBUSB, libusb, +- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])], +- [ enable_libusb=no ])], +- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])]) ++if test "$_do_libusb" != "no" ; then ++ if test -d "$withval" ; then ++ CPPFLAGS="${CPPFLAGS} -I$withval/include" ++ LDFLAGS="${LDFLAGS} -L$withval/lib" ++ AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"]) ++ else ++ AC_PATH_PROG([_usb_config],[libusb-config]) ++ fi ++ ++ _libusb_save_libs=$LIBS ++ _libusb_save_cflags=$CFLAGS ++ ++ if test x$_usb_config != "x" ; then ++ _libusb_try_libs=`$_usb_config --libs` ++ _libusb_try_cflags=`$_usb_config --cflags` ++ else ++ _libusb_try_libs="-lusb" ++ _libusb_try_cflags="" ++ fi ++ ++ LIBS="$LIBS $_libusb_try_libs" ++ CFLAGS="$CFLAGS $_libusb_try_cflags" ++ ++ AC_MSG_CHECKING([whether libusb is present and sane]) ++ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[ ++ usb_interrupt_write(NULL,0,NULL,0,0); ++ ])],enable_libusb=yes,enable_libusb=no) ++ ++ AC_MSG_RESULT([$enable_libusb]) ++ ++ if test "$enable_libusb" = "yes" ; then ++ AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb]) ++ AC_SUBST(LIBUSB_CFLAGS, $_libusb_try_cflags) ++ AC_SUBST(LIBUSB_LIBS, $_libusb_try_libs) ++ fi ++ ++ LIBS=$_libusb_save_libs ++ CFLAGS=$_libusb_save_cflags ++ ++ unset _libusb_save_libs ++ unset _libusb_save_cflags ++ unset _libusb_try_libs ++ unset _libusb_try_cflags + fi +-AC_SUBST(LIBUSB_LIBS) +-AC_SUBST(LIBUSB_CFLAGS) + + dnl ###################################################################### + dnl libusb-1.0 support Modified: head/sysutils/lcdproc/pkg-plist ============================================================================== --- head/sysutils/lcdproc/pkg-plist Wed Jun 4 06:26:01 2014 (r356435) +++ head/sysutils/lcdproc/pkg-plist Wed Jun 4 06:27:30 2014 (r356436) @@ -28,6 +28,7 @@ lib/lcdproc/ms6931.so lib/lcdproc/mtc_s16209x.so %%USB%%lib/lcdproc/picolcd.so lib/lcdproc/pyramid.so +lib/lcdproc/rawserial.so lib/lcdproc/SureElec.so lib/lcdproc/sdeclcd.so lib/lcdproc/sed1330.so @@ -42,5 +43,9 @@ lib/lcdproc/text.so lib/lcdproc/tyan.so %%FTDI%%lib/lcdproc/ula200.so lib/lcdproc/vlsys_m428.so +man/man1/lcdexec.1.gz +man/man1/lcdproc.1.gz +man/man5/lcdproc-config.5.gz +man/man8/LCDd.8.gz sbin/LCDd @dirrm lib/lcdproc