diff -ruN --exclude=CVS /usr/ports/devel/monotone/Makefile /usr/home/lapo/ports/monotone/Makefile
--- /usr/ports/devel/monotone/Makefile	2010-05-31 03:58:21.000000000 +0200
+++ /usr/home/lapo/ports/monotone/Makefile	2010-06-28 12:40:26.000000000 +0200
@@ -2,12 +2,11 @@
 # Date created:                05 Feb 2004
 # Whom:                        Mark A. Wicks <mwicks@kettering.edu>
 #
-# $FreeBSD: ports/devel/monotone/Makefile,v 1.47 2010/05/31 01:58:21 ade Exp $
+# $FreeBSD: ports/devel/monotone/Makefile,v 1.46 2009/10/27 13:38:45 ale Exp $
 #
 
 PORTNAME=	monotone
-PORTVERSION=	0.45
-PORTREVISION=	2
+PORTVERSION=	0.48
 CATEGORIES=	devel
 MASTER_SITES=	http://monotone.ca/downloads/${PORTVERSION}/
 
@@ -20,6 +19,9 @@
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		botan.0:${PORTSDIR}/security/botan
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 SUB_FILES=	pkg-message
 USE_PERL5_BUILD=yes
 USE_ICONV=	yes
@@ -32,14 +34,12 @@
 		MAKEINFO="makeinfo --no-split"
 
 PLIST_FILES=	bin/mtn bin/mtnopt share/zsh/site-functions/_mtn \
-		"@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true" \
+		"@unexec [ -f %D/bin/zsh ] || ${RMDIR} %D/share/zsh/site-functions 2>/dev/null || true" \
 		"@dirrmtry share/zsh"
 .if !defined(NO_INSTALL_MANPAGES)
 INFO=		monotone
 .endif
-.if !defined(NOPORTDOCS)
-PORTDOCS=	NEWS UPGRADE monotone.html texinfo.css
-.endif
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
@@ -54,19 +54,19 @@
 PLIST_FILES+=	share/locale/de/LC_MESSAGES/monotone.mo \
 		share/locale/es/LC_MESSAGES/monotone.mo \
 		share/locale/it/LC_MESSAGES/monotone.mo \
+		share/locale/pt/LC_MESSAGES/monotone.mo \
 		share/locale/sv/LC_MESSAGES/monotone.mo
-#		share/locale/fr/LC_MESSAGES/monotone.mo \
-#		share/locale/ja/LC_MESSAGES/monotone.mo \
-#		share/locale/pt_BR/LC_MESSAGES/monotone.mo \
 .endif
 
 post-extract:
 	@${RM} -f ${WRKSRC}/monotone.info*
 
 post-patch:
-	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-htmlDATA//' ${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -Ee '/^install-data-am:/,/^$$/s/install-html(figure|image)?DATA //g' ${WRKSRC}/Makefile.in
+.endif
 .if defined(NO_INSTALL_MANPAGES)
-	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-info-am//' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e '/^install-data-am:/,/^$$/s/ install-info-am//' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
@@ -74,7 +74,7 @@
 	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN --exclude=CVS /usr/ports/devel/monotone/distinfo /usr/home/lapo/ports/monotone/distinfo
