3 files changed, 44 insertions, 22 deletions

diff --git a/misc/tet/Makefile b/misc/tet/Makefile
index 902f59664d14..641af5522b28 100644
--- a/misc/tet/Makefile
+++ b/misc/tet/Makefile
@@ -6,51 +6,70 @@
 #
 
 PORTNAME=		tet
-PORTVERSION=		3.3h
+PORTVERSION=		3.7
 CATEGORIES=		misc
 MASTER_SITES=		ftp://ftp.rdg.opengroup.org/pub/TET/TET3/ \
+			http://tetworks.opengroup.org/tet/ \
+			http://tetworks.opengroup.org/documents/3.7/:docs \
 			${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkoshy
-DISTNAME=		${PORTNAME}${PORTVERSION}-unsup.src
-EXTRACT_SUFX=		.tgz
+DISTFILES=		${PORTNAME}${PORTVERSION}-unsup.src.tgz
+DIST_SUBDIR=		tet/${PORTVERSION}
+EXTRACT_ONLY=		${PORTNAME}${PORTVERSION}-unsup.src.tgz
 
 MAINTAINER=		jkoshy@freebsd.org
 COMMENT=		An test execution framework from the Open Group
 
-NO_WRKSUBDIR=		yes
-NO_PACKAGE=		TET_ROOT needs to be set at compile time
+NO_PACKAGE=		$${TET_ROOT} needs to be set at compile time.
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		-t ${TET_CONFIG_TARGET}
-NO_BUILD=		yes
 PLIST=			${WRKDIR}/PLIST
 
 TET_CONFIG_TARGET?=	inet	# options are `lite', `xti' and `inet'
 
-pre-extract:
+.if !defined(NOPORTDOCS)
+TET_DOCS=		37_all_pdf.zip
+DISTFILES+=		${TET_DOCS}:docs
+BUILD_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
+.endif
+
+# Set @cwd in the package list to ${TET_ROOT}
+PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} \
+			-p ${TET_ROOT} -o ${CATEGORIES}/${PORTNAME}
+
+do-extract:
 .if !defined(TET_ROOT)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "The environment variable \"TET_ROOT\" is not set."
+	@${ECHO_MSG} "ERROR: The environment variable \"TET_ROOT\" is not set."
 	@${ECHO_MSG} "You must set it to the directory where you would like "
 	@${ECHO_MSG} "this port to reside before attempting extraction."
 	@${ECHO_MSG}
 	@${FALSE}
-.else
-	@${TRUE}
 .endif
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	${MKDIR} ${TET_ROOT}
+	${LN} -s ${TET_ROOT} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+	cd ${TET_ROOT} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/${DIST_SUBDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
 
 # fix permissions
 pre-configure:
-	${CHMOD} +x ${WRKDIR}/configure
+	${CHMOD} +x ${TET_ROOT}/configure
 
-# move the work directory to $TET_ROOT after extraction, and build
-# TET inside of $TET_ROOT
-pre-install:
-	${MKDIR} ${TET_ROOT}
-	cd ${WRKDIR} && ${TAR} -cf - * | \
-		(cd ${TET_ROOT} && ${TAR} xf -)
+# build TET inside ${TET_ROOT}, and create a default packing list so that
+# pkg_delete tet-${PORTVERSION} will work.
+do-build:
+.if !defined(TET_ROOT)
+	@${ECHO_MSG} ERROR: Environment variable \"TET_ROOT\" must be set.
+	@${FALSE}
+.endif
 	cd ${TET_ROOT}/src && ${MAKE} ${ALL_TARGET}
 	cd ${TET_ROOT}/src && ${MAKE} ${INSTALL_TARGET}
-	${ECHO} "@cwd ${TET_ROOT}" > ${PLIST}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${TET_ROOT}/doc
+	${UNZIP_CMD} -d ${TET_ROOT}/doc ${DISTDIR}/${DIST_SUBDIR}/${TET_DOCS}
+.endif
 	cd ${TET_ROOT} && ${FIND} . ! -type d | \
 		${SED} -e 's,^\./,,' >> ${PLIST}
 	cd ${TET_ROOT} && ${FIND} -d . -type d -print | ${SORT} -ru | \
diff --git a/misc/tet/distinfo b/misc/tet/distinfo
index d228a2e2b830..20a8bc9b835c 100644
--- a/misc/tet/distinfo
+++ b/misc/tet/distinfo
@@ -1,3 +1,6 @@
-MD5 (tet3.3h-unsup.src.tgz) = e2e22172a577ea5c0cec7bf86e95eadd
-SHA256 (tet3.3h-unsup.src.tgz) = 333f9fdd37030cb5217cfbba9188a52ece4ce3a7b43616fbfbb475511488317c
-SIZE (tet3.3h-unsup.src.tgz) = 779995
+MD5 (tet/3.7/tet3.7-unsup.src.tgz) = c86651a837994116aa9e3a387fe283ea
+SHA256 (tet/3.7/tet3.7-unsup.src.tgz) = 7a879b52e1ac1661e2efbb25913d080a4a2f89fee8da790265e2b54b0bffa175
+SIZE (tet/3.7/tet3.7-unsup.src.tgz) = 953406
+MD5 (tet/3.7/37_all_pdf.zip) = 5493087e2a2b6eb47c892c996ed9050c
+SHA256 (tet/3.7/37_all_pdf.zip) = ee605f2d4dacac95b5b0d0598ac1b30bcf1dfc47c0d061da629d01be3daa0add
+SIZE (tet/3.7/37_all_pdf.zip) = 3133668
diff --git a/misc/tet/pkg-descr b/misc/tet/pkg-descr
index e5906101480d..fc40246a445c 100644
--- a/misc/tet/pkg-descr
+++ b/misc/tet/pkg-descr
@@ -16,4 +16,4 @@ It allows facilities to execute test cases in several ways:
 	- Sequences of the above elements executing a specified number of 
 	  times or until some time period has expired.
 
-WWW: 	http://tetworks.opengroup.org/documents/docs33.html
+WWW: 	http://tetworks.opengroup.org/documents/docs37.htm