diff options
author | Beat Gaetzi <beat@FreeBSD.org> | 2009-06-26 07:12:00 +0000 |
---|---|---|
committer | Beat Gaetzi <beat@FreeBSD.org> | 2009-06-26 07:12:00 +0000 |
commit | 143cca0e2a2893f796c6aefc8c4402ba53e342df (patch) | |
tree | dd15415937e7915cb172e571de12e6465aa767b3 /sysutils/lcdproc | |
parent | - Pass only the contents of the ${WRKDIRPREFIX} variable to tclConfig.sh (diff) |
- Update to 0.5.3
PR: ports/135900
Submitted by: Markus Dolze <bsdfan AT nurfuerspam.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=236645
Diffstat (limited to 'sysutils/lcdproc')
-rw-r--r-- | sysutils/lcdproc/Makefile | 19 | ||||
-rw-r--r-- | sysutils/lcdproc/distinfo | 6 | ||||
-rw-r--r-- | sysutils/lcdproc/files/lcdexec.in | 26 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-Makefile.am | 6 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-clients__Makefile.am | 9 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-clients__lcdproc__machine_FreeBSD.c | 62 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-clients__lcdvc__Makefile.am | 10 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-configure.in | 11 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-docs__Makefile.am | 10 | ||||
-rw-r--r-- | sysutils/lcdproc/files/patch-server__drivers__CFontz633io.c | 18 | ||||
-rw-r--r-- | sysutils/lcdproc/files/pkg-message.in | 14 | ||||
-rw-r--r-- | sysutils/lcdproc/pkg-plist | 5 |
12 files changed, 80 insertions, 116 deletions
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile index 8295ca912aba..11b2f221e941 100644 --- a/sysutils/lcdproc/Makefile +++ b/sysutils/lcdproc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= lcdproc -PORTVERSION= 0.5.2 -PORTREVISION= 2 +PORTVERSION= 0.5.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,12 +18,14 @@ ONLY_FOR_ARCHS= i386 amd64 USE_AUTOTOOLS= autoconf:262 automake:19 aclocal:19 GNU_CONFIGURE= yes -USE_RC_SUBR= LCDd lcdproc +USE_GNOME= pkgconfig +USE_RC_SUBR= LCDd lcdproc lcdexec CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \ - --disable-ldap \ + --disable-dependency-tracking \ --disable-doxygen -CONFIGURE_ENV= CFLAGS="${CFLAGS}" + +SUB_FILES= pkg-message MAN1= lcdexec.1 lcdproc.1 MAN5= lcdproc-config.5 @@ -32,6 +33,8 @@ MAN8= LCDd.8 OPTIONS= USB "Enable USB support" off +ACLOCAL_ARGS= + LCDPROC_DRIVERS=bayrad \ CFontz \ CFontz633 \ @@ -72,7 +75,9 @@ CONFIGURE_ARGS+= --with-libusb-libraries=/usr . endif CONFIGURE_ARGS+= --enable-libusb PLIST_SUB+= USB="" -LCDPROC_DRIVERS+= IOWarrior +LCDPROC_DRIVERS+=IOWarrior \ + picolcd \ + shuttleVFD .else CONFIGURE_ARGS+= --disable-libusb PLIST_SUB+= USB="@comment " @@ -85,6 +90,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${PREFIX}/etc/LCDd.conf.sample ${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${PREFIX}/etc/lcdproc.conf.sample ${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample - ${INSTALL_DATA} ${WRKSRC}/clients/lcdvc/lcdvc.conf ${PREFIX}/etc/lcdvc.conf.sample + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/sysutils/lcdproc/distinfo b/sysutils/lcdproc/distinfo index 1eaae7c95faa..502b0b1423d3 100644 --- a/sysutils/lcdproc/distinfo +++ b/sysutils/lcdproc/distinfo @@ -1,3 +1,3 @@ -MD5 (lcdproc-0.5.2.tar.gz) = 860f192d061d87dda6512b11b79daac2 -SHA256 (lcdproc-0.5.2.tar.gz) = 3261910dd9155229a2a6067c82ec4cca0d7900420f2d74c87a24b41b9b961036 -SIZE (lcdproc-0.5.2.tar.gz) = 822695 +MD5 (lcdproc-0.5.3.tar.gz) = fe9a7c9d8f2c5e76250ce2ea8f644921 +SHA256 (lcdproc-0.5.3.tar.gz) = cc4003392f348bc35014c6ed59f2e855ba1600d79ada456cbb2c23bc86a5117f +SIZE (lcdproc-0.5.3.tar.gz) = 890116 diff --git a/sysutils/lcdproc/files/lcdexec.in b/sysutils/lcdproc/files/lcdexec.in new file mode 100644 index 000000000000..473259b85c1a --- /dev/null +++ b/sysutils/lcdproc/files/lcdexec.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: lcdexec +# REQUIRE: LCDd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# SET THEM IN THE /etc/rc.conf FILE +# + +. %%RC_SUBR%% + +name="lcdexec" +rcvar=`set_rcvar` + +load_rc_config $name + +: ${lcdexec_enable="NO"} +: ${lcdexec_conf="%%PREFIX%%/etc/lcdexec.conf"} +: ${lcdexec_flags="-c ${lcdexec_conf}"} + +required_files=${lcdexec_conf} +command="%%PREFIX%%/bin/lcdexec" + +run_rc_command "$1" diff --git a/sysutils/lcdproc/files/patch-Makefile.am b/sysutils/lcdproc/files/patch-Makefile.am index 38c8c747062f..ea2eaff2e3ae 100644 --- a/sysutils/lcdproc/files/patch-Makefile.am +++ b/sysutils/lcdproc/files/patch-Makefile.am @@ -1,5 +1,5 @@ ---- ./Makefile.am.orig Fri Oct 6 09:02:45 2006 -+++ ./Makefile.am Mon Oct 16 22:26:06 2006 +--- ./Makefile.am.orig 2009-05-19 08:44:46.000000000 +0200 ++++ ./Makefile.am 2009-06-22 00:36:35.000000000 +0200 @@ -5,7 +5,7 @@ SUBDIRS = shared clients server docs scripts @@ -7,5 +7,5 @@ -sysconf_DATA = LCDd.conf +sysconf_DATA = - EXTRA_DIST = $(sysconf_DATA) CREDITS README.IRman contrib + EXTRA_DIST = $(sysconf_DATA) CREDITS contrib diff --git a/sysutils/lcdproc/files/patch-clients__Makefile.am b/sysutils/lcdproc/files/patch-clients__Makefile.am new file mode 100644 index 000000000000..0ad5aa7e5f10 --- /dev/null +++ b/sysutils/lcdproc/files/patch-clients__Makefile.am @@ -0,0 +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 +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = examples lcdexec lcdproc lcdvc metar ++SUBDIRS = examples lcdexec lcdproc metar + + ## EOF diff --git a/sysutils/lcdproc/files/patch-clients__lcdproc__machine_FreeBSD.c b/sysutils/lcdproc/files/patch-clients__lcdproc__machine_FreeBSD.c deleted file mode 100644 index 967a4eab4fa3..000000000000 --- a/sysutils/lcdproc/files/patch-clients__lcdproc__machine_FreeBSD.c +++ /dev/null @@ -1,62 +0,0 @@ ---- ./clients/lcdproc/machine_FreeBSD.c.orig Sat Apr 14 16:38:15 2007 -+++ ./clients/lcdproc/machine_FreeBSD.c Sun Aug 26 23:21:56 2007 -@@ -45,16 +45,22 @@ - #include <sys/mount.h> - #include <sys/time.h> - #include <sys/user.h> --#include <machine/apm_bios.h> - #include <kvm.h> - #include <errno.h> - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_mib.h> - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#ifdef HAVE_MACHINE_APM_BIOS_H -+# include <machine/apm_bios.h> -+#endif -+ - #include "main.h" - #include "machine.h" --#include "config.h" - #include "shared/LL.h" - - static int pageshift; -@@ -86,13 +92,14 @@ - - int machine_get_battstat(int *acstat, int *battflag, int *percent) - { -- int apmd; -- struct apm_info aip; -- - *acstat = LCDP_AC_ON; - *battflag = LCDP_BATT_ABSENT; - *percent = 100; - -+#ifdef HAVE_MACHINE_APM_BIOS_H -+ int apmd; -+ struct apm_info aip; -+ - if ((apmd = open("/dev/apm", O_RDONLY)) == -1) - { - perror("get_battstat_open"); -@@ -142,6 +149,7 @@ - *percent = -1; - - close(apmd); -+#endif - - return(TRUE); - } -@@ -197,7 +205,7 @@ - static load_type last_load = { 0, 0, 0, 0, 0 }; - static load_type last_ret_load; - load_type load; -- u_int32_t cp_time[CPUSTATES]; -+ long cp_time[CPUSTATES]; - size_t size; - - size = sizeof(cp_time); diff --git a/sysutils/lcdproc/files/patch-clients__lcdvc__Makefile.am b/sysutils/lcdproc/files/patch-clients__lcdvc__Makefile.am deleted file mode 100644 index bc9bb327fe9c..000000000000 --- a/sysutils/lcdproc/files/patch-clients__lcdvc__Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- ./clients/lcdvc/Makefile.am.orig Sun May 21 22:26:19 2006 -+++ ./clients/lcdvc/Makefile.am Mon Oct 16 22:26:06 2006 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --sysconf_DATA = lcdvc.conf -+sysconf_DATA = - - bin_PROGRAMS = lcdvc - diff --git a/sysutils/lcdproc/files/patch-configure.in b/sysutils/lcdproc/files/patch-configure.in deleted file mode 100644 index 5ad4dc7eca37..000000000000 --- a/sysutils/lcdproc/files/patch-configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.in.orig Fri Apr 27 11:42:45 2007 -+++ ./configure.in Sun Aug 26 23:21:56 2007 -@@ -107,7 +107,7 @@ - ]) - - dnl NetBSD, OpenBSD and FreeBSD --AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h) -+AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h machine/apm_bios.h) - ETR_SYSV_IPC - ETR_UNION_SEMUN - diff --git a/sysutils/lcdproc/files/patch-docs__Makefile.am b/sysutils/lcdproc/files/patch-docs__Makefile.am new file mode 100644 index 000000000000..138aff146dd5 --- /dev/null +++ b/sysutils/lcdproc/files/patch-docs__Makefile.am @@ -0,0 +1,10 @@ +--- ./docs/Makefile.am.orig 2009-06-22 00:40:02.000000000 +0200 ++++ ./docs/Makefile.am 2009-06-22 00:40:39.000000000 +0200 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-man_MANS = lcdproc.1 lcdexec.1 lcdvc.1 LCDd.8 lcdproc-config.5 ++man_MANS = lcdproc.1 lcdexec.1 LCDd.8 lcdproc-config.5 + SUBDIRS = lcdproc-user lcdproc-dev + doxygen_input = header.html footer.html + diff --git a/sysutils/lcdproc/files/patch-server__drivers__CFontz633io.c b/sysutils/lcdproc/files/patch-server__drivers__CFontz633io.c deleted file mode 100644 index d31efee5c547..000000000000 --- a/sysutils/lcdproc/files/patch-server__drivers__CFontz633io.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ./server/drivers/CFontz633io.c.orig Mon Oct 16 22:26:21 2006 -+++ ./server/drivers/CFontz633io.c Mon Oct 16 22:28:58 2006 -@@ -49,12 +49,9 @@ - - #include "config.h" - --#if defined(HAVE_SYS_SELECT_H) --# include <sys/select.h> --#else --# include <sys/time.h> --# include <sys/types.h> --#endif /* defined(HAVE_SYS_SELECT_H) */ -+#include <sys/select.h> -+#include <sys/time.h> -+#include <sys/types.h> - - #include "CFontz633io.h" - diff --git a/sysutils/lcdproc/files/pkg-message.in b/sysutils/lcdproc/files/pkg-message.in new file mode 100644 index 000000000000..4540460e3895 --- /dev/null +++ b/sysutils/lcdproc/files/pkg-message.in @@ -0,0 +1,14 @@ +============================================================== +The default configuration files have been installed as +%%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. +============================================================== diff --git a/sysutils/lcdproc/pkg-plist b/sysutils/lcdproc/pkg-plist index 153d98acd769..6ab65702bb45 100644 --- a/sysutils/lcdproc/pkg-plist +++ b/sysutils/lcdproc/pkg-plist @@ -1,15 +1,14 @@ bin/fortune.pl bin/iosock.pl bin/lcdexec +bin/lcdident.pl bin/lcdmetar.pl bin/lcdproc -bin/lcdvc bin/tail.pl bin/x11amp.pl etc/LCDd.conf.sample etc/lcdexec.conf.sample etc/lcdproc.conf.sample -etc/lcdvc.conf.sample lib/lcdproc/CFontz.so lib/lcdproc/CFontz633.so lib/lcdproc/CFontzPacket.so @@ -30,11 +29,13 @@ lib/lcdproc/lcdm001.so lib/lcdproc/lcterm.so lib/lcdproc/ms6931.so lib/lcdproc/mtc_s16209x.so +%%USB%%lib/lcdproc/picolcd.so lib/lcdproc/pyramid.so lib/lcdproc/sed1330.so lib/lcdproc/sed1520.so lib/lcdproc/serialPOS.so lib/lcdproc/serialVFD.so +%%USB%%lib/lcdproc/shuttleVFD.so lib/lcdproc/sli.so lib/lcdproc/stv5730.so lib/lcdproc/t6963.so |