Attachment 113361 Details for Bug 154895 – lcdproc-0.5.4.patch

[patch] lcdproc-0.5.4.patch

lcdproc-0.5.4.patch (text/plain), 8.46 KB, created by Markus Dolze on 2011-02-19 21:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Dolze

Created: 2011-02-19 21:10:07 UTC

Size: 8.46 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/Makefile /usr/ports/sysutils/lcdproc/Makefile
>--- /usr/ports/sysutils/lcdproc.orig/Makefile	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/Makefile	2011-02-19 20:58:37.000000000 +0100
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	lcdproc
>-PORTVERSION=	0.5.3
>-PORTREVISION=	1
>+PORTVERSION=	0.5.4
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>@@ -16,6 +15,9 @@
> 
> ONLY_FOR_ARCHS=	i386 amd64
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> USE_AUTOTOOLS=	autoconf automake aclocal
> GNU_CONFIGURE=	yes
> USE_GNOME=	pkgconfig
>@@ -31,8 +33,11 @@
> MAN5=		lcdproc-config.5
> MAN8=		LCDd.8
> 
>-OPTIONS=	USB "Enable USB support" off
>+OPTIONS=	USB "Enable USB support" off \
>+		LIBFTDI "Enable libftdi support (requires USB)" off \
>+		LIBHID "Enable libhid support (requires USB)" off
> 
>+# Empty args to aclocal required!
> ACLOCAL_ARGS=
> 
> LCDPROC_DRIVERS=bayrad \
>@@ -55,6 +60,7 @@
> 		MtxOrb \
> 		NoritakeVFD \
> 		pyramid \
>+		SureElec \
> 		sed1330 \
> 		sed1520 \
> 		serialPOS \
>@@ -65,7 +71,7 @@
> 		text \
> 		tyan
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if defined(WITH_USB)
> . if ${OSVERSION} < 800069
>@@ -78,9 +84,32 @@
> LCDPROC_DRIVERS+=IOWarrior \
> 		picolcd \
> 		shuttleVFD
>+
>+. if defined(WITH_LIBFTDI)
>+LIB_DEPENDS+=		ftdi.18:${PORTSDIR}/devel/libftdi
>+CONFIGURE_ARGS+=	--enable-libftdi
>+PLIST_SUB+=		FTDI=""
>+LCDPROC_DRIVERS+=i2500vfd \
>+		lis \
>+		ula200
>+. else
>+CONFIGURE_ARGS+=	--disable-libftdi
>+PLIST_SUB+=		FTDI="@comment "
>+. endif
>+
>+. if defined(WITH_LIBHID)
>+LIB_DEPENDS+=		hid:${PORTSDIR}/devel/libhid
>+CONFIGURE_ARGS+=	--enable-libhid
>+PLIST_SUB+=		HID=""
>+LCDPROC_DRIVERS+=mdm166a
>+. else
>+CONFIGURE_ARGS+=	--disable-libhid
>+PLIST_SUB+=		HID="@comment "
>+. endif
>+
> .else
>-CONFIGURE_ARGS+=	--without-libusb
>-PLIST_SUB+=		USB="@comment "
>+CONFIGURE_ARGS+=	--without-libusb --disable-libftdi --disable-libhid
>+PLIST_SUB+=		USB="@comment " FTDI="@comment " HID="@comment "
> .endif
> 
> post-patch:
>@@ -92,4 +121,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/distinfo /usr/ports/sysutils/lcdproc/distinfo
>--- /usr/ports/sysutils/lcdproc.orig/distinfo	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/distinfo	2011-02-19 20:48:40.000000000 +0100
>@@ -1,3 +1,2 @@
>-MD5 (lcdproc-0.5.3.tar.gz) = fe9a7c9d8f2c5e76250ce2ea8f644921
>-SHA256 (lcdproc-0.5.3.tar.gz) = cc4003392f348bc35014c6ed59f2e855ba1600d79ada456cbb2c23bc86a5117f
>-SIZE (lcdproc-0.5.3.tar.gz) = 890116
>+SHA256 (lcdproc-0.5.4.tar.gz) = 27826a50fef0cb4c41166b13c9a5c435b888595fd575731029bebe29c805abaf
>+SIZE (lcdproc-0.5.4.tar.gz) = 944628
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/files/patch-clients__Makefile.am /usr/ports/sysutils/lcdproc/files/patch-clients__Makefile.am
>--- /usr/ports/sysutils/lcdproc.orig/files/patch-clients__Makefile.am	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/files/patch-clients__Makefile.am	2011-01-01 17:46:51.000000000 +0100
>@@ -1,9 +1,9 @@
>---- ./clients/Makefile.am.orig	2009-06-22 00:39:35.000000000 +0200
>-+++ ./clients/Makefile.am	2009-06-22 00:39:45.000000000 +0200
>+--- ./clients/Makefile.am.orig	2006-05-01 13:23:44.000000000 +0200
>++++ ./clients/Makefile.am	2011-01-01 16:31:56.000000000 +0100
> @@ -1,5 +1,5 @@
>  ## Process this file with automake to produce Makefile.in
>  
> -SUBDIRS = examples lcdexec lcdproc lcdvc metar
>-+SUBDIRS = examples lcdexec lcdproc metar
>++SUBDIRS = lcdexec lcdproc
>  
>  ## EOF
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/files/patch-configure.in /usr/ports/sysutils/lcdproc/files/patch-configure.in
>--- /usr/ports/sysutils/lcdproc.orig/files/patch-configure.in	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/files/patch-configure.in	2011-02-19 21:30:43.000000000 +0100
>@@ -1,11 +1,14 @@
>-Index: configure.in
>-===================================================================
>-RCS file: /cvsroot/lcdproc/lcdproc/configure.in,v
>-retrieving revision 1.79
>-diff -u -r1.79 configure.in
>---- configure.in	6 Jun 2009 16:01:38 -0000	1.79
>-+++ configure.in	20 Jul 2009 06:38:04 -0000
>-@@ -230,26 +230,63 @@
>+--- configure.in.orig	2011-02-19 16:17:22.000000000 +0100
>++++ configure.in	2011-02-19 21:29:50.000000000 +0100
>+@@ -4,6 +4,7 @@
>+ AC_INIT(lcdproc, 0.5.4, lcdproc@lists.omnipotent.net)
>+ AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
>+ AM_INIT_AUTOMAKE(1.7)
>++PKG_PROG_PKG_CONFIG()
>+ 
>+ AC_CONFIG_HEADERS(config.h)
>+ 
>+@@ -248,26 +249,63 @@
>  
>  dnl ######################################################################
>  dnl libusb support
>@@ -21,14 +24,7 @@
> -	fi ],
> -	[ enable_libusb=yes ]
> -)
>--AC_MSG_RESULT($enable_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])])	
>+-AC_MSG_RESULT($enable_libusb)
> +AC_ARG_WITH(libusb,
> +	AC_HELP_STRING([--with-libusb=DIR],
> +		[look for the libusb library in DIR]),
>@@ -43,7 +39,13 @@
> +	else
> +		AC_PATH_PROG([_usb_config],[libusb-config])
> +	fi
>-+
>+ 
>+-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])])
> +	_libusb_save_libs=$LIBS
> +	_libusb_save_cflags=$CFLAGS
> +
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/files/pkg-message.in /usr/ports/sysutils/lcdproc/files/pkg-message.in
>--- /usr/ports/sysutils/lcdproc.orig/files/pkg-message.in	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/files/pkg-message.in	2011-01-01 16:53:19.000000000 +0100
>@@ -3,12 +3,6 @@
> %%PREFIX%%/etc/LCDd.conf.sample
> %%PREFIX%%/etc/lcdproc.conf.sample
> %%PREFIX%%/etc/lcdexec.conf.sample
>-Copy and edit them as needed.
>-
>-Some lcdproc drivers are not built by default anymore:
> 
>-g15, glcdlib, imon, irman, lirc, svga, xosd, ula200
>-
>-If you are currently using one of them, please contact the
>-port's maintainer.
>+Copy and edit them as needed.
> ==============================================================
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/pkg-descr /usr/ports/sysutils/lcdproc/pkg-descr
>--- /usr/ports/sysutils/lcdproc.orig/pkg-descr	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/pkg-descr	2011-01-01 16:28:58.000000000 +0100
>@@ -1,11 +1,6 @@
>-[from README]
>-LCDproc is a client/server suite including drivers for all kinds
>-of nifty LCD devices. The server works with different display sizes
>-and supports several serial devices: Matrix Orbital, Crystal Fontz,
>-Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI and PIC-an-LCD;
>-and some devices connected to the parallel port: HD44780, STV5730,
>-T6963, SED1520 and SED1330. Various clients are available that
>-display things like CPU load, system load, memory usage, uptime,
>-and a lot more.
>+LCDproc controls various LCD and VFD devices in a standardized way, and
>+ships with a client to display various system statistics. like CPU load,
>+system load, memory usage, uptime, and a lot more.Client/server model
>+allows multiple clients to use one display. 
> 
> WWW: http://www.lcdproc.org/
>diff -ruN --exclude=CVS /usr/ports/sysutils/lcdproc.orig/pkg-plist /usr/ports/sysutils/lcdproc/pkg-plist
>--- /usr/ports/sysutils/lcdproc.orig/pkg-plist	2011-01-01 15:48:21.000000000 +0100
>+++ /usr/ports/sysutils/lcdproc/pkg-plist	2011-01-01 17:47:25.000000000 +0100
>@@ -1,11 +1,5 @@
>-bin/fortune.pl
>-bin/iosock.pl
> bin/lcdexec
>-bin/lcdident.pl
>-bin/lcdmetar.pl
> bin/lcdproc
>-bin/tail.pl
>-bin/x11amp.pl
> etc/LCDd.conf.sample
> etc/lcdexec.conf.sample
> etc/lcdproc.conf.sample
>@@ -23,14 +17,18 @@
> lib/lcdproc/curses.so
> lib/lcdproc/glk.so
> lib/lcdproc/hd44780.so
>+%%FTDI%%lib/lcdproc/i2500vfd.so
> lib/lcdproc/icp_a106.so
> lib/lcdproc/lb216.so
> lib/lcdproc/lcdm001.so
>+%%FTDI%%lib/lcdproc/lis.so
> lib/lcdproc/lcterm.so
>+%%HID%%lib/lcdproc/mdm166a.so
> lib/lcdproc/ms6931.so
> lib/lcdproc/mtc_s16209x.so
> %%USB%%lib/lcdproc/picolcd.so
> lib/lcdproc/pyramid.so
>+lib/lcdproc/SureElec.so
> lib/lcdproc/sed1330.so
> lib/lcdproc/sed1520.so
> lib/lcdproc/serialPOS.so
>@@ -41,5 +39,6 @@
> lib/lcdproc/t6963.so
> lib/lcdproc/text.so
> lib/lcdproc/tyan.so
>+%%FTDI%%lib/lcdproc/ula200.so
> sbin/LCDd
> @dirrm lib/lcdproc

Actions: View | Diff

Attachments on bug 154895: 113361