Date: Wed, 07 Nov 2012 00:27:36 +0100 From: "Markus Dolze" <bsdfan@nurfuerspam.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bsdfan@nurfuerspam.de Subject: ports/173433: [MAINTAINER] sysutils/lcdproc: update to 0.5.6 Message-ID: <20121106232735.EC379221@hub.freebsd.org> Resent-Message-ID: <201211062330.qA6NU0KV070444@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173433
>Category: ports
>Synopsis: [MAINTAINER] sysutils/lcdproc: update to 0.5.6
>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: Tue Nov 06 23:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Markus Dolze
>Release: FreeBSD 8.3-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD 8.3-RELEASE-p3 #0: Mon Jun 11 23:52:38 UTC 2012
>Description:
- Update to 0.5.6
Removed file(s):
- files/patch-server__drivers__Makefile.am
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:
--- lcdproc-0.5.6.patch begins here ---
diff -ruN --exclude=CVS ../lcdproc.orig/Makefile ./Makefile
--- ../lcdproc.orig/Makefile 2012-08-18 12:06:52.000000000 +0200
+++ ./Makefile 2012-11-07 00:00:29.000000000 +0100
@@ -1,12 +1,8 @@
-# New ports collection makefile for: lcdproc
-# Date created: Sat Jun 1 20:03:41 EDT 2002
-# Whom: pat
#
# $FreeBSD: ports/sysutils/lcdproc/Makefile,v 1.30 2012/06/20 21:52:27 madpilot Exp $
-#
PORTNAME= lcdproc
-PORTVERSION= 0.5.5
+PORTVERSION= 0.5.6
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -20,11 +16,12 @@
USE_AUTOTOOLS= autoconf automake aclocal
GNU_CONFIGURE= yes
-USE_GNOME= pkgconfig
USE_RC_SUBR= LCDd lcdproc lcdexec
+USE_PKGCONFIG= build
CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \
--disable-dependency-tracking \
+ --disable-libusb-1-0 \
--disable-doxygen
SUB_FILES= pkg-message
@@ -33,11 +30,12 @@
MAN5= lcdproc-config.5
MAN8= LCDd.8
-OPTIONS_DEFINE= USB FTDI HID
-USB_DESC= Enable USB support
-FTDI_DESC= Enable libftdi support (requires USB)
-HID_DESC= Enable libhid support (requires USB)
-OPTIONS_DEFAULT=USB
+OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP
+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
# Empty args to aclocal required!
@@ -45,12 +43,12 @@
LCDPROC_DRIVERS=bayrad \
CFontz \
- CFontz633 \
CFontzPacket \
CwLnx \
curses \
ea65 \
EyeboxOne \
+ glcd \
glk \
hd44780 \
icp_a106 \
@@ -64,6 +62,7 @@
NoritakeVFD \
pyramid \
SureElec \
+ sdeclcd \
sed1330 \
sed1520 \
serialPOS \
@@ -72,7 +71,8 @@
stv5730 \
t6963 \
text \
- tyan
+ tyan \
+ vlsys_m428
.include <bsd.port.options.mk>
@@ -90,7 +90,6 @@
. if ${PORT_OPTIONS:MFTDI}
LIB_DEPENDS+= ftdi.19:${PORTSDIR}/devel/libftdi
-CONFIGURE_ARGS+= --enable-libftdi
PLIST_SUB+= FTDI=""
LCDPROC_DRIVERS+=i2500vfd \
lis \
@@ -102,7 +101,6 @@
. if ${PORT_OPTIONS:MHID}
LIB_DEPENDS+= hid:${PORTSDIR}/devel/libhid
-CONFIGURE_ARGS+= --enable-libhid
PLIST_SUB+= HID=""
LCDPROC_DRIVERS+=mdm166a
. else
@@ -115,6 +113,25 @@
PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment "
.endif
+.if ${PORT_OPTIONS:MFREETYPE}
+LIB_DEPENDS+= freetype:${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
diff -ruN --exclude=CVS ../lcdproc.orig/distinfo ./distinfo
--- ../lcdproc.orig/distinfo 2012-08-18 12:06:52.000000000 +0200
+++ ./distinfo 2012-11-07 00:02:17.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (lcdproc-0.5.5.tar.gz) = b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42
-SIZE (lcdproc-0.5.5.tar.gz) = 946206
+SHA256 (lcdproc-0.5.6.tar.gz) = bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a
+SIZE (lcdproc-0.5.6.tar.gz) = 998996
diff -ruN --exclude=CVS ../lcdproc.orig/files/patch-configure.in ./files/patch-configure.in
--- ../lcdproc.orig/files/patch-configure.in 2012-08-18 12:06:52.000000000 +0200
+++ ./files/patch-configure.in 2012-11-07 00:15:26.000000000 +0100
@@ -1,15 +1,15 @@
---- ./configure.in.orig 2011-11-09 20:52:28.000000000 +0100
-+++ ./configure.in 2011-11-10 23:29:33.000000000 +0100
+--- ./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.5, lcdproc@lists.omnipotent.net)
+ AC_INIT([lcdproc], [0.5.6], [lcdproc@lists.omnipotent.net])
AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
- AM_INIT_AUTOMAKE(1.7)
+ AM_INIT_AUTOMAKE
+PKG_PROG_PKG_CONFIG()
-
+
AC_CONFIG_HEADERS(config.h)
-
-@@ -249,26 +250,63 @@
-
+
+@@ -249,26 +250,62 @@
+
dnl ######################################################################
dnl libusb support
+dnl Stolen from the gnupg project and modified for LCDproc's need.
@@ -20,7 +20,7 @@
-AC_ARG_ENABLE(libusb,
- [AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
- [ if test "$enableval" != "no"; then
-- enable_libusb="yes"
+- enable_libusb=yes
- fi ],
- [ enable_libusb=yes ]
-)
@@ -30,7 +30,7 @@
+ [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,
@@ -84,7 +84,6 @@
fi
-AC_SUBST(LIBUSB_LIBS)
-AC_SUBST(LIBUSB_CFLAGS)
-+
-
+
dnl ######################################################################
- dnl libftdi support
+ dnl libusb-1.0 support
diff -ruN --exclude=CVS ../lcdproc.orig/files/patch-server__drivers__Makefile.am ./files/patch-server__drivers__Makefile.am
--- ../lcdproc.orig/files/patch-server__drivers__Makefile.am 2012-08-18 12:06:52.000000000 +0200
+++ ./files/patch-server__drivers__Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- server/drivers/Makefile.am.orig 2011-08-14 05:29:16.000000000 -0700
-+++ server/drivers/Makefile.am 2012-04-17 11:55:39.000000000 -0700
-@@ -22,3 +22,4 @@
-
--pkglib_PROGRAMS = @DRIVERS@
-+my_execbindir = $(pkglibdir)
-+my_execbin_PROGRAMS = @DRIVERS@
- EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
diff -ruN --exclude=CVS ../lcdproc.orig/pkg-plist ./pkg-plist
--- ../lcdproc.orig/pkg-plist 2012-08-18 12:06:52.000000000 +0200
+++ ./pkg-plist 2012-09-01 14:38:05.000000000 +0200
@@ -4,7 +4,6 @@
etc/lcdexec.conf.sample
etc/lcdproc.conf.sample
lib/lcdproc/CFontz.so
-lib/lcdproc/CFontz633.so
lib/lcdproc/CFontzPacket.so
lib/lcdproc/CwLnx.so
lib/lcdproc/ea65.so
@@ -16,6 +15,7 @@
lib/lcdproc/bayrad.so
lib/lcdproc/curses.so
lib/lcdproc/glk.so
+lib/lcdproc/glcd.so
lib/lcdproc/hd44780.so
%%FTDI%%lib/lcdproc/i2500vfd.so
lib/lcdproc/icp_a106.so
@@ -29,6 +29,7 @@
%%USB%%lib/lcdproc/picolcd.so
lib/lcdproc/pyramid.so
lib/lcdproc/SureElec.so
+lib/lcdproc/sdeclcd.so
lib/lcdproc/sed1330.so
lib/lcdproc/sed1520.so
lib/lcdproc/serialPOS.so
@@ -40,5 +41,6 @@
lib/lcdproc/text.so
lib/lcdproc/tyan.so
%%FTDI%%lib/lcdproc/ula200.so
+lib/lcdproc/vlsys_m428.so
sbin/LCDd
@dirrm lib/lcdproc
--- lcdproc-0.5.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121106232735.EC379221>