Attachment #113361 for bug #154895

View | Details | Raw Unified | Return to bug 154895
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/sysutils/lcdproc/Makefile (-7 / +36 lines)
6	#	6	#
7		7
8	PORTNAME= lcdproc	8	PORTNAME= lcdproc
9	PORTVERSION= 0.5.3	9	PORTVERSION= 0.5.4
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 16-21 Link Here
16		15
17	ONLY_FOR_ARCHS= i386 amd64	16	ONLY_FOR_ARCHS= i386 amd64
18		17
		18	LICENSE= GPLv2
		19	LICENSE_FILE= ${WRKSRC}/COPYING
		20
19	USE_AUTOTOOLS= autoconf automake aclocal	21	USE_AUTOTOOLS= autoconf automake aclocal
20	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
21	USE_GNOME= pkgconfig	23	USE_GNOME= pkgconfig
Lines 31-38 Link Here
31	MAN5= lcdproc-config.5	33	MAN5= lcdproc-config.5
32	MAN8= LCDd.8	34	MAN8= LCDd.8
33		35
34	OPTIONS= USB "Enable USB support" off	36	OPTIONS= USB "Enable USB support" off \
		37	LIBFTDI "Enable libftdi support (requires USB)" off \
		38	LIBHID "Enable libhid support (requires USB)" off
35		39
		40	# Empty args to aclocal required!
36	ACLOCAL_ARGS=	41	ACLOCAL_ARGS=
37		42
38	LCDPROC_DRIVERS=bayrad \	43	LCDPROC_DRIVERS=bayrad \
Lines 55-60 Link Here
55	MtxOrb \	60	MtxOrb \
56	NoritakeVFD \	61	NoritakeVFD \
57	pyramid \	62	pyramid \
		63	SureElec \
58	sed1330 \	64	sed1330 \
59	sed1520 \	65	sed1520 \
60	serialPOS \	66	serialPOS \
Lines 65-71 Link Here
65	text \	71	text \
66	tyan	72	tyan
67		73
68	.include <bsd.port.pre.mk>	74	.include <bsd.port.options.mk>
69		75
70	.if defined(WITH_USB)	76	.if defined(WITH_USB)
71	. if ${OSVERSION} < 800069	77	. if ${OSVERSION} < 800069
Lines 78-86 Link Here
78	LCDPROC_DRIVERS+=IOWarrior \	84	LCDPROC_DRIVERS+=IOWarrior \
79	picolcd \	85	picolcd \
80	shuttleVFD	86	shuttleVFD
		87
		88	. if defined(WITH_LIBFTDI)
		89	LIB_DEPENDS+= ftdi.18:${PORTSDIR}/devel/libftdi
		90	CONFIGURE_ARGS+= --enable-libftdi
		91	PLIST_SUB+= FTDI=""
		92	LCDPROC_DRIVERS+=i2500vfd \
		93	lis \
		94	ula200
		95	. else
		96	CONFIGURE_ARGS+= --disable-libftdi
		97	PLIST_SUB+= FTDI="@comment "
		98	. endif
		99
		100	. if defined(WITH_LIBHID)
		101	LIB_DEPENDS+= hid:${PORTSDIR}/devel/libhid
		102	CONFIGURE_ARGS+= --enable-libhid
		103	PLIST_SUB+= HID=""
		104	LCDPROC_DRIVERS+=mdm166a
		105	. else
		106	CONFIGURE_ARGS+= --disable-libhid
		107	PLIST_SUB+= HID="@comment "
		108	. endif
		109
81	.else	110	.else
82	CONFIGURE_ARGS+= --without-libusb	111	CONFIGURE_ARGS+= --without-libusb --disable-libftdi --disable-libhid
83	PLIST_SUB+= USB="@comment "	112	PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment "
84	.endif	113	.endif
85		114
86	post-patch:	115	post-patch:
Lines 92-95 Link Here
92	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample	121	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample
93	@${CAT} ${PKGMESSAGE}	122	@${CAT} ${PKGMESSAGE}
94		123
95	.include <bsd.port.post.mk>	124	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/sysutils/lcdproc/distinfo (-3 / +2 lines)
1	MD5 (lcdproc-0.5.3.tar.gz) = fe9a7c9d8f2c5e76250ce2ea8f644921	1	SHA256 (lcdproc-0.5.4.tar.gz) = 27826a50fef0cb4c41166b13c9a5c435b888595fd575731029bebe29c805abaf
2	SHA256 (lcdproc-0.5.3.tar.gz) = cc4003392f348bc35014c6ed59f2e855ba1600d79ada456cbb2c23bc86a5117f	2	SIZE (lcdproc-0.5.4.tar.gz) = 944628
3	SIZE (lcdproc-0.5.3.tar.gz) = 890116

