4 files changed, 3 insertions, 136 deletions

diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 7a28716063ea..7652bae0a82a 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -8,95 +8,25 @@
 PORTNAME=	OpenSSH-askpass
 PORTVERSION=	1.2.2.2001.02.24
 CATEGORIES=	security
-# ${MASTER_SITES} is only for if CVS won't work, period.
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kris
-DISTNAME=	X11/xc/programs/ssh-askpass
 
 MAINTAINER=	kris@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/X11/xc/programs/ssh-askpass
 USE_IMAKE=	yes
 
-.include <bsd.port.pre.mk>
-CAT?=		/bin/cat
-SED?=		/usr/bin/sed
-DISTFILES!=	${SED} 's:^\(.*\)$$:${PKGNAME}/\1:g' ${FILESDIR}/distfiles
-IGNOREFILES!=	${SED} 's:^\(.*\)$$:${PKGNAME}/\1:g' ${FILESDIR}/ignorefiles
-DISTFILES+=	${IGNOREFILES}
-
-CVS_CMD?=	cvs -z3
-CVS_DATE=	Sat Feb 24 20:27:43 PST 2001
-CVS_SITES?=	anoncvs@anoncvs1.ca.openbsd.org:/cvs \
-		:pserver:anoncvs@anoncvs1.usa.openbsd.org:/cvs
-STAMPFILE=	${DISTDIR}/${PKGNAME}/.stamp
-WRKSRC=		${WRKDIR}/ssh-askpass
-
 MAN1=		ssh-askpass.1
 MANCOMPRESSED=	yes
 
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		if [ -e ${DISTDIR}/${PKGNAME}.${CVS_DATE_}.tar.gz ]; then \
-			cd ${DISTDIR}; \
-			${TAR} xfz ${PKGNAME}.${CVS_DATE_}.tar.gz \
-			    ${DISTFILES}; \
-			${ECHO} -n "${CVS_DATE}" > ${STAMPFILE}; \
-			exit; \
-		fi; \
-		unset CVS_RSH CVS_SERVER || ${TRUE}; \
-		if [ -n "${PORTS_CVS_RSH}" ]; then \
-			export CVS_RSH="${PORTS_CVS_RSH}"; \
-		fi; \
-		if [ -n "${PORTS_CVS_SERVER}" ]; then \
-			export CVS_SERVER="${PORTS_CVS_SERVER}"; \
-		fi; \
-		${MKDIR} ${DISTDIR}/${PKGNAME} && \
-		cd ${DISTDIR}/${PKGNAME}; \
-		for CVS_SITE in ${CVS_SITES}; do \
-			${ECHO_MSG} ">> Attempting to CVS checkout from $${CVS_SITE}."; \
-			if ${CVS_CMD} -d $${CVS_SITE} co -D "${CVS_DATE}" \
-			    ${DISTNAME}; then \
-				${ECHO} -n "${CVS_DATE}" > ${STAMPFILE}; \
-				exit; \
-			fi \
-		done; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}.  Please try to retrieve"; \
-		${ECHO_MSG} ">> a snapshot with \"make fetchsrctarball\" and try again."; \
-		exit 1; \
-	fi
-
 makesrctarball: fetch
 	@cd ${DISTDIR}; \
 	${ECHO_MSG} ">> Creating source tarball in ${DISTDIR}"; \
 	${ECHO_MSG} ">> \"${PKGNAME}.tar.gz\"."; \
 	${TAR} cfz ${PKGNAME}.tar.gz ${PKGNAME}
 
