head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.18
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.16
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.14
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.12
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.10
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2013.06.15.22.57.58;	author wiz;	state dead;
branches;
next	1.1;
commitid	ZCM4KCYLnmnotLTw;

1.1
date	2011.01.24.18.54.04;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Merge two patches for the same file.
@
text
@$NetBSD: patch-ap,v 1.1 2011/01/24 18:54:04 drochner Exp $

--- bin/override.c.orig	2010-08-09 05:29:21.000000000 +0900
+++ bin/override.c	2011-01-05 00:30:10.000000000 +0900
@@@@ -120,7 +120,7 @@@@
  *
  * Some evil libraries modify the environment. We currently ignore the calls as
  * they could crash the process. This may cause funny behaviour though. */
-int putenv (char *str)
+int putenv (const char *str)
 {
     if (override)
     {
@


1.1
log
@update to 1.1.6, from Makoto Fujiwara per pkgsrc-wip
This is a new major branch, too many changes to list here.
(the options need testing and cleanup)
@
text
@d1 1
a1 1
$NetBSD$
@