- Update to 0.5.6

- Convert to USE_PACKAGECONFIG and make it a run depends
- Remove ABI version numbers from LIB_DEPENDS
- Trim Makefile headers

PR:		ports/173433
Submitted by:	Markus Dolze <bsdfan@nurfuerspam.de> (maintainer)
Feature safe:	yes

5 files changed, 51 insertions, 42 deletions

diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index acb12cd71568..e7d38b77e26e 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	lcdproc
-# Date created:				Sat Jun  1 20:03:41 EDT 2002
-# Whom:					pat
-#
 # $FreeBSD$
-#
 
 PORTNAME=	lcdproc
-PORTVERSION=	0.5.5
+PORTVERSION=	0.5.6
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -20,11 +15,12 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 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 +29,12 @@ MAN1=		lcdexec.1 lcdproc.1
 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 +42,12 @@ ACLOCAL_ARGS=
 
 LCDPROC_DRIVERS=bayrad \
 		CFontz \
-		CFontz633 \
 		CFontzPacket \
 		CwLnx \
 		curses \
 		ea65 \
 		EyeboxOne \
+		glcd \
 		glk \
 		hd44780 \
 		icp_a106 \
@@ -64,6 +61,7 @@ LCDPROC_DRIVERS=bayrad \
 		NoritakeVFD \
 		pyramid \
 		SureElec \
+		sdeclcd \
 		sed1330 \
 		sed1520 \
 		serialPOS \
@@ -72,13 +70,14 @@ LCDPROC_DRIVERS=bayrad \
 		stv5730 \
 		t6963 \
 		text \
-		tyan
+		tyan \
+		vlsys_m428
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUSB}
 . if ${OSVERSION} < 800069
-LIB_DEPENDS+=		usb-0.1.8:${PORTSDIR}/devel/libusb
+LIB_DEPENDS+=		usb-0.1:${PORTSDIR}/devel/libusb
 CONFIGURE_ARGS+=	--with-libusb
 . else
 CONFIGURE_ARGS+=	--with-libusb=/usr
@@ -89,8 +88,7 @@ LCDPROC_DRIVERS+=IOWarrior \
 		shuttleVFD
 
 . if ${PORT_OPTIONS:MFTDI}
-LIB_DEPENDS+=		ftdi.19:${PORTSDIR}/devel/libftdi
-CONFIGURE_ARGS+=	--enable-libftdi
+LIB_DEPENDS+=		ftdi:${PORTSDIR}/devel/libftdi
 PLIST_SUB+=		FTDI=""
 LCDPROC_DRIVERS+=i2500vfd \
 		lis \
@@ -102,7 +100,6 @@ PLIST_SUB+=		FTDI="@comment "
 
 . if ${PORT_OPTIONS:MHID}
 LIB_DEPENDS+=		hid:${PORTSDIR}/devel/libhid
-CONFIGURE_ARGS+=	--enable-libhid
 PLIST_SUB+=		HID=""
 LCDPROC_DRIVERS+=mdm166a
 . else
@@ -115,6 +112,25 @@ CONFIGURE_ARGS+=	--without-libusb --disable-libftdi --disable-libhid
 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 --git a/sysutils/lcdproc/distinfo b/sysutils/lcdproc/distinfo
index b8d07849d085..a1b028806ea3 100644
--- a/sysutils/lcdproc/distinfo
+++ b/sysutils/lcdproc/distinfo
@@ -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 --git a/sysutils/lcdproc/files/patch-configure.in b/sysutils/lcdproc/files/patch-configure.in
index 5ab27e62f72e..0a9afec63a71 100644
--- a/sysutils/lcdproc/files/patch-configure.in
+++ b/sysutils/lcdproc/files/patch-configure.in
@@ -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 --git a/sysutils/lcdproc/files/patch-server__drivers__Makefile.am b/sysutils/lcdproc/files/patch-server__drivers__Makefile.am
deleted file mode 100644
index 47625747a82b..000000000000
--- a/sysutils/lcdproc/files/patch-server__drivers__Makefile.am
+++ /dev/null
@@ -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 --git a/sysutils/lcdproc/pkg-plist b/sysutils/lcdproc/pkg-plist
index cedb47b74b77..047dbd50634e 100644
--- a/sysutils/lcdproc/pkg-plist
+++ b/sysutils/lcdproc/pkg-plist
@@ -4,7 +4,6 @@ etc/LCDd.conf.sample
 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/NoritakeVFD.so
 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 @@ lib/lcdproc/mtc_s16209x.so
 %%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/t6963.so
 lib/lcdproc/text.so
 lib/lcdproc/tyan.so
 %%FTDI%%lib/lcdproc/ula200.so
+lib/lcdproc/vlsys_m428.so
 sbin/LCDd
 @dirrm lib/lcdproc