Lines 1-9 Link Here

(-)/usr/ports/sysutils/lcdproc/files/patch-clients__Makefile.am (-3 / +3 lines)
1	--- ./clients/Makefile.am.orig 2009-06-22 00:39:35.000000000 +0200	1	--- ./clients/Makefile.am.orig 2006-05-01 13:23:44.000000000 +0200
2	+++ ./clients/Makefile.am 2009-06-22 00:39:45.000000000 +0200	2	+++ ./clients/Makefile.am 2011-01-01 16:31:56.000000000 +0100
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	## Process this file with automake to produce Makefile.in	4	## Process this file with automake to produce Makefile.in
5		5
6	-SUBDIRS = examples lcdexec lcdproc lcdvc metar	6	-SUBDIRS = examples lcdexec lcdproc lcdvc metar
7	+SUBDIRS = examples lcdexec lcdproc metar	7	+SUBDIRS = lcdexec lcdproc
8		8
9	## EOF	9	## EOF




--- 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

-	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_ARG_WITH(libusb,
+	AC_HELP_STRING([--with-libusb=DIR],
+		[look for the libusb library in DIR]),

+	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
+




%%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:

Copy and edit them as needed.

If you are currently using one of them, please contact the
port's maintainer.
==============================================================

Lines 1-11 Link Here

(-)/usr/ports/sysutils/lcdproc/pkg-descr (-9 / +4 lines)
1	[from README]	1	LCDproc controls various LCD and VFD devices in a standardized way, and
2	LCDproc is a client/server suite including drivers for all kinds	2	ships with a client to display various system statistics. like CPU load,
3	of nifty LCD devices. The server works with different display sizes	3	system load, memory usage, uptime, and a lot more.Client/server model
4	and supports several serial devices: Matrix Orbital, Crystal Fontz,	4	allows multiple clients to use one display.
5	Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI and PIC-an-LCD;
6	and some devices connected to the parallel port: HD44780, STV5730,
7	T6963, SED1520 and SED1330. Various clients are available that
8	display things like CPU load, system load, memory usage, uptime,
9	and a lot more.
10		5
11	WWW: http://www.lcdproc.org/	6	WWW: http://www.lcdproc.org/




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

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

lib/lcdproc/t6963.so
lib/lcdproc/text.so
lib/lcdproc/tyan.so
%%FTDI%%lib/lcdproc/ula200.so
sbin/LCDd
@dirrm lib/lcdproc

Return to bug 154895

Lines 1-11 Link Here

(-)/usr/ports/sysutils/lcdproc/files/patch-configure.in (-17 / +19 lines)
1	Index: configure.in	1	--- configure.in.orig 2011-02-19 16:17:22.000000000 +0100
2	===================================================================	2	+++ configure.in 2011-02-19 21:29:50.000000000 +0100
3	RCS file: /cvsroot/lcdproc/lcdproc/configure.in,v	3	@@ -4,6 +4,7 @@
4	retrieving revision 1.79	4	AC_INIT(lcdproc, 0.5.4, lcdproc@lists.omnipotent.net)
5	diff -u -r1.79 configure.in	5	AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
6	--- configure.in 6 Jun 2009 16:01:38 -0000 1.79	6	AM_INIT_AUTOMAKE(1.7)
7	+++ configure.in 20 Jul 2009 06:38:04 -0000	7	+PKG_PROG_PKG_CONFIG()
8	@@ -230,26 +230,63 @@	8
		9	AC_CONFIG_HEADERS(config.h)
		10
		11	@@ -248,26 +249,63 @@
9		12
10	dnl ######################################################################	13	dnl ######################################################################
11	dnl libusb support	14	dnl libusb support
Lines 21-34 Link Here
21	- fi ],	24	- fi ],
22	- [ enable_libusb=yes ]	25	- [ enable_libusb=yes ]
23	-)	26	-)
24	-AC_MSG_RESULT($enable_libusb)	27	-AC_MSG_RESULT($enable_libusb)
25	-
26	-if test "$enable_libusb" = "yes"; then
27	- ifdef([PKG_CHECK_MODULES],
28	- [PKG_CHECK_MODULES(LIBUSB, libusb,
29	- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])],
30	- [ enable_libusb=no ])],
31	- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])])
32	+AC_ARG_WITH(libusb,	28	+AC_ARG_WITH(libusb,
33	+ AC_HELP_STRING([--with-libusb=DIR],	29	+ AC_HELP_STRING([--with-libusb=DIR],
34	+ [look for the libusb library in DIR]),	30	+ [look for the libusb library in DIR]),
Lines 43-49 Link Here
43	+ else	39	+ else
44	+ AC_PATH_PROG([_usb_config],[libusb-config])	40	+ AC_PATH_PROG([_usb_config],[libusb-config])
45	+ fi	41	+ fi
46	+	42
		43	-if test "$enable_libusb" = "yes"; then
		44	- ifdef([PKG_CHECK_MODULES],
		45	- [PKG_CHECK_MODULES(LIBUSB, libusb,
		46	- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])],
		47	- [ enable_libusb=no ])],
		48	- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])])
47	+ _libusb_save_libs=$LIBS	49	+ _libusb_save_libs=$LIBS
48	+ _libusb_save_cflags=$CFLAGS	50	+ _libusb_save_cflags=$CFLAGS
49	+	51	+

Lines 3-14 Link Here

(-)/usr/ports/sysutils/lcdproc/files/pkg-message.in (-7 / +1 lines)
3	%%PREFIX%%/etc/LCDd.conf.sample	3	%%PREFIX%%/etc/LCDd.conf.sample
4	%%PREFIX%%/etc/lcdproc.conf.sample	4	%%PREFIX%%/etc/lcdproc.conf.sample
5	%%PREFIX%%/etc/lcdexec.conf.sample	5	%%PREFIX%%/etc/lcdexec.conf.sample
6	Copy and edit them as needed.
7
8	Some lcdproc drivers are not built by default anymore:
9		6
10	g15, glcdlib, imon, irman, lirc, svga, xosd, ula200	7	Copy and edit them as needed.
11
12	If you are currently using one of them, please contact the
13	port's maintainer.
14	==============================================================	8	==============================================================

Lines 1-11 Link Here

(-)/usr/ports/sysutils/lcdproc/pkg-plist (-6 / +5 lines)
1	bin/fortune.pl
2	bin/iosock.pl
3	bin/lcdexec	1	bin/lcdexec
4	bin/lcdident.pl
5	bin/lcdmetar.pl
6	bin/lcdproc	2	bin/lcdproc
7	bin/tail.pl
8	bin/x11amp.pl
9	etc/LCDd.conf.sample	3	etc/LCDd.conf.sample
10	etc/lcdexec.conf.sample	4	etc/lcdexec.conf.sample
11	etc/lcdproc.conf.sample	5	etc/lcdproc.conf.sample
Lines 23-36 Link Here
23	lib/lcdproc/curses.so	17	lib/lcdproc/curses.so
24	lib/lcdproc/glk.so	18	lib/lcdproc/glk.so
25	lib/lcdproc/hd44780.so	19	lib/lcdproc/hd44780.so
		20	%%FTDI%%lib/lcdproc/i2500vfd.so
26	lib/lcdproc/icp_a106.so	21	lib/lcdproc/icp_a106.so
27	lib/lcdproc/lb216.so	22	lib/lcdproc/lb216.so
28	lib/lcdproc/lcdm001.so	23	lib/lcdproc/lcdm001.so
		24	%%FTDI%%lib/lcdproc/lis.so
29	lib/lcdproc/lcterm.so	25	lib/lcdproc/lcterm.so
		26	%%HID%%lib/lcdproc/mdm166a.so
30	lib/lcdproc/ms6931.so	27	lib/lcdproc/ms6931.so
31	lib/lcdproc/mtc_s16209x.so	28	lib/lcdproc/mtc_s16209x.so
32	%%USB%%lib/lcdproc/picolcd.so	29	%%USB%%lib/lcdproc/picolcd.so
33	lib/lcdproc/pyramid.so	30	lib/lcdproc/pyramid.so
		31	lib/lcdproc/SureElec.so
34	lib/lcdproc/sed1330.so	32	lib/lcdproc/sed1330.so
35	lib/lcdproc/sed1520.so	33	lib/lcdproc/sed1520.so
36	lib/lcdproc/serialPOS.so	34	lib/lcdproc/serialPOS.so
Lines 41-45 Link Here
41	lib/lcdproc/t6963.so	39	lib/lcdproc/t6963.so
42	lib/lcdproc/text.so	40	lib/lcdproc/text.so
43	lib/lcdproc/tyan.so	41	lib/lcdproc/tyan.so
		42	%%FTDI%%lib/lcdproc/ula200.so
44	sbin/LCDd	43	sbin/LCDd
45	@dirrm lib/lcdproc	44	@dirrm lib/lcdproc