Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177375023
D29345.1794230851.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
9 KB
Referenced Files
None
Subscribers
None
D29345.1794230851.diff
View Options
Index: sysutils/lcdproc/Makefile
===================================================================
--- sysutils/lcdproc/Makefile
+++ sysutils/lcdproc/Makefile
@@ -3,7 +3,8 @@
PORTNAME= lcdproc
DISTVERSIONPREFIX= v
-DISTVERSION= 0.5.9
+DISTVERSION= 0.5.9.g20210209
+PORTEPOCH= 1
CATEGORIES= sysutils
MAINTAINER= daniel@shafer.cc
@@ -12,12 +13,13 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-ONLY_FOR_ARCHS= i386 amd64 powerpc64
+ONLY_FOR_ARCHS= amd64 i386 powerpc64
USES= autoreconf pkgconfig
GNU_CONFIGURE= yes
USE_RC_SUBR= LCDd lcdproc lcdexec
USE_GITHUB= yes
+GH_TAGNAME= 5c21e8c
CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \
--disable-dependency-tracking \
Index: sysutils/lcdproc/distinfo
===================================================================
--- sysutils/lcdproc/distinfo
+++ sysutils/lcdproc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511907662
-SHA256 (lcdproc-lcdproc-v0.5.9_GH0.tar.gz) = fd13b11c2bae74eaa05e2705ffb89afe8df09e6bf73b5536ae7888ef0a283d86
-SIZE (lcdproc-lcdproc-v0.5.9_GH0.tar.gz) = 893905
+TIMESTAMP = 1616210241
+SHA256 (lcdproc-lcdproc-v0.5.9.g20210209-5c21e8c_GH0.tar.gz) = 8cce3198cbdfda324cd422cc7b7d4448aba82d79a0932aff1cfd2a929ece1115
+SIZE (lcdproc-lcdproc-v0.5.9.g20210209-5c21e8c_GH0.tar.gz) = 935835
Index: sysutils/lcdproc/files/patch-Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-Makefile.am
+++ sysutils/lcdproc/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- ./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 @@
+--- Makefile.am.orig 2021-02-09 17:52:24 UTC
++++ Makefile.am
+@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared clients server docs scripts
-sysconf_DATA = LCDd.conf
+sysconf_DATA =
- EXTRA_DIST = $(sysconf_DATA) CREDITS contrib
+ EXTRA_DIST = $(sysconf_DATA) CREDITS.md contrib
Index: sysutils/lcdproc/files/patch-clients_Makefile.am
===================================================================
--- /dev/null
+++ sysutils/lcdproc/files/patch-clients_Makefile.am
@@ -0,0 +1,9 @@
+--- clients/Makefile.am.orig 2021-02-09 17:52:24 UTC
++++ clients/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = examples lcdexec lcdproc lcdvc metar
++SUBDIRS = lcdexec lcdproc
+
+ ## EOF
Index: sysutils/lcdproc/files/patch-clients__Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-clients__Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./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 = lcdexec lcdproc
-
- ## EOF
Index: sysutils/lcdproc/files/patch-clients__lcdexec__Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-clients__lcdexec__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./clients/lcdexec/Makefile.am.orig Sun May 21 22:26:19 2006
-+++ ./clients/lcdexec/Makefile.am Mon Oct 16 22:26:06 2006
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--sysconf_DATA = lcdexec.conf
-+sysconf_DATA =
-
- bin_PROGRAMS = lcdexec
-
Index: sysutils/lcdproc/files/patch-clients__lcdproc__Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-clients__lcdproc__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./clients/lcdproc/Makefile.am.orig Fri Oct 6 09:02:46 2006
-+++ ./clients/lcdproc/Makefile.am Mon Oct 16 22:26:06 2006
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--sysconf_DATA = lcdproc.conf
-+sysconf_DATA =
-
- bin_PROGRAMS = lcdproc
-
Index: sysutils/lcdproc/files/patch-clients__lcdproc__iface.h
===================================================================
--- sysutils/lcdproc/files/patch-clients__lcdproc__iface.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- clients/lcdproc/iface.h.orig 2020-09-28 23:24:28.536083000 +0200
-+++ clients/lcdproc/iface.h 2020-09-28 23:24:52.494772000 +0200
-@@ -18,7 +18,7 @@
- /** max number of interfaces in multi-interface mode */
- #define MAX_INTERFACES 3
-
--IfaceInfo iface[MAX_INTERFACES]; /* interface info */
-+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */
-
- /** Update screen content */
- int iface_screen(int rep, int display, int *flags_ptr);
Index: sysutils/lcdproc/files/patch-clients__lcdproc__iface.c
===================================================================
--- sysutils/lcdproc/files/patch-clients__lcdproc__iface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- clients/lcdproc/iface.c.orig 2020-09-28 23:25:01.655900000 +0200
-+++ clients/lcdproc/iface.c 2020-09-28 23:25:27.294816000 +0200
-@@ -37,6 +37,7 @@
- static char unit_label[10] = "B"; /* default unit label is Bytes */
- static int transfer_screen = 0; /* by default, transfer screen is not shown */
-
-+IfaceInfo iface[MAX_INTERFACES]; /* interface info */
-
- /** Reads and parses configuration file.
- * \return 0 on success, -1 on error
Index: sysutils/lcdproc/files/patch-clients_lcdexec_Makefile.am
===================================================================
--- /dev/null
+++ sysutils/lcdproc/files/patch-clients_lcdexec_Makefile.am
@@ -0,0 +1,10 @@
+--- clients/lcdexec/Makefile.am.orig 2021-02-09 17:52:24 UTC
++++ clients/lcdexec/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sysconf_DATA = lcdexec.conf
++sysconf_DATA =
+
+ bin_PROGRAMS = lcdexec
+
Index: sysutils/lcdproc/files/patch-clients_lcdproc_Makefile.am
===================================================================
--- /dev/null
+++ sysutils/lcdproc/files/patch-clients_lcdproc_Makefile.am
@@ -0,0 +1,10 @@
+--- clients/lcdproc/Makefile.am.orig 2021-02-09 17:52:24 UTC
++++ clients/lcdproc/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sysconf_DATA = lcdproc.conf
++sysconf_DATA =
+
+ bin_PROGRAMS = lcdproc
+
Index: sysutils/lcdproc/files/patch-clients_lcdproc_iface.c
===================================================================
--- /dev/null
+++ sysutils/lcdproc/files/patch-clients_lcdproc_iface.c
@@ -0,0 +1,10 @@
+--- clients/lcdproc/iface.c.orig 2021-02-09 17:52:24 UTC
++++ clients/lcdproc/iface.c
+@@ -38,6 +38,7 @@ static int iface_count = 0; /* number of interfaces */
+ static char unit_label[10] = "B"; /* default unit label is Bytes */
+ static int transfer_screen = 0; /* by default, transfer screen is not shown */
+
++IfaceInfo iface[MAX_INTERFACES]; /* interface info */
+
+ /** Reads and parses configuration file.
+ * \return 0 on success, -1 on error
Index: sysutils/lcdproc/files/patch-configure.ac
===================================================================
--- sysutils/lcdproc/files/patch-configure.ac
+++ sysutils/lcdproc/files/patch-configure.ac
@@ -1,14 +1,14 @@
---- configure.ac.orig 2014-05-01 10:44:01 UTC
+--- configure.ac.orig 2021-02-09 17:52:24 UTC
+++ configure.ac
@@ -4,6 +4,7 @@ AC_PREREQ(2.61)
- AC_INIT([lcdproc], [0.5.7], [lcdproc@lists.omnipotent.net])
+ AC_INIT([lcdproc], [0.5dev], [https://github.com/lcdproc/lcdproc/issues/])
AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
AM_INIT_AUTOMAKE
+PKG_PROG_PKG_CONFIG()
AC_CONFIG_HEADERS(config.h)
-@@ -268,7 +269,7 @@ AC_MSG_RESULT($enable_libusb)
+@@ -270,7 +271,7 @@ AC_MSG_RESULT($enable_libusb)
if test "$enable_libusb" = "yes"; then
ifdef([PKG_CHECK_MODULES],
Index: sysutils/lcdproc/files/patch-docs_Makefile.am
===================================================================
--- /dev/null
+++ sysutils/lcdproc/files/patch-docs_Makefile.am
@@ -0,0 +1,10 @@
+--- docs/Makefile.am.orig 2021-02-09 17:52:24 UTC
++++ docs/Makefile.am
+@@ -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 = doxy-mainpage.md
+
Index: sysutils/lcdproc/files/patch-docs__Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-docs__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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
-
Index: sysutils/lcdproc/files/patch-server_drivers_Makefile.am
===================================================================
--- sysutils/lcdproc/files/patch-server_drivers_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
---- server/drivers/Makefile.am.orig 2017-06-18 20:40:11 UTC
-+++ server/drivers/Makefile.am
-@@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a
- futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
- g15_LDADD = @LIBG15@
- glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
--glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o
-+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
- glcdlib_LDADD = @LIBGLCD@
- glk_LDADD = libbignum.a
- hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
--hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
-+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
- i2500vfd_LDADD = @LIBFTDI_LIBS@
- imon_LDADD = libLCD.a libbignum.a
- imonlcd_LDADD = libLCD.a
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 9, 1:27 PM (2 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41614756
Default Alt Text
D29345.1794230851.diff (9 KB)
Attached To
Mode
D29345: sysutils/lcdproc: Update to latest commit, clean up port
Attached
Detach File
Event Timeline