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

(-)./Makefile (-15 / +32 lines)
Lines 1-12 Link Here
1
# New ports collection makefile for:	lcdproc
2
# Date created:				Sat Jun  1 20:03:41 EDT 2002
3
# Whom:					pat
4
#
1
#
5
# $FreeBSD: ports/sysutils/lcdproc/Makefile,v 1.30 2012/06/20 21:52:27 madpilot Exp $
2
# $FreeBSD: ports/sysutils/lcdproc/Makefile,v 1.30 2012/06/20 21:52:27 madpilot Exp $
6
#
7
3
8
PORTNAME=	lcdproc
4
PORTNAME=	lcdproc
9
PORTVERSION=	0.5.5
5
PORTVERSION=	0.5.6
10
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
11
MASTER_SITES=	SF
7
MASTER_SITES=	SF
12
8
Lines 20-30 Link Here
20
16
21
USE_AUTOTOOLS=	autoconf automake aclocal
17
USE_AUTOTOOLS=	autoconf automake aclocal
22
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
23
USE_GNOME=	pkgconfig
24
USE_RC_SUBR=	LCDd lcdproc lcdexec
19
USE_RC_SUBR=	LCDd lcdproc lcdexec
20
USE_PKGCONFIG=	build
25
21
26
CONFIGURE_ARGS=	--enable-drivers="${LCDPROC_DRIVERS}" \
22
CONFIGURE_ARGS=	--enable-drivers="${LCDPROC_DRIVERS}" \
27
		--disable-dependency-tracking \
23
		--disable-dependency-tracking \
24
		--disable-libusb-1-0 \
28
		--disable-doxygen
25
		--disable-doxygen
29
26
30
SUB_FILES=	pkg-message
27
SUB_FILES=	pkg-message
Lines 33-43 Link Here
33
MAN5=		lcdproc-config.5
30
MAN5=		lcdproc-config.5
34
MAN8=		LCDd.8
31
MAN8=		LCDd.8
35
32
36
OPTIONS_DEFINE=	USB FTDI HID
33
OPTIONS_DEFINE=	USB FTDI HID FREETYPE PNG SERDISP
37
USB_DESC=	Enable USB support
34
USB_DESC=	USB support
38
FTDI_DESC=	Enable libftdi support (requires USB)
35
FTDI_DESC=	Build drivers using libftdi (requires USB)
39
HID_DESC=	Enable libhid support (requires USB)
36
HID_DESC=	Build drivers using libhid (requires USB)
40
OPTIONS_DEFAULT=USB
37
SERDISP_DESC=	Build drivers using serdisplib
38
OPTIONS_DEFAULT=USB FREETYPE
41
NO_OPTIONS_SORT=yes
39
NO_OPTIONS_SORT=yes
42
40
43
# Empty args to aclocal required!
41
# Empty args to aclocal required!
Lines 45-56 Link Here
45
43
46
LCDPROC_DRIVERS=bayrad \
44
LCDPROC_DRIVERS=bayrad \
47
		CFontz \
45
		CFontz \
48
		CFontz633 \
49
		CFontzPacket \
46
		CFontzPacket \
50
		CwLnx \
47
		CwLnx \
51
		curses \
48
		curses \
52
		ea65 \
49
		ea65 \
53
		EyeboxOne \
50
		EyeboxOne \
51
		glcd \
54
		glk \
52
		glk \
55
		hd44780 \
53
		hd44780 \
56
		icp_a106 \
54
		icp_a106 \
Lines 64-69 Link Here
64
		NoritakeVFD \
62
		NoritakeVFD \
65
		pyramid \
63
		pyramid \
66
		SureElec \
64
		SureElec \
65
		sdeclcd \
67
		sed1330 \
66
		sed1330 \
68
		sed1520 \
67
		sed1520 \
69
		serialPOS \
68
		serialPOS \
Lines 72-78 Link Here
72
		stv5730 \
71
		stv5730 \
73
		t6963 \
72
		t6963 \
74
		text \
73
		text \
75
		tyan
74
		tyan \
75
		vlsys_m428
