. add LICENSE=GPLv2;

. remove shlib ABI version number from LIB_DEPENDS;
. bump PORTREVISION;
. trim Makefile headers;
. define PORTDOCS at Makefile;
. remove PORTDOCS lines from pkg-plist;
. NOPORTDOCS -> PORT_OPTIONS:MDOCS;
. use plain install instead .for loops.

4 files changed, 25 insertions, 36 deletions

diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index 5e012855c2ba..4a00d3bf25e9 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	rdiff-backup-devel
-# Date created:				10 Nov 2005
-# Whom:					Vasil Dimov <vd@datamax.bg>
-#
+# Created by: Vasil Dimov <vd@datamax.bg>
 # $FreeBSD$
-#
 
 PORTNAME=	rdiff-backup
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -18,7 +15,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Local/remote mirroring+incremental backup
 
-LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
 
 CONFLICTS=	rdiff-backup-[0-9]*
 
@@ -27,17 +26,17 @@ USE_PYDISTUTILS=yes
 
 MAN1=		rdiff-backup.1 rdiff-backup-statistics.1
 
-DOCFILES=	CHANGELOG README COPYING FAQ.html
+PORTDOCS=	CHANGELOG README COPYING FAQ.html
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 post-install:
-.for man in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${man} ${PREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
+	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/rdiff-backup-devel/pkg-plist b/sysutils/rdiff-backup-devel/pkg-plist
index 7e16003dc242..23fa6a3cfc84 100644
--- a/sysutils/rdiff-backup-devel/pkg-plist
+++ b/sysutils/rdiff-backup-devel/pkg-plist
@@ -104,9 +104,4 @@ bin/rdiff-backup-statistics
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/rdiff_backup
diff --git a/sysutils/rdiff-backup10/Makefile b/sysutils/rdiff-backup10/Makefile
index 94f318cc3d99..dd846292ca4c 100644
--- a/sysutils/rdiff-backup10/Makefile
+++ b/sysutils/rdiff-backup10/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	rdiff-backup
-# Date created:		Wed Jun 11 19:53:46 CEST 2003
-# Whom:			Gerhard Häring <gh@ghaering.de>
-#
+# Created by: Gerhard Häring <gh@ghaering.de>
 # $FreeBSD$
-#
 
 PORTNAME=	rdiff-backup
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
@@ -19,7 +15,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Local/remote mirroring+incremental backup
 
-LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
 
 NO_LATEST_LINK=	yes
 CONFLICTS=	rdiff-backup-1.2* rdiff-backup-devel-[0-9]*
@@ -29,15 +27,17 @@ USE_PYDISTUTILS=yes
 
 MAN1=		rdiff-backup.1
 
-DOCFILES=	CHANGELOG README COPYING FAQ.html
+PORTDOCS=	CHANGELOG README COPYING FAQ.html
+
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/rdiff-backup.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/rdiff-backup10/pkg-plist b/sysutils/rdiff-backup10/pkg-plist
index c2103b488cbc..4edf90a9fd59 100644
--- a/sysutils/rdiff-backup10/pkg-plist
+++ b/sysutils/rdiff-backup10/pkg-plist
@@ -91,9 +91,4 @@ bin/rdiff-backup
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/rdiff_backup