- Update to 0.5.7

PR:		190393
Submitted by:	maintainer

4 files changed, 36 insertions, 40 deletions

diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 4dda9a58c045..9d7d9fffdd85 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -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="${LCDPROC_DRIVERS}" \
 
 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 <bsd.port.options.mk>
 
 .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 --disable-libftdi --disable-libhid
 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 <bsd.port.mk>
diff --git a/sysutils/lcdproc/distinfo b/sysutils/lcdproc/distinfo
index a1b028806ea3..94b736bc128a 100644
--- a/sysutils/lcdproc/distinfo
+++ b/sysutils/lcdproc/distinfo
@@ -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 --git a/sysutils/lcdproc/files/patch-configure.in b/sysutils/lcdproc/files/patch-configure.ac
index 0a9afec63a71..f8fc91b2de15 100644
--- a/sysutils/lcdproc/files/patch-configure.in
+++ b/sysutils/lcdproc/files/patch-configure.ac
@@ -1,18 +1,18 @@
---- ./configure.in.orig	2012-11-04 11:41:16.000000000 +0100
-+++ ./configure.in	2012-11-07 00:13:35.000000000 +0100
+--- ./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.6], [lcdproc@lists.omnipotent.net])
+ 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)
  
-@@ -249,26 +250,62 @@
+@@ -255,26 +256,62 @@
  
  dnl ######################################################################
  dnl libusb support
-+dnl Stolen from the gnupg project and modified for LCDproc's need.
++dnl Stolen from the gnupg project and modified for LCDproc''s need.
 +dnl
 +dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
  dnl ######################################################################
diff --git a/sysutils/lcdproc/pkg-plist b/sysutils/lcdproc/pkg-plist
index 047dbd50634e..087990b0f3d2 100644
--- a/sysutils/lcdproc/pkg-plist
+++ b/sysutils/lcdproc/pkg-plist
@@ -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