-fetchsrctarball:
-	@cd ${DISTDIR}; \
-	file=${PKGNAME}.tar.gz; \
-	if [ -e $$file ]; then \
-		exit; \
-	fi; \
-	${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
-	for site in ${MASTER_SITES}; do \
-		${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
-		if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} \
-		    $${site}$${file}; then \
-			exit; \
-		fi; \
-	done; \
-	${ECHO_MSG} ">> Couldn't fetch $$file."; \
-	${ECHO_MSG} ">> Please try to retrieve this file manually into"; \
-	${ECHO_MSG} ">> ${_DISTDIR} and try again."; \
-	exit 1
-
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${CP} -r ${DISTDIR}/${PKGNAME}/${DISTNAME} ${WRKDIR}
-
 pre-install:
 	${MKDIR} ${PREFIX}/share/doc/ssh-askpass
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ssh-askpass/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/openssh-askpass/distinfo b/security/openssh-askpass/distinfo
index 55a504898d4b..3a6cb1fdee1d 100644
--- a/security/openssh-askpass/distinfo
+++ b/security/openssh-askpass/distinfo
@@ -1,32 +1 @@
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/ChangeLog) = 4a55204b4d40cf04a421f49bfbf0eb41
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/Imakefile) = 566b6d2d8e3f2d5aee59758d07e26fa0
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/README) = 8e4d13c85c2d8a1bf369cb602f8c07d5
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/SshAskpass-1337.ad) = e73f7b285ea38ca2d2d12b423e36854e
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/SshAskpass-NeXTish.ad) = 223e29c85619f24b7af07ad0aa3063bd
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/SshAskpass-default.ad) = 5eb7c2f14174b4f7f1a755f948263150
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/SshAskpass-green.ad) = ec9c543bcd102e4ccbec8fa03cfe8cfa
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/SshAskpass-motif.ad) = e8a157b5425cfedc863d95f0c31d263f
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/drawing.c) = 5e3d52b04e6f7c2e95e805760514847f
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/drawing.h) = e789890ef5d21fcb8de7ac2ae53279df
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/dynlist.c) = 2bd91dc6707153da2f38a408e90cb4e7
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/dynlist.h) = 375fc4098bf89fa2d392230a2a14f1c5
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/resources.c) = 4797d65502353741a827f2161a7cdc9e
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/resources.h) = 88197b765deeee95e8bb5947575c6de7
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/x11-ssh-askpass.c) = aebbebe43a1f11ffb09aa088c9c2741f
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/X11/xc/programs/ssh-askpass/x11-ssh-askpass.h) = ece92f9cd4aee70e9749fc423d59a9d3
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/CVS/Root) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/CVS/Repository) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/CVS/Entries) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/CVS/Entries.Static) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/CVS/Root) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/CVS/Repository) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/CVS/Entries) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/CVS/Entries.Static) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/CVS/Root) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/CVS/Repository) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/CVS/Entries) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/CVS/Entries.Static) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/ssh-askpass/CVS/Root) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/ssh-askpass/CVS/Repository) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/ssh-askpass/CVS/Entries) = IGNORE
-MD5 (OpenSSH-askpass-1.2.2.2001.02.24/./X11/xc/programs/ssh-askpass/CVS/Tag) = IGNORE
+MD5 (OpenSSH-askpass-1.2.2.2001.02.24.tar.gz) = ceb8b3fc650896948a434ccb203a5fa1
diff --git a/security/openssh-askpass/files/distfiles b/security/openssh-askpass/files/distfiles
deleted file mode 100644
index 872fddaec159..000000000000
--- a/security/openssh-askpass/files/distfiles
+++ /dev/null
@@ -1,16 +0,0 @@
-X11/xc/programs/ssh-askpass/ChangeLog
-X11/xc/programs/ssh-askpass/Imakefile
-X11/xc/programs/ssh-askpass/README
-X11/xc/programs/ssh-askpass/SshAskpass-1337.ad
-X11/xc/programs/ssh-askpass/SshAskpass-NeXTish.ad
-X11/xc/programs/ssh-askpass/SshAskpass-default.ad
-X11/xc/programs/ssh-askpass/SshAskpass-green.ad
-X11/xc/programs/ssh-askpass/SshAskpass-motif.ad
-X11/xc/programs/ssh-askpass/drawing.c
-X11/xc/programs/ssh-askpass/drawing.h
-X11/xc/programs/ssh-askpass/dynlist.c
-X11/xc/programs/ssh-askpass/dynlist.h
-X11/xc/programs/ssh-askpass/resources.c
-X11/xc/programs/ssh-askpass/resources.h
-X11/xc/programs/ssh-askpass/x11-ssh-askpass.c
-X11/xc/programs/ssh-askpass/x11-ssh-askpass.h
diff --git a/security/openssh-askpass/files/ignorefiles b/security/openssh-askpass/files/ignorefiles
deleted file mode 100644
index 82a66b1b2812..000000000000
--- a/security/openssh-askpass/files/ignorefiles
+++ /dev/null
@@ -1,16 +0,0 @@
-./X11/CVS/Root
-./X11/CVS/Repository
-./X11/CVS/Entries
-./X11/CVS/Entries.Static
-./X11/xc/CVS/Root
-./X11/xc/CVS/Repository
-./X11/xc/CVS/Entries
-./X11/xc/CVS/Entries.Static
-./X11/xc/programs/CVS/Root
-./X11/xc/programs/CVS/Repository
-./X11/xc/programs/CVS/Entries
-./X11/xc/programs/CVS/Entries.Static
-./X11/xc/programs/ssh-askpass/CVS/Root
-./X11/xc/programs/ssh-askpass/CVS/Repository
-./X11/xc/programs/ssh-askpass/CVS/Entries
-./X11/xc/programs/ssh-askpass/CVS/Tag