2 files changed, 8 insertions, 20 deletions

diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index 4a7ba2bbed9b..fed9d3506907 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -15,10 +15,7 @@ LICENSE=	GPLv2 # (or later)
 BUILD_DEPENDS=	${OPENWINCE_INCLUDE_DEP}:${PORTSDIR}/devel/openwince-include
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS_DEFINE=	NLS DOCS
-
-USES=		readline
-USE_BZIP2=	yes
+USES=		readline tar:bzip2
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -30,16 +27,11 @@ ONLY_FOR_ARCHS=	i386
 OPENWINCE_INCLUDE=${LOCALBASE}/include/openwince
 OPENWINCE_INCLUDE_DEP=${OPENWINCE_INCLUDE}/common.h
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-extract:
 	@${REINPLACE_CMD} -E -e \
@@ -47,11 +39,8 @@ post-extract:
 		${WRKSRC}/configure
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for f in README TODO doc/internals.xml
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README TODO doc/internals.xml \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/jtag/pkg-descr b/devel/jtag/pkg-descr
index b8dda4bed1b6..36b7e9c7acc6 100644
--- a/devel/jtag/pkg-descr
+++ b/devel/jtag/pkg-descr
@@ -5,5 +5,4 @@ This package has open and modular architecture with ability to write
 miscellaneous extensions (like board testers, flash memory programmers,
 and so on).
 
-Author:	Marcel Telka <marcel@telka.sk>
 WWW: http://openwince.sourceforge.net/jtag/