From df8eeaffbc33900a39cefd9c080af1549fe28763 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 17 Feb 2014 13:46:27 +0000 Subject: [PATCH] Convert to staging. Sponsored by: Absolight --- textproc/2bsd-diff/Makefile | 3 +-- textproc/2bsd-diff/files/patch-Makefile | 10 +++++----- textproc/2bsd-diff/pkg-plist | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 textproc/2bsd-diff/pkg-plist diff --git a/textproc/2bsd-diff/Makefile b/textproc/2bsd-diff/Makefile index 0fed3b6f3624..21ee75cb6dee 100644 --- a/textproc/2bsd-diff/Makefile +++ b/textproc/2bsd-diff/Makefile @@ -17,9 +17,8 @@ CFLAGS+= -Wno-error=return-type EXTRACT_AFTER_ARGS= bin/diff man/man1/diff.1 WRKSRC= ${WRKDIR}/bin/diff -MAN1= 2diff.1 +PLIST_FILES= bin/2diff libexec/2diffh man/man1/2diff.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/../../man/man1/diff.1 diff --git a/textproc/2bsd-diff/files/patch-Makefile b/textproc/2bsd-diff/files/patch-Makefile index 7bb318b354b7..c483bcbf9a09 100644 --- a/textproc/2bsd-diff/files/patch-Makefile +++ b/textproc/2bsd-diff/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Oct 22 13:29:46 1996 -+++ Makefile Wed Mar 19 01:29:12 2003 +--- ./Makefile.orig 1996-10-22 04:29:46.000000000 +0000 ++++ ./Makefile 2014-02-17 13:43:18.000000000 +0000 @@ -1,9 +1,9 @@ # @(#)Makefile 4.1.1 1996/10/21 # @@ -31,6 +31,6 @@ install: all - install -s diff ${DESTDIR}/bin/diff - install -s diffh ${DESTDIR}/usr/libexec/diffh -+ ${BSD_INSTALL_PROGRAM} diff ${DIFF} -+ ${BSD_INSTALL_PROGRAM} diffh ${DIFFH} -+ ${BSD_INSTALL_MAN} ../../man/man1/diff.1 ${MANPREFIX}/man/man1/2diff.1 ++ ${BSD_INSTALL_PROGRAM} diff ${DESTDIR}${DIFF} ++ ${BSD_INSTALL_PROGRAM} diffh ${DESTDIR}${DIFFH} ++ ${BSD_INSTALL_MAN} ../../man/man1/diff.1 ${DESTDIR}${MANPREFIX}/man/man1/2diff.1 diff --git a/textproc/2bsd-diff/pkg-plist b/textproc/2bsd-diff/pkg-plist deleted file mode 100644 index e71ed99c1daa..000000000000 --- a/textproc/2bsd-diff/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/2diff -libexec/2diffh