8 files changed, 32 insertions, 44 deletions

diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 856bd89135db..a9aed8a50008 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lcdproc
-PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTVERSION=	0.4.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lcdproc.omnipotent.net/download/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/sysutils/lcdproc/distinfo b/sysutils/lcdproc/distinfo
index cd2f4e5d10c8..2be3af37b018 100644
--- a/sysutils/lcdproc/distinfo
+++ b/sysutils/lcdproc/distinfo
@@ -1,2 +1,2 @@
-MD5 (lcdproc-0.4.3.tar.gz) = 77228a346a1f4347eb0db7383c76c988
-SIZE (lcdproc-0.4.3.tar.gz) = 351458
+MD5 (lcdproc-0.4.5.tar.gz) = c1e74364963054b26b2a77a37bd2bf36
+SIZE (lcdproc-0.4.5.tar.gz) = 360673
diff --git a/sysutils/lcdproc/files/patch-chrono.c b/sysutils/lcdproc/files/patch-chrono.c
index b6dbca2b46a2..0ec02a463b4e 100644
--- a/sysutils/lcdproc/files/patch-chrono.c
+++ b/sysutils/lcdproc/files/patch-chrono.c
@@ -1,5 +1,5 @@
---- clients/lcdproc/chrono.c.orig	Sat Dec 29 06:52:39 2001
-+++ clients/lcdproc/chrono.c	Tue May  6 05:07:49 2003
+--- clients/lcdproc/chrono.c.orig	Tue Jan 18 19:57:44 2005
++++ clients/lcdproc/chrono.c	Tue Jan 18 19:59:30 2005
 @@ -62,6 +62,8 @@
  #include <sys/dkstat.h>
  #endif
diff --git a/sysutils/lcdproc/files/patch-configure b/sysutils/lcdproc/files/patch-configure
index f87faff2a633..fd73d1718646 100644
--- a/sysutils/lcdproc/files/patch-configure
+++ b/sysutils/lcdproc/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Thu May 30 07:20:57 2002
-+++ configure	Thu Nov 20 16:11:23 2003
-@@ -886,7 +886,7 @@
+--- configure.orig	Tue Jan 18 19:53:03 2005
++++ configure	Tue Jan 18 19:56:32 2005
+@@ -891,7 +891,7 @@
  if test $debug = "yes"; then
  	CFLAGS="-g -O"
  else
 -	CFLAGS="-O3"
-+	
++	# no default, left for line numbers
  fi
  CFLAGS="-Wall $CFLAGS"
  export CFLAGS
-@@ -1842,7 +1842,7 @@
+@@ -1847,7 +1847,7 @@
  fi
  
  
@@ -18,11 +18,3 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2902,6 +2902,7 @@
- 
- 	echo $ac_n "checking for your mounted filesystem table""... $ac_c" 1>&6
- echo "configure:2905: checking for your mounted filesystem table" >&5
-+ac_cv_mtab_file=/etc/fstab
- if eval "test \"`echo '$''{'ac_cv_mtab_file'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
diff --git a/sysutils/lcdproc/files/patch-cpu.c b/sysutils/lcdproc/files/patch-cpu.c
index 674a1d20bc9a..e9da8cbc3938 100644
--- a/sysutils/lcdproc/files/patch-cpu.c
+++ b/sysutils/lcdproc/files/patch-cpu.c
@@ -1,5 +1,5 @@
---- clients/lcdproc/cpu.c.orig	Thu Jan  3 13:32:42 2002
-+++ clients/lcdproc/cpu.c	Tue May  6 05:08:51 2003
+--- clients/lcdproc/cpu.c.orig	Tue Jan 18 19:58:47 2005
++++ clients/lcdproc/cpu.c	Tue Jan 18 19:59:52 2005
 @@ -60,6 +60,9 @@
  #include <sys/dkstat.h>
  #endif
diff --git a/sysutils/lcdproc/files/patch-port b/sysutils/lcdproc/files/patch-port
deleted file mode 100644
index d4f034a0ff11..000000000000
--- a/sysutils/lcdproc/files/patch-port
+++ /dev/null
@@ -1,19 +0,0 @@
-*** server/drivers/port.h.orig	Tue Feb 25 20:34:39 2003
---- server/drivers/port.h	Tue Feb 25 20:34:56 2003
-*************** static inline int port_in (unsigned shor
-*** 141,147 ****
-          
-  // Write a byte 'val' to port
-  static inline void port_out (unsigned short int port, unsigned char val) {
-!         outb(val,port);
-  }
-          
-  // Get access to a specific port
---- 141,147 ----
-          
-  // Write a byte 'val' to port
-  static inline void port_out (unsigned short int port, unsigned char val) {
-!         outb(port,val);
-  }
-          
-  // Get access to a specific port
diff --git a/sysutils/lcdproc/files/patch-port.h b/sysutils/lcdproc/files/patch-port.h
new file mode 100644
index 000000000000..6d90480b6171
--- /dev/null
+++ b/sysutils/lcdproc/files/patch-port.h
@@ -0,0 +1,20 @@
+--- server/drivers/port.h.orig	Tue Jan 18 20:04:12 2005
++++ server/drivers/port.h	Tue Jan 18 20:04:29 2005
+@@ -64,7 +64,7 @@
+ 
+ // Write a byte 'val' to port
+ static inline void port_out (unsigned short int port, unsigned char val) {
+-	outb(val, port);
++#	outb(val, port);
+ }
+ 
+ // Get access to a specific port
+@@ -91,7 +91,7 @@
+ 
+ // Write a byte 'val' to port
+ static inline void port_out (unsigned short int port, unsigned char val) {
+-	outb(port, val);
++#	outb(port, val);
+ }
+ 
+ static inline void setaccess(u_long * map, u_int bit, int allow) {
diff --git a/sysutils/lcdproc/pkg-plist b/sysutils/lcdproc/pkg-plist
index f1662b783843..b799c47ae106 100644
--- a/sysutils/lcdproc/pkg-plist
+++ b/sysutils/lcdproc/pkg-plist
@@ -1,10 +1,6 @@
-bin/fortune.pl
-bin/iosock.pl
 bin/lcdheadlines
 bin/lcdmetar.pl
 bin/lcdproc
-bin/tail.pl
-bin/x11amp.pl
 etc/LCDd.conf.sample
 etc/rc.d/LCDd.sh.sample
 sbin/LCDd