Don't support the updating the in-tree openssh via pkgsrc. pkgsrc really

has no business trying to update parts of the base system.

4 files changed, 2 insertions, 121 deletions

diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index ef82702014c..dc683b68bf1 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/23 22:07:58 reed Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/27 19:08:36 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -142,10 +142,6 @@ MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-.if defined(UPDATE_INTREE_OPENSSH)
-.  include "Makefile.intree"
-.endif
-
 pre-configure:
 	cd ${WRKSRC} && ${AUTORECONF}
 
diff --git a/security/openssh+gssapi/Makefile.intree b/security/openssh+gssapi/Makefile.intree
deleted file mode 100644
index 83c6df0edea..00000000000
--- a/security/openssh+gssapi/Makefile.intree
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile.intree,v 1.1.1.1 2003/07/24 21:01:23 jwise Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-_UPDATE_INTREE_OPENSSH?=	NO
-.if ${OPSYS} == "NetBSD"
-.  for PATTERN in 1.5 1.5.*
-.    if ${OS_VERSION:M${PATTERN}}
-_UPDATE_INTREE_OPENSSH=	YES
-PKG_SYSCONFSUBDIR:=		# empty
-.    endif
-.  endfor
-.  for PATTERN in 1.6*
-.    if ${OS_VERSION:M${PATTERN}}
-_UPDATE_INTREE_OPENSSH=	YES
-PKG_SYSCONFSUBDIR:=		ssh
-.    endif
-.  endfor
-.endif
-
-# We would like to require an in-tree OpenSSL that is at least 0.9.5a, but the
-# openssl buildlink2.mk forces at least 0.9.6f, which makes
-# UPDATE_INTREE_OPENSSH useless for anything before 1.6*
-#
-# USE_OPENSSL_VERSION:=	${OPENSSL_VERSION_095A}
-.include "../../security/openssl/buildlink2.mk"
-.if ${_NEED_OPENSSL} == "YES"
-_UPDATE_INTREE_OPENSSH=		NO
-PKG_FAIL_REASON=	"OpenSSL>=0.9.6f in the base distribution is required."
-.endif
-
-.if ${_UPDATE_INTREE_OPENSSH} == "YES"
-NO_MTREE=		yes
-NO_PKG_REGISTER=	yes
-NO_PACKAGE=		No package registration is done
-MANCOMPRESSED_IF_MANZ=	yes
-LOCALBASE:=		/usr
-PKG_SYSCONFBASE:=	/etc
-MANDIR:=		share/man
-RCD_SCRIPTS_EGDIR:=	share/examples/openssh
-.else
-PKG_FAIL_REASON?=	"Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}."
-.endif
-
-real-tarball:
-	${GREP} -v "^@" ${PLIST} | ${SED} -e "s,^,${PREFIX}/," | ${SORT} \
-		> ${WRKDIR}/MANIFEST
-	${GTAR} zcvpf ${PKGNAME}-intree-${OPSYS}-${OS_VERSION}.tgz	\
-		`${CAT} ${WRKDIR}/MANIFEST`
-
-tarball:
-	@${ECHO_MSG} "${_PKGSRC_IN}> Tarballing ${PKGNAME}"
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	realtarget="real-tarball"; action="tarball";			\
-	${_SU_TARGET}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 7af0f5a9e21..3ab6b8519fa 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2004/04/27 12:30:23 markd Exp $
+# $NetBSD: Makefile,v 1.130 2004/04/27 19:08:36 jlam Exp $
 
 DISTNAME=		openssh-3.8p1
 PKGNAME=		openssh-3.8.1
@@ -150,10 +150,6 @@ MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-.if defined(UPDATE_INTREE_OPENSSH)
-.  include "Makefile.intree"
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
diff --git a/security/openssh/Makefile.intree b/security/openssh/Makefile.intree
deleted file mode 100644
index 9824b62b891..00000000000
--- a/security/openssh/Makefile.intree
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile.intree,v 1.9 2004/04/27 12:15:48 markd Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-_UPDATE_INTREE_OPENSSH?=	NO
-.if ${OPSYS} == "NetBSD"
-.  for PATTERN in 1.5 1.5.*
-.    if ${OS_VERSION:M${PATTERN}}
-_UPDATE_INTREE_OPENSSH=	YES
-PKG_SYSCONFSUBDIR:=		# empty
-.    endif
-.  endfor
-.  for PATTERN in 1.6* 2.0*
-.    if ${OS_VERSION:M${PATTERN}}
-_UPDATE_INTREE_OPENSSH=	YES
-PKG_SYSCONFSUBDIR:=		ssh
-.    endif
-.  endfor
-.endif
-
-# We would like to require an in-tree OpenSSL that is at least 0.9.5a, but the
-# openssl buildlink3.mk forces at least 0.9.6m, which makes
-# UPDATE_INTREE_OPENSSH useless for anything before 1.6*
-#
-# USE_OPENSSL_VERSION:=	${OPENSSL_VERSION_095A}
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/openssl/builtin.mk"
-.if !empty(USE_BUILTIN.openssl:M[nN][oO])
-_UPDATE_INTREE_OPENSSH=		NO
-PKG_FAIL_REASON=	"OpenSSL>=0.9.6m in the base distribution is required."
-.endif
-
-.if ${_UPDATE_INTREE_OPENSSH} == "YES"
-NO_MTREE=		yes
-NO_PKG_REGISTER=	yes
-NO_PACKAGE=		No package registration is done
-MANCOMPRESSED_IF_MANZ=	yes
-LOCALBASE:=		/usr/.
-PKG_SYSCONFBASE:=	/etc
-MANDIR:=		share/man
-RCD_SCRIPTS_EGDIR:=	share/examples/openssh
-.else
-PKG_FAIL_REASON?=	"Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}."
-.endif
-
-real-tarball:
-	${GREP} -v "^@" ${PLIST} | ${SED} -e "s,^,${PREFIX}/," | ${SORT} \
-		> ${WRKDIR}/MANIFEST
-	${GTAR} zcvpf ${PKGNAME}-intree-${OPSYS}-${OS_VERSION}.tgz	\
-		`${CAT} ${WRKDIR}/MANIFEST`
-
-tarball:
-	@${ECHO_MSG} "${_PKGSRC_IN}> Tarballing ${PKGNAME}"
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	realtarget="real-tarball"; action="tarball";			\
-	${_SU_TARGET}