76
76
77
.include <bsd.port.options.mk>
77
.include <bsd.port.options.mk>
78
78
Lines 90-96 Link Here
90
90
91
. if ${PORT_OPTIONS:MFTDI}
91
. if ${PORT_OPTIONS:MFTDI}
92
LIB_DEPENDS+=		ftdi.19:${PORTSDIR}/devel/libftdi
92
LIB_DEPENDS+=		ftdi.19:${PORTSDIR}/devel/libftdi
93
CONFIGURE_ARGS+=	--enable-libftdi
94
PLIST_SUB+=		FTDI=""
93
PLIST_SUB+=		FTDI=""
95
LCDPROC_DRIVERS+=i2500vfd \
94
LCDPROC_DRIVERS+=i2500vfd \
96
		lis \
95
		lis \
Lines 102-108 Link Here
102
101
103
. if ${PORT_OPTIONS:MHID}
102
. if ${PORT_OPTIONS:MHID}
104
LIB_DEPENDS+=		hid:${PORTSDIR}/devel/libhid
103
LIB_DEPENDS+=		hid:${PORTSDIR}/devel/libhid
105
CONFIGURE_ARGS+=	--enable-libhid
106
PLIST_SUB+=		HID=""
104
PLIST_SUB+=		HID=""
107
LCDPROC_DRIVERS+=mdm166a
105
LCDPROC_DRIVERS+=mdm166a
108
. else
106
. else
Lines 115-120 Link Here
115
PLIST_SUB+=		USB="@comment " FTDI="@comment " HID="@comment "
113
PLIST_SUB+=		USB="@comment " FTDI="@comment " HID="@comment "
116
.endif
114
.endif
117
115
116
.if ${PORT_OPTIONS:MFREETYPE}
117
LIB_DEPENDS+=		freetype:${PORTSDIR}/print/freetype2
118
.else
119
CONFIGURE_ARGS+=	--disable-freetype
120
.endif
121
122
.if ${PORT_OPTIONS:MPNG}
123
LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
124
.else
125
CONFIGURE_ARGS+=	--disable-libpng
126
.endif
127
128
.if ${PORT_OPTIONS:MSERDISP}
129
LIB_DEPENDS+=		serdisp:${PORTSDIR}/devel/serdisplib
130
CFLAGS+=		-I${LOCALBASE}/include
131
LDFLAGS+=		-L${LOCALBASE}/lib
132
CPPFLAGS+=		-I${LOCALBASE}/include
133
.endif
134
118
post-patch:
135
post-patch:
119
	@${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf
136
	@${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf
120
137
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (lcdproc-0.5.5.tar.gz) = b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42
1
SHA256 (lcdproc-0.5.6.tar.gz) = bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a
2
SIZE (lcdproc-0.5.5.tar.gz) = 946206
2
SIZE (lcdproc-0.5.6.tar.gz) = 998996
(-)./files/patch-configure.in (-13 / +12 lines)
Lines 1-15 Link Here
1
--- ./configure.in.orig	2011-11-09 20:52:28.000000000 +0100
1
--- ./configure.in.orig	2012-11-04 11:41:16.000000000 +0100
2
+++ ./configure.in	2011-11-10 23:29:33.000000000 +0100
2
+++ ./configure.in	2012-11-07 00:13:35.000000000 +0100
3
@@ -4,6 +4,7 @@
3
@@ -4,6 +4,7 @@
4
 AC_INIT(lcdproc, 0.5.5, lcdproc@lists.omnipotent.net)
4
 AC_INIT([lcdproc], [0.5.6], [lcdproc@lists.omnipotent.net])
5
 AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
5
 AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
6
 AM_INIT_AUTOMAKE(1.7)
6
 AM_INIT_AUTOMAKE
7
+PKG_PROG_PKG_CONFIG()
7
+PKG_PROG_PKG_CONFIG()
8
8
 
9
 AC_CONFIG_HEADERS(config.h)
9
 AC_CONFIG_HEADERS(config.h)
10
10
 
11
@@ -249,26 +250,63 @@
11
@@ -249,26 +250,62 @@
12
12
 
13
 dnl ######################################################################
13
 dnl ######################################################################
14
 dnl libusb support
14
 dnl libusb support
15
+dnl Stolen from the gnupg project and modified for LCDproc's need.
15
+dnl Stolen from the gnupg project and modified for LCDproc's need.
Lines 20-26 Link Here
20
-AC_ARG_ENABLE(libusb,
20
-AC_ARG_ENABLE(libusb,
21
-	[AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
21
-	[AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
22
-	[ if test "$enableval" != "no"; then
22
-	[ if test "$enableval" != "no"; then
23
-		enable_libusb="yes"
23
-		enable_libusb=yes
24
-	fi ],
24
-	fi ],
25
-	[ enable_libusb=yes ]
25
-	[ enable_libusb=yes ]
26
-)
26
-)
Lines 30-36 Link Here
30
+		[look for the libusb library in DIR]),
30
+		[look for the libusb library in DIR]),
31
+		[_do_libusb=$withval],[_do_libusb=yes])
31
+		[_do_libusb=$withval],[_do_libusb=yes])
32
+AC_MSG_RESULT($_do_libusb)
32
+AC_MSG_RESULT($_do_libusb)
33
33
 
