Remove stray chunk from patch file. Ride previous revision.

This commit is contained in:
fhajny 2016-06-14 13:27:00 +00:00
parent 4b70061471
commit 0b3652fbb6
2 changed files with 3 additions and 9 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.33 2016/06/14 13:23:44 fhajny Exp $
$NetBSD: distinfo,v 1.34 2016/06/14 13:27:00 fhajny Exp $
SHA1 (mysql-5.6.30.tar.gz) = 85d2370bce02b903e8f93964fa5f93c2f068bcaf
RMD160 (mysql-5.6.30.tar.gz) = e30068c45263a018da6e948512fae66ac970f14a
@ -28,7 +28,7 @@ SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9
SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884
SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5
SHA1 (patch-scripts_mysql__install__db.pl.in) = 7e8c1cfe7231982f124e5d5e7f384ea2bd015c3a
SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185
SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e

View file

@ -1,15 +1,9 @@
$NetBSD: patch-scripts_mysql__install__db.pl.in,v 1.1 2016/06/14 13:23:44 fhajny Exp $
$NetBSD: patch-scripts_mysql__install__db.pl.in,v 1.2 2016/06/14 13:27:00 fhajny Exp $
We expect config files under $PKG_SYSCONFDIR.
--- scripts/mysql_install_db.pl.in.orig 2015-11-16 09:38:05.000000000 +0000
+++ scripts/mysql_install_db.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/opt/local/bin/perl
# -*- cperl -*-
#
# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -469,7 +469,7 @@ my $copy_cfg_file;
my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";