From fcc5a766083f8a995807351dd30601c55af45f1d Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 22 Aug 2017 16:33:59 +0000 Subject: [PATCH] - Rename misc/lr to misc/lazyread to reflect upstream name and avoid conflicts with sysutils/lr - Simplify and fix lesspipe.sh handling (add missing argument, and assume it always exists) - Cleanup and simplify the port PR: 221206 Approved by: maintainer timeout (mich, 2 weeks) --- MOVED | 1 + misc/Makefile | 2 +- misc/lazyread/Makefile | 31 ++++++++++++++++ misc/{lr => lazyread}/distinfo | 1 + misc/lazyread/files/patch-lazyread.c | 11 ++++++ misc/{lr => lazyread}/pkg-descr | 5 +-- misc/lr/Makefile | 53 ---------------------------- misc/lr/files/lesspipe.sh | 13 ------- misc/lr/pkg-plist | 3 -- 9 files changed, 46 insertions(+), 74 deletions(-) create mode 100644 misc/lazyread/Makefile rename misc/{lr => lazyread}/distinfo (85%) create mode 100644 misc/lazyread/files/patch-lazyread.c rename misc/{lr => lazyread}/pkg-descr (82%) delete mode 100644 misc/lr/Makefile delete mode 100644 misc/lr/files/lesspipe.sh delete mode 100644 misc/lr/pkg-plist diff --git a/MOVED b/MOVED index 9ed1f841cc67..b617ef471f54 100644 --- a/MOVED +++ b/MOVED @@ -9505,3 +9505,4 @@ graphics/rawtherapee-devel|graphics/rawtherapee|2017-08-12|Removed test release audio/py-jack|audio/py-py-jack|2017-08-20|Renamed to py-py-jack to match PyPI package name lang/whitespace||2017-08-21|Has expired: Mastersite disappeared databases/sqlitebrowser-qt5|databases/sqlitebrowser|2017-08-22|sqlitebrowser now uses QT5 +misc/lr|misc/lazyread|2017-08-22|Renamed to reflect upstream name diff --git a/misc/Makefile b/misc/Makefile index e3681397f75e..f4cc914fb77a 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -241,6 +241,7 @@ SUBDIR += ktouch SUBDIR += kwordquiz SUBDIR += latex-mk + SUBDIR += lazyread SUBDIR += lc SUBDIR += lesspipe SUBDIR += libeatmydata @@ -256,7 +257,6 @@ SUBDIR += localedata SUBDIR += logsurfer SUBDIR += loop - SUBDIR += lr SUBDIR += lv SUBDIR += lxde-common SUBDIR += magicpoint diff --git a/misc/lazyread/Makefile b/misc/lazyread/Makefile new file mode 100644 index 000000000000..042296f6aff2 --- /dev/null +++ b/misc/lazyread/Makefile @@ -0,0 +1,31 @@ +# Created by: Michael L. Hostbaek (mich@freebsdcluster.org) +# $FreeBSD$ + +PORTNAME= lazyread +PORTVERSION= 2.0 +CATEGORIES= misc +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} + +MAINTAINER= mich@FreeBSD.org +COMMENT= Lazyread can auto-scroll files on your screen in movie credit fashion + +USES= ncurses + +LDFLAGS+= -lncurses + +PLIST_FILES= bin/${PORTNAME} +PORTDOCS= * + +OPTIONS_DEFINE= DOCS + +do-build: + cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} lazyread.c ${LDFLAGS} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +.include diff --git a/misc/lr/distinfo b/misc/lazyread/distinfo similarity index 85% rename from misc/lr/distinfo rename to misc/lazyread/distinfo index 84a0b733fa9a..ec57cb62057a 100644 --- a/misc/lr/distinfo +++ b/misc/lazyread/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1501778211 SHA256 (lazyread-2.0.tar.gz) = 7e462c5c9fe104d69e410c537336af838a30a030699dd9320f75fe85a20746a1 SIZE (lazyread-2.0.tar.gz) = 12583 diff --git a/misc/lazyread/files/patch-lazyread.c b/misc/lazyread/files/patch-lazyread.c new file mode 100644 index 000000000000..6351571b7bed --- /dev/null +++ b/misc/lazyread/files/patch-lazyread.c @@ -0,0 +1,11 @@ +--- lazyread.c.orig 2003-02-02 13:28:15 UTC ++++ lazyread.c +@@ -377,7 +377,7 @@ char qfilename[BUFMAX]; /* quoted filena + + printf("Loading..\n"); + /* $LESSOPEN will look like: |/usr/bin/lesspipe.sh %s */ +- lesspipe = getenv("LESSOPEN"); ++ lesspipe = "|/usr/bin/lesspipe.sh %s"; + if (lesspipe) { + /* strip off the leading | */ + if ((c = strchr(lesspipe, '|'))) { diff --git a/misc/lr/pkg-descr b/misc/lazyread/pkg-descr similarity index 82% rename from misc/lr/pkg-descr rename to misc/lazyread/pkg-descr index 7eb503db30d8..2d2597e74e1f 100644 --- a/misc/lr/pkg-descr +++ b/misc/lazyread/pkg-descr @@ -5,7 +5,4 @@ features, such as being able to choose the speed at which it scrolls, pause, dynamic speed up, the ability to highlight lines that contain a specified string, and much more. -WWW: http://lazyread.sourceforge.net - - - Michael L. Hostbaek - mich@FreeBSD.org +WWW: http://lazyread.sourceforge.net/ diff --git a/misc/lr/Makefile b/misc/lr/Makefile deleted file mode 100644 index 0b4fa7c77866..000000000000 --- a/misc/lr/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# Created by: Michael L. Hostbaek (mich@freebsdcluster.org) -# $FreeBSD$ - -PORTNAME= lr -PORTVERSION= 2.0 -CATEGORIES= misc -MASTER_SITES= SF/lazyread/lazyread/lazyread%20${PORTVERSION} -DISTNAME= lazyread-${PORTVERSION} - -MAINTAINER= mich@FreeBSD.org -COMMENT= Lazyread can auto-scroll files on your screen in movie credit fashion - -USES= ncurses -OPTIONS_DEFINE= DOCS - -CONFLICTS_INSTALL= lrfiles-[0-9]* - -.include - -.if exists(/usr/bin/lesspipe.sh) -LESSPIPE_PATH=/usr/bin/ -PLIST_SUB+= LESSPIPE="@comment " -.else -.if exists(${LOCALBASE}/bin/lesspipe.sh) -LESSPIPE_PATH=${LOCALBASE}/bin/ -PLIST_SUB+= LESSPIPE="@comment " -.else -INSTALL_LESSPIPE=1 -LESSPIPE_PATH=${LOCALBASE}/bin/ -PLIST_SUB+= LESSPIPE="" -.endif -.endif - -LDFLAGS+= -lncurses -WRKSRC= ${WRKDIR}/${DISTNAME} - -pre-patch: - @${REINPLACE_CMD} -e 's|getenv("LESSOPEN")|"\|${LESSPIPE_PATH}lesspipe.sh"|' ${WRKSRC}/lazyread.c - -do-build: - cd ${WRKSRC}; ${CC} ${CFLAGS} -o lr lazyread.c ${LDFLAGS} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lr ${STAGEDIR}${PREFIX}/bin - -.if defined(INSTALL_LESSPIPE) - ${INSTALL_SCRIPT} ${FILESDIR}/lesspipe.sh ${STAGEDIR}${PREFIX}/bin -.endif - - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - -.include diff --git a/misc/lr/files/lesspipe.sh b/misc/lr/files/lesspipe.sh deleted file mode 100644 index 21cf0243cbf0..000000000000 --- a/misc/lr/files/lesspipe.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh -# ex:ts=8 - -# $FreeBSD: /tmp/pcvs/ports/misc/lr/files/lesspipe.sh,v 1.1 2003-04-13 10:43:20 edwin Exp $ - -case "$1" in - *.Z) uncompress -c $1 2>/dev/null - ;; - *.gz) gzip -d -c $1 2>/dev/null - ;; - *.bz2) bzip2 -d -c $1 2>/dev/null - ;; -esac diff --git a/misc/lr/pkg-plist b/misc/lr/pkg-plist deleted file mode 100644 index bb561e4b89f3..000000000000 --- a/misc/lr/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/lr -%%LESSPIPE%%bin/lesspipe.sh -%%PORTDOCS%%%%DOCSDIR%%/README