Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+11 -8
View File
@@ -1,24 +1,27 @@
$NetBSD: patch-Makefile.in,v 1.1 2013/05/01 19:58:26 imil Exp $
$NetBSD: patch-Makefile.in,v 1.3 2014/03/29 09:38:11 taca Exp $
Removed install-sysconf as we handle that phase through post-install
--- Makefile.in.orig 2013-03-07 15:37:13.000000000 +0000
--- Makefile.in.orig 2014-02-04 00:12:56.000000000 +0000
+++ Makefile.in
@@ -22,7 +22,7 @@ top_srcdir=@top_srcdir@
DESTDIR=
@@ -2,5 +2,5 @@
# uncomment if you run a non bourne compatable shell. Ie. csh
-#SHELL = @SH@
+SHELL = @SH@
AUTORECONF=autoreconf
@@ -23,5 +23,5 @@ DESTDIR=
VPATH=@srcdir@
SSH_PROGRAM=@bindir@/ssh
-ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
+#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
SFTP_SERVER=$(libexecdir)/sftp-server
SSH_KEYSIGN=$(libexecdir)/ssh-keysign
SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
@@ -242,7 +242,7 @@ distprep: catman-do
-rm -rf autom4te.cache
@@ -250,5 +250,5 @@ distprep: catman-do
install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
check-config: