0
@@ -4,7 +4,6 @@ PortSystem 1.0
0
 
0
 name            openssh
0
 version         5.0p1
0
-revision	1
0
 categories      net
0
 maintainers     wms
0
 description     OpenSSH secure login server
0
@@ -21,9 +20,9 @@ long_description  OpenSSH is a FREE version of the SSH protocol suite of \
0
 homepage        http://www.openssh.com/
0
 platforms       darwin
0
 checksums       ${distfiles} \
0
-                md5     1f1dfaa775f33dd3328169de9bdc292a \
0
-                sha1    121cea3a730c0b0353334b6f46f438de30ab4928 \
0
-                rmd160  b813234014e339fe2d9d10a5adad9f8e065918fc
0
+		md5 1f1dfaa775f33dd3328169de9bdc292a \
0
+		sha1 121cea3a730c0b0353334b6f46f438de30ab4928 \
0
+		rmd160 b813234014e339fe2d9d10a5adad9f8e065918fc
0
 
0
 master_sites    openbsd:OpenSSH/portable \
0
   http://mirror.mcs.anl.gov/openssh/portable/ \
0
@@ -35,24 +34,6 @@ master_sites    openbsd:OpenSSH/portable \
0
   ftp://openbsd.secsup.org/pub/openbsd/OpenSSH/portable/
0
 depends_lib     port:openssl port:zlib
0
 
0
-patchfiles	pam.patch \
0
-		sacl.patch \
0
-		DVG-4122722+5277818_new_EA.patch \
0
-		DVG-3977221_manpage_tweaks.patch \
0
-		DVG-4212542_auth_error_logging_fix.patch \
0
-		DVG-4157448+4920695_corrected_UsePAM_comment.patch \
0
-		lastlog.patch \
0
-		openssh-5.0p1-gsskex-20080404.patch \
0
-		DVG-4853931_enable_GSSAPI.patch \
0
-		DVG-4648874_preserve_EA_mtime.patch \
0
-		DVG-4748610+4897588_ssh-agent_via_launchd.patch \
0
-		DVG-4694589_16_group_limit_fix.patch \
0
-		DVG-5142987_launchd_DISPLAY_for_X11.patch \
0
-		DVG-5258734_pty_permission_fix.patch \
0
-		AJ-5491854-fix_unsafe_usage_of_getpwuid.patch \
0
-		DVG-4135812_add_SACLSupport_to_sshd_conf_manpage.patch \
0
-		DVG-5755519_use_GSS_C_NO_NAME_with_gss_acquire_cred.patch
0
-
0
 # Specified -fno-builtin because GCC 3.3 has log() as a builtin
0
 # (from math.h) while OpenSSH has its own log() function
0
 # -- from fink.
0
@@ -62,8 +43,7 @@ configure.args --with-ssl-dir=${prefix} --sysconfdir=${prefix}/etc/ssh \
0
   --with-pid-dir=${prefix}/var/run --with-tcp-wrappers \
0
   --with-pam --disable-suid-ssh --with-random=/dev/urandom \
0
   --mandir=${prefix}/share/man --with-zlib=${prefix} \
0
-  --with-kerberos5
0
-
0
+  --with-kerberos5=/usr
0
 
0
 destroot.target install-nokeys
0
 
0
@@ -101,17 +81,13 @@ platform darwin {
0
   }
0
 }
0
 
0
-set keychain_patch AJ-5229538+5383306+5446006+5567447+5806868_keychain.patch
0
-
0
 platform darwin 9 {
0
-  pre-patch {
0
-	reinplace "s|/usr/bin/|${prefix}/bin/|g" "${filespath}/${keychain_patch}"
0
-  }
0
-  patchfiles-append	        ${keychain_patch}
0
-  configure.cflags-append	-fPIE -Wl,-pie -D_FORTIFY_SOURCE=2
0
-  configure.ldflags-append	-L. -Lopenbsd-compat -Wl,-pie
0
-  configure.cppflags-append	-D_UTMPX_COMPAT -D__APPLE_UTMPX__ -DUSE_CCAPI \
0
-                                -D__APPLE_LAUNCHD__ -D__APPLE_PRIVPTY__ -D__BROKEN_GLOB__ -Dcannot_audit
0
+  patch_sites-append   http://www.opensource.apple.com/darwinsource/10.5/OpenSSH-87/patches/
0
+  patchfiles-append    DVG-5142987_launchd_DISPLAY_for_X11.patch
0
+  checksums-append     DVG-5142987_launchd_DISPLAY_for_X11.patch \
0
+                       md5 e188ebbba95c4cde61e0e1b2edc9f992 \
0
+                       sha1 62735c5bfbbe1fa41433993435ded7767cc5f1f9 \
0
+                       rmd160 eb5262f554583f4925f6f91f6a6d0034c70098ad
0
 }
0
 
0
 startupitem.create  yes