--- /usr/ports/devel/monotone/distinfo	2009-09-17 12:35:46.000000000 +0200
+++ /usr/home/lapo/ports/monotone/distinfo	2010-06-21 11:48:56.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (monotone-0.45.tar.gz) = bd37c3d75e3fd1974a17f556499b42ab
-SHA256 (monotone-0.45.tar.gz) = 64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec
-SIZE (monotone-0.45.tar.gz) = 4645511
+MD5 (monotone-0.48.tar.gz) = 330a1fe1d92c899d1ad539606f85a9f8
+SHA256 (monotone-0.48.tar.gz) = 3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d
+SIZE (monotone-0.48.tar.gz) = 4792019
Files /usr/ports/devel/monotone/monotone-0.48.tbz and /usr/home/lapo/ports/monotone/monotone-0.48.tbz differ
diff -ruN --exclude=CVS /usr/ports/devel/monotone/mtn-0.4.8-patch2.diff /usr/home/lapo/ports/monotone/mtn-0.4.8-patch2.diff
--- /usr/ports/devel/monotone/mtn-0.4.8-patch2.diff	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/lapo/ports/monotone/mtn-0.4.8-patch2.diff	2010-06-28 12:40:51.000000000 +0200
@@ -0,0 +1,90 @@
+diff -ruN --exclude=CVS /usr/ports/devel/monotone/Makefile /usr/home/lapo/ports/monotone/Makefile
+--- /usr/ports/devel/monotone/Makefile	2010-05-31 03:58:21.000000000 +0200
++++ /usr/home/lapo/ports/monotone/Makefile	2010-06-28 12:40:26.000000000 +0200
+@@ -2,12 +2,11 @@
+ # Date created:                05 Feb 2004
+ # Whom:                        Mark A. Wicks <mwicks@kettering.edu>
+ #
+-# $FreeBSD: ports/devel/monotone/Makefile,v 1.47 2010/05/31 01:58:21 ade Exp $
++# $FreeBSD: ports/devel/monotone/Makefile,v 1.46 2009/10/27 13:38:45 ale Exp $
+ #
+ 
+ PORTNAME=	monotone
+-PORTVERSION=	0.45
+-PORTREVISION=	2
++PORTVERSION=	0.48
+ CATEGORIES=	devel
+ MASTER_SITES=	http://monotone.ca/downloads/${PORTVERSION}/
+ 
+@@ -20,6 +19,9 @@
+ 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ 		botan.0:${PORTSDIR}/security/botan
+ 
++LICENSE=	GPLv2
++LICENSE_FILE=	${WRKSRC}/COPYING
++
+ SUB_FILES=	pkg-message
+ USE_PERL5_BUILD=yes
+ USE_ICONV=	yes
+@@ -32,14 +34,12 @@
+ 		MAKEINFO="makeinfo --no-split"
+ 
+ PLIST_FILES=	bin/mtn bin/mtnopt share/zsh/site-functions/_mtn \
+-		"@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true" \
++		"@unexec [ -f %D/bin/zsh ] || ${RMDIR} %D/share/zsh/site-functions 2>/dev/null || true" \
+ 		"@dirrmtry share/zsh"
+ .if !defined(NO_INSTALL_MANPAGES)
+ INFO=		monotone
+ .endif
+-.if !defined(NOPORTDOCS)
+-PORTDOCS=	NEWS UPGRADE monotone.html texinfo.css
+-.endif
++PORTDOCS=	*
+ 
+ .include <bsd.port.pre.mk>
+ 
+@@ -54,19 +54,19 @@
+ PLIST_FILES+=	share/locale/de/LC_MESSAGES/monotone.mo \
+ 		share/locale/es/LC_MESSAGES/monotone.mo \
+ 		share/locale/it/LC_MESSAGES/monotone.mo \
++		share/locale/pt/LC_MESSAGES/monotone.mo \
+ 		share/locale/sv/LC_MESSAGES/monotone.mo
+-#		share/locale/fr/LC_MESSAGES/monotone.mo \
+-#		share/locale/ja/LC_MESSAGES/monotone.mo \
+-#		share/locale/pt_BR/LC_MESSAGES/monotone.mo \
+ .endif
+ 
+ post-extract:
+ 	@${RM} -f ${WRKSRC}/monotone.info*
+ 
+ post-patch:
+-	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-htmlDATA//' ${WRKSRC}/Makefile.in
++.if defined(NOPORTDOCS)
++	${REINPLACE_CMD} -Ee '/^install-data-am:/,/^$$/s/install-html(figure|image)?DATA //g' ${WRKSRC}/Makefile.in
++.endif
+ .if defined(NO_INSTALL_MANPAGES)
+-	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-info-am//' ${WRKSRC}/Makefile.in
++	${REINPLACE_CMD} -e '/^install-data-am:/,/^$$/s/ install-info-am//' ${WRKSRC}/Makefile.in
+ .endif
+ 
+ post-install:
+@@ -74,7 +74,7 @@
+ 	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
+ .if !defined(NOPORTDOCS)
+ 	${MKDIR} ${DOCSDIR}
+-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
++	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
+ .endif
+ 	@${CAT} ${PKGMESSAGE}
+ 
+diff -ruN --exclude=CVS /usr/ports/devel/monotone/distinfo /usr/home/lapo/ports/monotone/distinfo
+--- /usr/ports/devel/monotone/distinfo	2009-09-17 12:35:46.000000000 +0200
++++ /usr/home/lapo/ports/monotone/distinfo	2010-06-21 11:48:56.000000000 +0200
+@@ -1,3 +1,3 @@
+-MD5 (monotone-0.45.tar.gz) = bd37c3d75e3fd1974a17f556499b42ab
+-SHA256 (monotone-0.45.tar.gz) = 64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec
+-SIZE (monotone-0.45.tar.gz) = 4645511
++MD5 (monotone-0.48.tar.gz) = 330a1fe1d92c899d1ad539606f85a9f8
++SHA256 (monotone-0.48.tar.gz) = 3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d
++SIZE (monotone-0.48.tar.gz) = 4792019
+Files /usr/ports/devel/monotone/monotone-0.48.tbz and /usr/home/lapo/ports/monotone/monotone-0.48.tbz differ