From 6717c136c80cf3ee2206154d9630e5a52a3c2afe Mon Sep 17 00:00:00 2001
From: mrg <mrg@pkgsrc.org>
Date: Wed, 30 Jul 2003 05:39:15 +0000
Subject: support gcc3 cpp

---
 x11/xkeycaps/distinfo         |  4 ++--
 x11/xkeycaps/patches/patch-aa | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'x11')

diff --git a/x11/xkeycaps/distinfo b/x11/xkeycaps/distinfo
index 4698043b129..29982ac6ddd 100644
--- a/x11/xkeycaps/distinfo
+++ b/x11/xkeycaps/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:55 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/07/30 05:39:15 mrg Exp $
 
 SHA1 (xkeycaps-2.46.tar.Z) = 458133a394f63d84efacaf917254074005ce953d
 Size (xkeycaps-2.46.tar.Z) = 489439 bytes
-SHA1 (patch-aa) = 5ae1df3276449ed6fbd12f37e6c11401863911aa
+SHA1 (patch-aa) = 5038c27bf78b9a4ff9e5fb4d01feb4983f18f091
diff --git a/x11/xkeycaps/patches/patch-aa b/x11/xkeycaps/patches/patch-aa
index 96b91c80bd1..3e4ba716655 100644
--- a/x11/xkeycaps/patches/patch-aa
+++ b/x11/xkeycaps/patches/patch-aa
@@ -1,7 +1,15 @@
-$NetBSD: patch-aa,v 1.1 1999/07/24 14:23:15 tron Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/30 05:39:15 mrg Exp $
 
---- Imakefile.old	Fri Apr 23 02:59:08 1999
-+++ Imakefile	Sat Jul 24 16:17:35 1999
+--- Imakefile.orig	1999-12-13 12:27:27.000000000 +1100
++++ Imakefile	2003-07-30 03:41:19.000000000 +1000
+@@ -1,5 +1,5 @@
+-/**/# Imakefile for xkeycaps;
+-/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
++/**/XCOMM Imakefile for xkeycaps;
++/**/XCOMM Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
+ 
+ /*
+  *  To specify a different default keyboard (for when the vendor display
 @@ -70,7 +70,7 @@
  
  
@@ -11,3 +19,14 @@ $NetBSD: patch-aa,v 1.1 1999/07/24 14:23:15 tron Exp $
          DEFINES = $(KBD_DEFINES) $(XTRAP_DEFINES) $(HP_LOSSAGE)
             SRCS = $(CURRENT_DIR)/xkeycaps.c $(CURRENT_DIR)/KbdWidget.c \
                    $(CURRENT_DIR)/KeyWidget.c $(CURRENT_DIR)/info.c \
+@@ -353,8 +353,8 @@
+             TAR = tar
+        COMPRESS = compress
+    COMPRESS_EXT = Z
+-/**/#      COMPRESS = gzip --verbose --best
+-/**/#  COMPRESS_EXT = gz
++/**/XCOMM      COMPRESS = gzip --verbose --best
++/**/XCOMM  COMPRESS_EXT = gz
+ 
+ ComplexProgramTarget(xkeycaps)
+ 
-- 
cgit v1.2.3