summaryrefslogtreecommitdiff
path: root/sysutils/lcdproc/files
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2012-11-09 13:16:11 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2012-11-09 13:16:11 +0000
commite5ef646664ae54ab432adf2e13cf4f417350a425 (patch)
treeed80ff192e5c6c82a3bccb8c9253cb24ff2851dc /sysutils/lcdproc/files
parentPart of base in an earlier version for every supported FreeBSD version. (diff)
- Update to 0.5.6
- Convert to USE_PACKAGECONFIG and make it a run depends - Remove ABI version numbers from LIB_DEPENDS - Trim Makefile headers PR: ports/173433 Submitted by: Markus Dolze <bsdfan@nurfuerspam.de> (maintainer) Feature safe: yes
Notes
Notes: svn path=/head/; revision=307234
Diffstat (limited to 'sysutils/lcdproc/files')
-rw-r--r--sysutils/lcdproc/files/patch-configure.in25
-rw-r--r--sysutils/lcdproc/files/patch-server__drivers__Makefile.am8
2 files changed, 12 insertions, 21 deletions
diff --git a/sysutils/lcdproc/files/patch-configure.in b/sysutils/lcdproc/files/patch-configure.in
index 5ab27e62f72e..0a9afec63a71 100644
--- a/sysutils/lcdproc/files/patch-configure.in
+++ b/sysutils/lcdproc/files/patch-configure.in
@@ -1,15 +1,15 @@
---- ./configure.in.orig 2011-11-09 20:52:28.000000000 +0100
-+++ ./configure.in 2011-11-10 23:29:33.000000000 +0100
+--- ./configure.in.orig 2012-11-04 11:41:16.000000000 +0100
++++ ./configure.in 2012-11-07 00:13:35.000000000 +0100
@@ -4,6 +4,7 @@
- AC_INIT(lcdproc, 0.5.5, lcdproc@lists.omnipotent.net)
+ AC_INIT([lcdproc], [0.5.6], [lcdproc@lists.omnipotent.net])
AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
- AM_INIT_AUTOMAKE(1.7)
+ AM_INIT_AUTOMAKE
+PKG_PROG_PKG_CONFIG()
-
+
AC_CONFIG_HEADERS(config.h)
-
-@@ -249,26 +250,63 @@
-
+
+@@ -249,26 +250,62 @@
+
dnl ######################################################################
dnl libusb support
+dnl Stolen from the gnupg project and modified for LCDproc's need.
@@ -20,7 +20,7 @@
-AC_ARG_ENABLE(libusb,
- [AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
- [ if test "$enableval" != "no"; then
-- enable_libusb="yes"
+- enable_libusb=yes
- fi ],
- [ enable_libusb=yes ]
-)
@@ -30,7 +30,7 @@
+ [look for the libusb library in DIR]),
+ [_do_libusb=$withval],[_do_libusb=yes])
+AC_MSG_RESULT($_do_libusb)
-
+
-if test "$enable_libusb" = "yes"; then
- ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES(LIBUSB, libusb,
@@ -84,7 +84,6 @@
fi
-AC_SUBST(LIBUSB_LIBS)
-AC_SUBST(LIBUSB_CFLAGS)
-+
-
+
dnl ######################################################################
- dnl libftdi support
+ dnl libusb-1.0 support
diff --git a/sysutils/lcdproc/files/patch-server__drivers__Makefile.am b/sysutils/lcdproc/files/patch-server__drivers__Makefile.am
deleted file mode 100644
index 47625747a82b..000000000000
--- a/sysutils/lcdproc/files/patch-server__drivers__Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- server/drivers/Makefile.am.orig 2011-08-14 05:29:16.000000000 -0700
-+++ server/drivers/Makefile.am 2012-04-17 11:55:39.000000000 -0700
-@@ -22,3 +22,4 @@
-
--pkglib_PROGRAMS = @DRIVERS@
-+my_execbindir = $(pkglibdir)
-+my_execbin_PROGRAMS = @DRIVERS@
- 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