6 files changed, 30 insertions, 38 deletions

diff --git a/devel/porttools/Makefile b/devel/porttools/Makefile
index 48170f55dfb3..0597e1409fbb 100644
--- a/devel/porttools/Makefile
+++ b/devel/porttools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	porttools
-PORTVERSION=	0.26
+PORTVERSION=	0.50
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,20 +17,12 @@ COMMENT=	Tools for testing and submitting port updates and new ports
 RUN_DEPENDS=	portlint:${PORTSDIR}/devel/portlint \
 		sudo:${PORTSDIR}/security/sudo
 
-NO_BUILD=	yes
-
-SCRIPTS=	pr-update testport
-MAN1=		pr-change.1 pr-new.1 pr-update.1 testport.1
-DOCS=		LICENSE NEWS README THANKS TODO
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-	${LN} ${PREFIX}/bin/pr-update ${PREFIX}/bin/pr-change
-	${LN} ${PREFIX}/bin/pr-update ${PREFIX}/bin/pr-new
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+INSTALL_TARGET=	install install-docs
 .endif
 
+MAKE_ENV=	PREFIX="${PREFIX}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
+MAN1=		port.1
+MAN5=		porttools.5
+
 .include <bsd.port.mk>
diff --git a/devel/porttools/distinfo b/devel/porttools/distinfo
index 79cd485f0368..0c19888ba949 100644
--- a/devel/porttools/distinfo
+++ b/devel/porttools/distinfo
@@ -1 +1 @@
-MD5 (porttools-0.26.tar.gz) = 9557a8c81bd3eaabef898778f305fbdc
+MD5 (porttools-0.50.tar.gz) = 51ceae820b3f9ed2114ff6adfc09606f
diff --git a/devel/porttools/pkg-plist b/devel/porttools/pkg-plist
index 7fd4c09fa693..3d7b3ced22fe 100644
--- a/devel/porttools/pkg-plist
+++ b/devel/porttools/pkg-plist
@@ -1,8 +1,12 @@
 @comment $FreeBSD$
-bin/pr-change
-bin/pr-new
-bin/pr-update
-bin/testport
+bin/port
+%%DATADIR%%/cmd_create
+%%DATADIR%%/cmd_diff
+%%DATADIR%%/cmd_fetch
+%%DATADIR%%/cmd_help
+%%DATADIR%%/cmd_submit
+%%DATADIR%%/cmd_test
+%%DATADIR%%/util_diff
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/ports-mgmt/porttools/Makefile b/ports-mgmt/porttools/Makefile
index 48170f55dfb3..0597e1409fbb 100644
--- a/ports-mgmt/porttools/Makefile
+++ b/ports-mgmt/porttools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	porttools
-PORTVERSION=	0.26
+PORTVERSION=	0.50
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,20 +17,12 @@ COMMENT=	Tools for testing and submitting port updates and new ports
 RUN_DEPENDS=	portlint:${PORTSDIR}/devel/portlint \
 		sudo:${PORTSDIR}/security/sudo
 
-NO_BUILD=	yes
-
-SCRIPTS=	pr-update testport
-MAN1=		pr-change.1 pr-new.1 pr-update.1 testport.1
-DOCS=		LICENSE NEWS README THANKS TODO
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-	${LN} ${PREFIX}/bin/pr-update ${PREFIX}/bin/pr-change
-	${LN} ${PREFIX}/bin/pr-update ${PREFIX}/bin/pr-new
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+INSTALL_TARGET=	install install-docs
 .endif
 
+MAKE_ENV=	PREFIX="${PREFIX}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
+MAN1=		port.1
+MAN5=		porttools.5
+
 .include <bsd.port.mk>
diff --git a/ports-mgmt/porttools/distinfo b/ports-mgmt/porttools/distinfo
index 79cd485f0368..0c19888ba949 100644
--- a/ports-mgmt/porttools/distinfo
+++ b/ports-mgmt/porttools/distinfo
@@ -1 +1 @@
-MD5 (porttools-0.26.tar.gz) = 9557a8c81bd3eaabef898778f305fbdc
+MD5 (porttools-0.50.tar.gz) = 51ceae820b3f9ed2114ff6adfc09606f
diff --git a/ports-mgmt/porttools/pkg-plist b/ports-mgmt/porttools/pkg-plist
index 7fd4c09fa693..3d7b3ced22fe 100644
--- a/ports-mgmt/porttools/pkg-plist
+++ b/ports-mgmt/porttools/pkg-plist
@@ -1,8 +1,12 @@
 @comment $FreeBSD$
-bin/pr-change
-bin/pr-new
-bin/pr-update
-bin/testport
+bin/port
+%%DATADIR%%/cmd_create
+%%DATADIR%%/cmd_diff
+%%DATADIR%%/cmd_fetch
+%%DATADIR%%/cmd_help
+%%DATADIR%%/cmd_submit
+%%DATADIR%%/cmd_test
+%%DATADIR%%/util_diff
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/NEWS