- Fixup after latest textproc/cdiff update

- Convert to staging

PR:		ports/183188
Submitted by:	mat
Approved by:	maintainer

4 files changed, 43 insertions, 19 deletions

diff --git a/ports-mgmt/porttools/Makefile b/ports-mgmt/porttools/Makefile
index c64be73fc754..f179770d764a 100644
--- a/ports-mgmt/porttools/Makefile
+++ b/ports-mgmt/porttools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	porttools
 PORTVERSION=	0.99
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	SF
 
@@ -28,23 +28,12 @@ MAKE_ENV+=	PORTREVISION="${PORTREVISION}"
 MAKE_ENV+=	PORTEPOCH="${PORTEPOCH}"
 .endif
 
-MAN1=		port.1
-MAN5=		porttools.5
-
-OPTIONS_DEFINE=	NEWFILE
+OPTIONS_DEFINE=	DOCS NEWFILE
 OPTIONS_DEFAULT=	NEWFILE
 
 NEWFILE_DESC=	Enable newfile support
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNEWFILE}
-RUN_DEPENDS+=	newfile:${PORTSDIR}/devel/newfile
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET=	install install-docs
-.endif
+NEWFILE_RUN_DEPENDS=	newfile:${PORTSDIR}/devel/newfile
+DOCS_INSTALL_TARGET=	install install-docs
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/porttools/files/patch-Makefile b/ports-mgmt/porttools/files/patch-Makefile
index 4a96e3ac2f48..bb472637f623 100644
--- a/ports-mgmt/porttools/files/patch-Makefile
+++ b/ports-mgmt/porttools/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- ./Makefile.orig	2009-09-09 21:59:59.000000000 +0200
-+++ ./Makefile	2011-11-23 23:11:14.000000000 +0100
++++ ./Makefile	2013-10-22 10:41:23.000000000 +0200
 @@ -9,6 +9,15 @@
  PORTNAME?=	porttools
  PORTVERSION?=	0.99
@@ -16,7 +16,7 @@
  
  PROGRAMS=	port
  SCRIPTS=	cmd_commit cmd_create cmd_diff cmd_fetch cmd_getpr cmd_help \
-@@ -31,8 +40,8 @@
+@@ -31,23 +40,23 @@
  
  .SUFFIXES: .in
  
@@ -27,3 +27,27 @@
  		inc_header.in ${.IMPSRC} > ${.TARGET}
  	chmod a+x ${.TARGET}
  
+ install: ${PROGRAMS} ${SCRIPTS}
+-	${BSD_INSTALL_SCRIPT} ${PROGRAMS} ${PREFIX}/bin
+-	mkdir -p ${DATADIR}
+-	${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${DATADIR}
+-	mkdir -p ${MANPREFIX}/man/man1
+-	${BSD_INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
+-	mkdir -p ${MANPREFIX}/man/man5
+-	${BSD_INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5
++	${BSD_INSTALL_SCRIPT} ${PROGRAMS} ${DESTDIR}${PREFIX}/bin
++	mkdir -p ${DESTDIR}${DATADIR}
++	${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${DESTDIR}${DATADIR}
++	mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
++	${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man/man1
++	mkdir -p ${DESTDIR}${MANPREFIX}/man/man5
++	${BSD_INSTALL_MAN} ${MAN5} ${DESTDIR}${MANPREFIX}/man/man5
+ 
+ install-docs:
+-	mkdir -p ${DOCSDIR}
+-	${BSD_INSTALL_DATA} ${DOCS} ${DOCSDIR}
++	mkdir -p ${DESTDIR}${DOCSDIR}
++	${BSD_INSTALL_DATA} ${DOCS} ${DESTDIR}${DOCSDIR}
+ 
+ clean:
+ 	rm -rf ${PROGRAMS} ${SCRIPTS} ${DISTNAME}*
diff --git a/ports-mgmt/porttools/files/patch-cmd_diff.in b/ports-mgmt/porttools/files/patch-cmd_diff.in
index d877243ae7c0..e385ce70583b 100644
--- a/ports-mgmt/porttools/files/patch-cmd_diff.in
+++ b/ports-mgmt/porttools/files/patch-cmd_diff.in
@@ -1,5 +1,5 @@
---- cmd_diff.in.orig	2009-09-10 04:59:59.000000000 +0900
-+++ cmd_diff.in	2012-12-27 20:13:30.000000000 +0900
+--- cmd_diff.in.orig	2009-09-09 21:59:59.000000000 +0200
++++ cmd_diff.in	2013-10-22 10:37:13.000000000 +0200
 @@ -20,7 +20,7 @@
  Usage: port diff [-h] [-d <diff mode>]
  	-h	- Display this usage summary
@@ -9,3 +9,12 @@
  		<dir> - against Ports tree in <dir>
  		<pattern> - against original port in <pwd><pattern>
  EOF
+@@ -65,7 +65,7 @@
+ 	[ -n "${DIFF_VIEWER}" ] || DIFF_VIEWER="more"
+ fi
+ echo "===> Viewing diff with ${DIFF_VIEWER}"
+-${DIFF_VIEWER} ${PATCH}
++${DIFF_VIEWER} < ${PATCH}
+ 
+ # Cleanup
+ rm -rf ${TEMPROOT}
diff --git a/ports-mgmt/porttools/pkg-plist b/ports-mgmt/porttools/pkg-plist
index 75f8ec904805..b3127e728ee5 100644
--- a/ports-mgmt/porttools/pkg-plist
+++ b/ports-mgmt/porttools/pkg-plist
@@ -1,5 +1,7 @@
 @comment $FreeBSD$
 bin/port
+man/man1/port.1.gz
+man/man5/porttools.5.gz
 %%DATADIR%%/cmd_commit
 %%DATADIR%%/cmd_create
 %%DATADIR%%/cmd_diff