4 files changed, 65 insertions, 24 deletions

diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index a9aed8a50008..80f97962f476 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -6,28 +6,43 @@
 #
 
 PORTNAME=	lcdproc
-PORTVERSION=	0.4.5
+PORTVERSION=	0.5.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://lcdproc.omnipotent.net/download/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A client/server suite for all kinds of nifty LCD devices
+MAINTAINER=	mmdolze@users.sourceforge.net
+COMMENT=	A client/server suite for LCD devices
 
 ONLY_FOR_ARCHS=	i386
+
+USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-drivers=all
+USE_GETOPT_LONG=yes
+USE_RC_SUBR=	LCDd lcdproc
+
+CONFIGURE_ARGS=	--enable-drivers=all \
+		--disable-ldap \
+		--disable-doxygen
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
-MAN1=		lcdproc.1
+MAN1=		lcdexec.1 lcdproc.1
 MAN8=		LCDd.8
 
-pre-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/LCDd.sh.sample \
-		> ${WRKSRC}/LCDd.sh.sample
+.if defined(WITH_USB)
+LIB_DEPENDS+=		usb-0.1.8:${PORTSDIR}/devel/libusb
+CONFIGURE_ARGS+=	--enable-libusb
+PLIST_SUB+=		USB=""
+.else
+CONFIGURE_ARGS+=	--disable-libusb
+PLIST_SUB+=		USB="@comment "
+.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_SCRIPT} ${WRKSRC}/LCDd.sh.sample ${PREFIX}/etc/rc.d
+	${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${PREFIX}/etc/LCDd.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/LCDclients.conf ${PREFIX}/etc/LCDclients.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/lcdproc/distinfo b/sysutils/lcdproc/distinfo
index 1876fc298eb8..4ced8483ffa4 100644
--- a/sysutils/lcdproc/distinfo
+++ b/sysutils/lcdproc/distinfo
@@ -1,3 +1,3 @@
-MD5 (lcdproc-0.4.5.tar.gz) = c1e74364963054b26b2a77a37bd2bf36
-SHA256 (lcdproc-0.4.5.tar.gz) = a2163b474d75dc87891c6a81ce9e89f0c9ceab7cbef14b50f066bf3508eec977
-SIZE (lcdproc-0.4.5.tar.gz) = 360673
+MD5 (lcdproc-0.5.0.tar.gz) = 4b67e421c19063fa322611a849ab5b80
+SHA256 (lcdproc-0.5.0.tar.gz) = a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b
+SIZE (lcdproc-0.5.0.tar.gz) = 711118
diff --git a/sysutils/lcdproc/pkg-descr b/sysutils/lcdproc/pkg-descr
index ac24d39a2a68..ffedab374203 100644
--- a/sysutils/lcdproc/pkg-descr
+++ b/sysutils/lcdproc/pkg-descr
@@ -8,11 +8,4 @@ T6963, SED1520 and SED1330. Various clients are available that
 display things like CPU load, system load, memory usage, uptime,
 and a lot more.
 
-LCDproc also supports key or remote control input for controlling
-the clients.
-
-The client and the server use a TCP connection to communicate, so
-it is possible to have a client on a box in Sweden showing its stats
-on a LCD display in the United States.
-
-WWW: http://lcdproc.omnipotent.net/
+WWW: http://www.lcdproc.org/
diff --git a/sysutils/lcdproc/pkg-plist b/sysutils/lcdproc/pkg-plist
index b799c47ae106..4b2ee825537d 100644
--- a/sysutils/lcdproc/pkg-plist
+++ b/sysutils/lcdproc/pkg-plist
@@ -1,6 +1,39 @@
+bin/fortune.pl
+bin/iosock.pl
+bin/lcdexec
 bin/lcdheadlines
 bin/lcdmetar.pl
 bin/lcdproc
+bin/tail.pl
+bin/x11amp.pl
+etc/LCDclients.conf.sample
 etc/LCDd.conf.sample
-etc/rc.d/LCDd.sh.sample
+lib/lcdproc/CFontz.so
+lib/lcdproc/CFontz633.so
+lib/lcdproc/CFontzPacket.so
+lib/lcdproc/CwLnx.so
+%%USB%%lib/lcdproc/IOWarrior.so
+lib/lcdproc/MtxOrb.so
+lib/lcdproc/NoritakeVFD.so
+lib/lcdproc/bayrad.so
+lib/lcdproc/curses.so
+lib/lcdproc/glk.so
+lib/lcdproc/hd44780.so
+lib/lcdproc/icp_a106.so
+lib/lcdproc/imon.so
+lib/lcdproc/lb216.so
+lib/lcdproc/lcdm001.so
+lib/lcdproc/lcterm.so
+lib/lcdproc/ms6931.so
+lib/lcdproc/mtc_s16209x.so
+lib/lcdproc/pyramid.so
+lib/lcdproc/sed1330.so
+lib/lcdproc/sed1520.so
+lib/lcdproc/serialVFD.so
+lib/lcdproc/sli.so
+lib/lcdproc/stv5730.so
+lib/lcdproc/t6963.so
+lib/lcdproc/text.so
+lib/lcdproc/tyan.so
 sbin/LCDd
+@dirrm lib/lcdproc