From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 29 22:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C859913 for ; Thu, 29 May 2014 22:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 6A5462EF8 for ; Thu, 29 May 2014 22:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TMU0Nl087560 for ; Thu, 29 May 2014 22:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4TMU0ar087559; Thu, 29 May 2014 22:30:00 GMT (envelope-from gnats) Resent-Date: Thu, 29 May 2014 22:30:00 GMT Resent-Message-Id: <201405292230.s4TMU0ar087559@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Markus Dolze" 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 245BA854 for ; Thu, 29 May 2014 22:22:16 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA256 (256/256 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A5B952EA1 for ; Thu, 29 May 2014 22:22:14 +0000 (UTC) Received: from arcueid.intra.mdolze.de ([94.220.155.13]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MKpvc-1Wq8i52SZc-0004xA for ; Fri, 30 May 2014 00:22:06 +0200 Received: by arcueid.intra.mdolze.de (sSMTP sendmail emulation); Fri, 30 May 2014 00:24:08 +0200 Message-Id: <0M1msU-1Wa83g2x3q-00tgRq@mail.gmx.com> Date: Fri, 30 May 2014 00:24:08 +0200 From: "Markus Dolze" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/190393: [MAINTAINER] sysutils/lcdproc: update to 0.5.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2014 22:30:00 -0000 >Number: 190393 >Category: ports >Synopsis: [MAINTAINER] sysutils/lcdproc: update to 0.5.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 29 22:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Markus Dolze >Release: FreeBSD 9.2-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD arcueid.intra.mdolze.de 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #0: Tue May 13 08:14:56 UTC 2014 >Description: - Update to 0.5.7 - Support staging Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- lcdproc-0.5.7.patch begins here --- diff -ruN ../lcdproc.orig/Makefile ./Makefile --- ../lcdproc.orig/Makefile 2014-05-17 12:00:26.000000000 +0200 +++ ./Makefile 2014-05-30 00:02:24.000000000 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: head/sysutils/lcdproc/Makefile 351411 2014-04-16 18:28:47Z zeising $ PORTNAME= lcdproc -PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTVERSION= 0.5.7 CATEGORIES= sysutils MASTER_SITES= SF @@ -27,18 +26,30 @@ 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 @@ MtxOrb \ NoritakeVFD \ pyramid \ + rawserial \ SureElec \ sdeclcd \ sed1330 \ @@ -75,7 +87,6 @@ tyan \ vlsys_m428 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MUSB} @@ -86,7 +97,7 @@ 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 @@ . 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 @@ 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 diff -ruN ../lcdproc.orig/distinfo ./distinfo --- ../lcdproc.orig/distinfo 2014-05-17 12:00:26.000000000 +0200 +++ ./distinfo 2014-05-17 12:03:24.000000000 +0200 @@ -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 diff -ruN ../lcdproc.orig/files/patch-configure.ac ./files/patch-configure.ac --- ../lcdproc.orig/files/patch-configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-configure.ac 2014-05-17 12:13:29.000000000 +0200 @@ -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 diff -ruN ../lcdproc.orig/files/patch-configure.in ./files/patch-configure.in --- ../lcdproc.orig/files/patch-configure.in 2014-05-17 12:00:26.000000000 +0200 +++ ./files/patch-configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ ---- ./configure.in.orig 2012-11-04 11:41:16.000000000 +0100 -+++ ./configure.in 2012-11-07 00:13:35.000000000 +0100 -@@ -4,6 +4,7 @@ - AC_INIT([lcdproc], [0.5.6], [lcdproc@lists.omnipotent.net]) - AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) - AM_INIT_AUTOMAKE -+PKG_PROG_PKG_CONFIG() - - AC_CONFIG_HEADERS(config.h) - -@@ -249,26 +250,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 diff -ruN ../lcdproc.orig/pkg-plist ./pkg-plist --- ../lcdproc.orig/pkg-plist 2014-05-17 12:00:26.000000000 +0200 +++ ./pkg-plist 2014-05-29 22:19:16.000000000 +0200 @@ -28,6 +28,7 @@ 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/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 --- lcdproc-0.5.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: