Fix config file handling. Bump PKGREVISION.

3 files changed, 47 insertions, 9 deletions

diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index ab04a9eba8c..385b7b45649 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/12/29 06:22:10 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/02/20 23:03:00 wiz Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -6,7 +6,7 @@
 
 DISTNAME=		openssh-3.6.1p2
 PKGNAME=		openssh+gssapi-3.6.1.2.20030430
-PKGREVISION=		5
+PKGREVISION=		6
 SVR4_PKGNAME=		osshgss
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh+gssapi/distinfo b/security/openssh+gssapi/distinfo
index 7e6e599175e..f022bd45752 100644
--- a/security/openssh+gssapi/distinfo
+++ b/security/openssh+gssapi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/02/20 23:03:00 wiz Exp $
 
 SHA1 (openssh-3.6.1p2.tar.gz) = dafe5b6ee2c8ced12c2ee8961530b4e51c2f0bcf
 RMD160 (openssh-3.6.1p2.tar.gz) = 6e1dd6edf2313b74a886f5af4c4a5be96f0d35bb
@@ -8,6 +8,6 @@ RMD160 (openssh-3.6.1p2-gssapi-20030430.diff) = ce5bf79f8d48fac9ee51840b645c8680
 Size (openssh-3.6.1p2-gssapi-20030430.diff) = 121077 bytes
 SHA1 (patch-aa) = 20abe6938aba07ab7b6c7eab5d24a303f0cd2298
 SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
-SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
+SHA1 (patch-ah) = 547a8c5371f1b034a61eea18cdb7fcd35e424848
 SHA1 (patch-ai) = a564c1c9df9704fa8ed20bd31a5eb36450c72f2b
 SHA1 (patch-aj) = a83eed6c0a5703a2953682b4627be38a87bfb65f
diff --git a/security/openssh+gssapi/patches/patch-ah b/security/openssh+gssapi/patches/patch-ah
index 9e30e08d778..944395f2858 100644
--- a/security/openssh+gssapi/patches/patch-ah
+++ b/security/openssh+gssapi/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2004/06/15 18:44:57 kristerw Exp $
+$NetBSD: patch-ah,v 1.4 2006/02/20 23:03:00 wiz Exp $
 
---- Makefile.in.orig	Fri Jun 21 10:38:53 2002
-+++ Makefile.in	Tue Jun 25 10:50:44 2002
-@@ -21,7 +21,7 @@
+--- Makefile.in.orig	2006-02-20 12:02:30.000000000 +0000
++++ Makefile.in
+@@ -21,7 +21,7 @@ top_srcdir=@top_srcdir@
  DESTDIR=
  VPATH=@srcdir@
  SSH_PROGRAM=@bindir@/ssh
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.3 2004/06/15 18:44:57 kristerw Exp $
  SFTP_SERVER=$(libexecdir)/sftp-server
  SSH_KEYSIGN=$(libexecdir)/ssh-keysign
  RAND_HELPER=$(libexecdir)/ssh-rand-helper
-@@ -203,7 +203,7 @@
+@@ -225,7 +225,7 @@ check-config:
  scard-install:
  	(cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
  
@@ -20,3 +20,41 @@ $NetBSD: patch-ah,v 1.3 2004/06/15 18:44:57 kristerw Exp $
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
+@@ -267,37 +267,6 @@ install-files: scard-install
+ 	ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
+ 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+ 	ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+-	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
+-		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
+-	fi
+-	@if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
+-		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
+-	else \
+-		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
+-	fi
+-	@if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
+-		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
+-	else \
+-		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
+-	fi
+-	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+-		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
+-		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
+-			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
+-		else \
+-			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
+-		fi ; \
+-	fi
+-	@if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
+-		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
+-			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
+-			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
+-		else \
+-			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
+-		fi ; \
+-	else \
+-		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
+-	fi
+ 
+ host-key: ssh-keygen$(EXEEXT)
+ 	@if [ -z "$(DESTDIR)" ] ; then \