34
-if test "$enable_libusb" = "yes"; then
34
-if test "$enable_libusb" = "yes"; then
35
-	ifdef([PKG_CHECK_MODULES],
35
-	ifdef([PKG_CHECK_MODULES],
36
-		[PKG_CHECK_MODULES(LIBUSB, libusb,
36
-		[PKG_CHECK_MODULES(LIBUSB, libusb,
Lines 84-90 Link Here
84
 fi
84
 fi
85
-AC_SUBST(LIBUSB_LIBS)
85
-AC_SUBST(LIBUSB_LIBS)
86
-AC_SUBST(LIBUSB_CFLAGS)
86
-AC_SUBST(LIBUSB_CFLAGS)
87
+
87
 
88
89
 dnl ######################################################################
88
 dnl ######################################################################
90
 dnl libftdi support
89
 dnl libusb-1.0 support
(-)./files/patch-server__drivers__Makefile.am (-8 lines)
Lines 1-8 Link Here
1
--- server/drivers/Makefile.am.orig	2011-08-14 05:29:16.000000000 -0700
2
+++ server/drivers/Makefile.am	2012-04-17 11:55:39.000000000 -0700
3
@@ -22,3 +22,4 @@
4
 
5
-pkglib_PROGRAMS = @DRIVERS@
6
+my_execbindir = $(pkglibdir)
7
+my_execbin_PROGRAMS = @DRIVERS@
8
 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
(-)./pkg-plist (-1 / +3 lines)
Lines 4-10 Link Here
4
etc/lcdexec.conf.sample
4
etc/lcdexec.conf.sample
5
etc/lcdproc.conf.sample
5
etc/lcdproc.conf.sample
6
lib/lcdproc/CFontz.so
6
lib/lcdproc/CFontz.so
7
lib/lcdproc/CFontz633.so
8
lib/lcdproc/CFontzPacket.so
7
lib/lcdproc/CFontzPacket.so
9
lib/lcdproc/CwLnx.so
8
lib/lcdproc/CwLnx.so
10
lib/lcdproc/ea65.so
9
lib/lcdproc/ea65.so
Lines 16-21 Link Here
16
lib/lcdproc/bayrad.so
15
lib/lcdproc/bayrad.so
17
lib/lcdproc/curses.so
16
lib/lcdproc/curses.so
18
lib/lcdproc/glk.so
17
lib/lcdproc/glk.so
18
lib/lcdproc/glcd.so
19
lib/lcdproc/hd44780.so
19
lib/lcdproc/hd44780.so
20
%%FTDI%%lib/lcdproc/i2500vfd.so
20
%%FTDI%%lib/lcdproc/i2500vfd.so
21
lib/lcdproc/icp_a106.so
21
lib/lcdproc/icp_a106.so
Lines 29-34 Link Here
29
%%USB%%lib/lcdproc/picolcd.so
29
%%USB%%lib/lcdproc/picolcd.so
30
lib/lcdproc/pyramid.so
30
lib/lcdproc/pyramid.so
31
lib/lcdproc/SureElec.so
31
lib/lcdproc/SureElec.so
32
lib/lcdproc/sdeclcd.so
32
lib/lcdproc/sed1330.so
33
lib/lcdproc/sed1330.so
33
lib/lcdproc/sed1520.so
34
lib/lcdproc/sed1520.so
34
lib/lcdproc/serialPOS.so
35
lib/lcdproc/serialPOS.so
Lines 40-44 Link Here
40
lib/lcdproc/text.so
41
lib/lcdproc/text.so
41
lib/lcdproc/tyan.so
42
lib/lcdproc/tyan.so
42
%%FTDI%%lib/lcdproc/ula200.so
43
%%FTDI%%lib/lcdproc/ula200.so
44
lib/lcdproc/vlsys_m428.so
43
sbin/LCDd
45
sbin/LCDd
44
@dirrm lib/lcdproc
46
@dirrm lib/lcdproc

Return to bug 173433