From 8778f5ffc5440a0d70030f9208a9e9458fcf3ec6 Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Sat, 2 Jun 2007 03:00:51 +0000
Subject: - Correct MAN1 handling. - Fix compilation with gcc 4.2.

Mostly submitted by:	dougb
---
 x11-clocks/asclock-xlib/Makefile                    | 2 +-
 x11-clocks/asclock-xlib/files/patch-beats-led.xpm   | 5 +++++
 x11-clocks/asclock-xlib/files/patch-beats.xpm       | 6 ++++++
 x11-clocks/asclock-xlib/files/patch-classic-led.xpm | 9 +++++++++
 x11-clocks/asclock-xlib/files/patch-shaped-led.xpm  | 9 +++++++++
 x11-clocks/asclock-xlib/pkg-plist                   | 1 +
 6 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 x11-clocks/asclock-xlib/files/patch-beats-led.xpm
 create mode 100644 x11-clocks/asclock-xlib/files/patch-beats.xpm
 create mode 100644 x11-clocks/asclock-xlib/files/patch-classic-led.xpm
 create mode 100644 x11-clocks/asclock-xlib/files/patch-shaped-led.xpm

(limited to 'x11-clocks')

diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 50db4f2a28c5..6f6ec275f1d8 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -17,7 +17,6 @@ COMMENT=	New flavor of asclock
 
 WRKSRC=		${WRKDIR}/asclock-xlib
 USE_XPM=	YES
-MAN1=		asclock.1
 
 .if defined(BATCH)
 USE_IMAKE=	YES
@@ -46,5 +45,6 @@ post-install:
 	  ${MKDIR} ${PREFIX}/share/asclock/${i}; \
 	  ${INSTALL_DATA} *.xpm config ${PREFIX}/share/asclock/${i}/ )
 .endfor
+	cd ${WRKSRC} && ${MAKE} install.man
 
 .include <bsd.port.post.mk>
diff --git a/x11-clocks/asclock-xlib/files/patch-beats-led.xpm b/x11-clocks/asclock-xlib/files/patch-beats-led.xpm
new file mode 100644
index 000000000000..3d7e73010420
--- /dev/null
+++ b/x11-clocks/asclock-xlib/files/patch-beats-led.xpm
@@ -0,0 +1,5 @@
+--- themes/beats/led.xpm	Sat Feb 20 14:54:43 1999
++++ themes/beats/led.xpm	Tue May 29 00:20:55 2007
+@@ -1 +1 @@
+-char *led_xpm[];
++static char *led_xpm[] = {};
diff --git a/x11-clocks/asclock-xlib/files/patch-beats.xpm b/x11-clocks/asclock-xlib/files/patch-beats.xpm
new file mode 100644
index 000000000000..577676694c2b
--- /dev/null
+++ b/x11-clocks/asclock-xlib/files/patch-beats.xpm
@@ -0,0 +1,6 @@
+--- themes/Freeamp/beats.xpm.orig	Sat Jun  2 11:33:56 2007
++++ themes/Freeamp/beats.xpm	Sat Jun  2 11:34:00 2007
+@@ -1,2 +1,2 @@
+-static char *beats_xpm[] = { NULL };
++char *beats_xpm[] = { NULL };
+ 
diff --git a/x11-clocks/asclock-xlib/files/patch-classic-led.xpm b/x11-clocks/asclock-xlib/files/patch-classic-led.xpm
new file mode 100644
index 000000000000..c9f62cccde3a
--- /dev/null
+++ b/x11-clocks/asclock-xlib/files/patch-classic-led.xpm
@@ -0,0 +1,9 @@
+--- themes/classic/led.xpm	Sat Feb 20 01:51:50 1999
++++ themes/classic/led.xpm	Tue May 29 00:21:00 2007
+@@ -1,5 +1,5 @@
+ /* XPM */
+-char * led_xpm[] = {
++static char * led_xpm[] = {
+ "135 11 3 1",
+ " 	c #282828",
+ "O	c #00df00",
diff --git a/x11-clocks/asclock-xlib/files/patch-shaped-led.xpm b/x11-clocks/asclock-xlib/files/patch-shaped-led.xpm
new file mode 100644
index 000000000000..dd8ac68a902a
--- /dev/null
+++ b/x11-clocks/asclock-xlib/files/patch-shaped-led.xpm
@@ -0,0 +1,9 @@
+--- themes/shaped/led.xpm	Sat Feb 20 00:49:20 1999
++++ themes/shaped/led.xpm	Tue May 29 00:21:06 2007
+@@ -1,5 +1,5 @@
+ /* XPM */
+-char * led_xpm[] = {
++static char * led_xpm[] = {
+ "135 11 3 1",
+ " 	c #282828",
+ "O	c #00df00",
diff --git a/x11-clocks/asclock-xlib/pkg-plist b/x11-clocks/asclock-xlib/pkg-plist
index 3e8d8f24ecf0..43dbf747c15e 100644
--- a/x11-clocks/asclock-xlib/pkg-plist
+++ b/x11-clocks/asclock-xlib/pkg-plist
@@ -1,4 +1,5 @@
 bin/asclock
+man/man1/asclock.1.gz
 share/asclock/Freeamp/beats.xpm
 share/asclock/Freeamp/clock.xpm
 share/asclock/Freeamp/config
-- 
cgit v1.2.3