head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.22
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.18
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.16
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.12
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.10
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.8
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.6
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.4
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.2
	pkgsrc-2007Q4-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2007.12.19.08.17.48;	author bjs;	state dead;
branches;
next	1.1;

1.1
date	2007.12.18.00.28.14;	author bjs;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2007.12.18.00.28.14;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.2
log
@
Begone, ye unwanted patches.
@
text
@$NetBSD: patch-ak,v 1.1 2007/12/18 00:28:14 bjs Exp $

--- rules/merge.sh.orig	2007-11-08 22:29:35.000000000 -0500
+++ rules/merge.sh
@@@@ -10,7 +10,7 @@@@ fi
 > $DEST
 
 for i in $*; do
-  if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
+  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
     echo >> $DEST;
     read hdr
     echo "$hdr" >> $DEST
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.1.1
log
@

Import xkeyboard-config-20071217 (snapshot is better than maintaining
a thousand patches).  This is required for the upcoming 
modular-xorg-server-1.4.0.90 package.
@
text
@@