Date: Wed, 6 Nov 2013 12:25:52 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332978 - in head/ports-mgmt/porttools: . files Message-ID: <201311061225.rA6CPqL4066415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Nov 6 12:25:51 2013 New Revision: 332978 URL: http://svnweb.freebsd.org/changeset/ports/332978 Log: - Fixup after latest textproc/cdiff update - Convert to staging PR: ports/183188 Submitted by: mat Approved by: maintainer Modified: head/ports-mgmt/porttools/Makefile head/ports-mgmt/porttools/files/patch-Makefile head/ports-mgmt/porttools/files/patch-cmd_diff.in head/ports-mgmt/porttools/pkg-plist Modified: head/ports-mgmt/porttools/Makefile ============================================================================== --- head/ports-mgmt/porttools/Makefile Wed Nov 6 12:25:00 2013 (r332977) +++ head/ports-mgmt/porttools/Makefile Wed Nov 6 12:25:51 2013 (r332978) @@ -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> Modified: head/ports-mgmt/porttools/files/patch-Makefile ============================================================================== --- head/ports-mgmt/porttools/files/patch-Makefile Wed Nov 6 12:25:00 2013 (r332977) +++ head/ports-mgmt/porttools/files/patch-Makefile Wed Nov 6 12:25:51 2013 (r332978) @@ -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}* Modified: head/ports-mgmt/porttools/files/patch-cmd_diff.in ============================================================================== --- head/ports-mgmt/porttools/files/patch-cmd_diff.in Wed Nov 6 12:25:00 2013 (r332977) +++ head/ports-mgmt/porttools/files/patch-cmd_diff.in Wed Nov 6 12:25:51 2013 (r332978) @@ -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} Modified: head/ports-mgmt/porttools/pkg-plist ============================================================================== --- head/ports-mgmt/porttools/pkg-plist Wed Nov 6 12:25:00 2013 (r332977) +++ head/ports-mgmt/porttools/pkg-plist Wed Nov 6 12:25:51 2013 (r332978) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311061225.rA6CPqL4066415>