diff -Nru ustl.orig/Makefile ustl/Makefile
--- ustl.orig/Makefile	Tue Mar  8 21:07:42 2005
+++ ustl/Makefile	Tue Aug  9 15:19:52 2005
@@ -7,34 +7,31 @@
 #
 
 PORTNAME=	ustl
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	az@inec.ru
 COMMENT=	Codespace-frugal STL implementation
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		INCDIR="${PREFIX}/include" \
+		LIBDIR="${PREFIX}/lib"
 ALL_TARGET=	# empty
 
 PLIST_FILES=	lib/libustl.a
 
-do-configure:
-	cd ${WRKSRC} && ./configure
-
 post-patch:
-	@${REINPLACE_CMD} -e "s,/bin/bash,${LOCALBASE}/bin/bash," ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,/bin/bash,/bin/sh," ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|SIZE_MAX|UINT_MAX|" ${WRKSRC}/memblock.h
-	@${REINPLACE_CMD} -e "s|-Werror||;s|-O3||" ${WRKSRC}/Common.mk.in
+	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/Common.mk.in
 
 post-install:
 	@${FIND} ${PREFIX}/include/ustl* ! -type d | \
diff -Nru ustl.orig/distinfo ustl/distinfo
--- ustl.orig/distinfo	Wed Jan 19 12:55:57 2005
+++ ustl/distinfo	Tue Aug  9 14:11:15 2005
@@ -1,2 +1,2 @@
-MD5 (ustl-0.6-0.tar.bz2) = 8a1709b10f4378b429ce5d3d51bacb45
-SIZE (ustl-0.6-0.tar.bz2) = 206028
+MD5 (ustl-0.7-1.tar.bz2) = af245d73c1983823e94983a308246a7b
+SIZE (ustl-0.7-1.tar.bz2) = 103606