Index: head/textproc/dwdiff/Makefile
===================================================================
--- head/textproc/dwdiff/Makefile	(revision 249875)
+++ head/textproc/dwdiff/Makefile	(revision 249876)
@@ -1,70 +1,57 @@
 # New ports collection makefile for:	dwdiff
 # Date created:		30 September 2006
 # Whom:			Alexander Logvinov <ports@logvinov.com>
 #
 # $FreeBSD$
 
 PORTNAME=	dwdiff
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7
 CATEGORIES=	textproc
 MASTER_SITES=	http://os.ghalkes.nl/dist/ \
 		http://www.logvinov.ru/files/dist/ \
 		LOCAL/avl
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A delimited word diff program
 
 OPTIONS=	UNICODE	"Build with Unicode support"	on
 
 MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-MAN1=		${PORTNAME}.1
+MAN1=		${PORTNAME}.1 dwfilter.1
 PORTDOCS=	COPYING Changelog README
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-MANLANG=	"" nl
-LANGS=		de nl
+MANLANG=	"" nl nl.UTF-8
 .else
 CONFIGURE_ARGS+=	--without-gettext
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if defined(WITH_UNICODE)
 LIB_DEPENDS+=	icudata:${PORTSDIR}/devel/icu
 .else
 CONFIGURE_ARGS+=	--without-unicode
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MAN1PREFIX}/man/man1
+post-patch:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	@${REINPLACE_CMD} -e 's|share/doc/${PORTNAME}-${PORTVERSION}|${DOCSDIR_REL}|' \
+		${WRKSRC}/Makefile.in
+.else
+	@${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
 .endif
-.if !defined(WITHOUT_NLS)
-.for lang in ${MANLANG:N""}
-	@${MKDIR} ${MAN1PREFIX}/man/${lang}/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${lang}/${MAN1} ${MAN1PREFIX}/man/${lang}/man1
-.endfor
-.for lang in ${LANGS}
-	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-	    ${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
-.endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/textproc/dwdiff/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/textproc/dwdiff/distinfo
===================================================================
--- head/textproc/dwdiff/distinfo	(revision 249875)
+++ head/textproc/dwdiff/distinfo	(revision 249876)
@@ -1,3 +1,3 @@
-MD5 (dwdiff-1.6.1.tgz) = e7bf94f579ce764c2070c17cc5a24332
-SHA256 (dwdiff-1.6.1.tgz) = 197261c15308e6255993aa0a426d72b5b7853c7b18f15800bd7fdf8aa8e1db47
-SIZE (dwdiff-1.6.1.tgz) = 66085
+MD5 (dwdiff-1.7.tgz) = c88714707d755c5202a4a7fd74e815fd
+SHA256 (dwdiff-1.7.tgz) = 874c16a3802b6caf7be84a43c130817a4a235908505141ef4e27f1d053e52e38
+SIZE (dwdiff-1.7.tgz) = 71293

Property changes on: head/textproc/dwdiff/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/textproc/dwdiff/pkg-plist
===================================================================
--- head/textproc/dwdiff/pkg-plist	(revision 249875)
+++ head/textproc/dwdiff/pkg-plist	(revision 249876)
@@ -1,5 +1,8 @@
 bin/dwdiff
+bin/dwfilter
 %%NLS%%share/locale/de/LC_MESSAGES/dwdiff.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/dwdiff.mo
+%%NLS%%@dirrmtry man/nl.UTF-8/man1
+%%NLS%%@dirrmtry man/nl.UTF-8
 %%NLS%%@dirrmtry man/nl/man1
 %%NLS%%@dirrmtry man/nl

Property changes on: head/textproc/dwdiff/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property