Date: Tue, 22 Oct 2013 10:53:10 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: joemann@beefree.free.de Subject: ports/183182: [PATCH] ports-mgmt/porttools: Fixup with latest textproc/cdiff and add staging Message-ID: <20131022085310.247E514269C@aragorn.in.absolight.net> Resent-Message-ID: <201310220900.r9M900ua036714@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183182
>Category: ports
>Synopsis: [PATCH] ports-mgmt/porttools: Fixup with latest textproc/cdiff and add staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 22 09:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
- Fixup with latest textproc/cdiff
- Support staging
- Convert to new OPTIONS framework
Port maintainer (joemann@beefree.free.de) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- porttools-0.99_9.patch begins here ---
diff -ruN /usr/ports/ports-mgmt/porttools/Makefile ./Makefile
--- /usr/ports/ports-mgmt/porttools/Makefile 2013-09-21 00:36:49.000000000 +0200
+++ ./Makefile 2013-10-22 10:43:42.000000000 +0200
@@ -1,9 +1,9 @@
# Created by: Sergei Kolobov <sergei@kolobov.com>
# $FreeBSD: ports-mgmt/porttools/Makefile 327762 2013-09-20 22:36:49Z bapt $
PORTNAME= porttools
PORTVERSION= 0.99
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= ports-mgmt
MASTER_SITES= SF
@@ -28,23 +28,12 @@
MAKE_ENV+= PORTEPOCH="${PORTEPOCH}"
.endif
-MAN1= port.1
-MAN5= porttools.5
-
-OPTIONS_DEFINE= NEWFILE
+OPTIONS_DEFINE= NEWFILE DOCS
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 -ruN /usr/ports/ports-mgmt/porttools/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/ports-mgmt/porttools/files/patch-Makefile 2013-03-02 01:40:53.000000000 +0100
+++ ./files/patch-Makefile 2013-10-22 10:41:28.000000000 +0200
@@ -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 -ruN /usr/ports/ports-mgmt/porttools/files/patch-cmd_diff.in ./files/patch-cmd_diff.in
--- /usr/ports/ports-mgmt/porttools/files/patch-cmd_diff.in 2013-03-02 01:40:53.000000000 +0100
+++ ./files/patch-cmd_diff.in 2013-10-22 10:44:21.000000000 +0200
@@ -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 -ruN /usr/ports/ports-mgmt/porttools/pkg-plist ./pkg-plist
--- /usr/ports/ports-mgmt/porttools/pkg-plist 2012-07-14 16:29:18.000000000 +0200
+++ ./pkg-plist 2013-10-22 10:42:19.000000000 +0200
@@ -1,5 +1,7 @@
@comment $FreeBSD: ports-mgmt/porttools/pkg-plist 300897 2012-07-14 14:29:18Z beat $
bin/port
+man/man1/port.1.gz
+man/man5/porttools.5.gz
%%DATADIR%%/cmd_commit
%%DATADIR%%/cmd_create
%%DATADIR%%/cmd_diff
--- porttools-0.99_9.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022085310.247E514269C>