Date: Tue, 22 Aug 2017 16:34:00 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448545 - in head: . misc misc/lazyread misc/lazyread/files misc/lr Message-ID: <201708221634.v7MGY00Y089612@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Aug 22 16:33:59 2017 New Revision: 448545 URL: https://svnweb.freebsd.org/changeset/ports/448545 Log: - 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) Added: head/misc/lazyread/ - copied from r448544, head/misc/lr/ head/misc/lazyread/files/patch-lazyread.c (contents, props changed) Deleted: head/misc/lazyread/files/lesspipe.sh head/misc/lazyread/pkg-plist head/misc/lr/ Modified: head/MOVED head/misc/Makefile head/misc/lazyread/Makefile head/misc/lazyread/distinfo head/misc/lazyread/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Tue Aug 22 16:26:13 2017 (r448544) +++ head/MOVED Tue Aug 22 16:33:59 2017 (r448545) @@ -9505,3 +9505,4 @@ graphics/rawtherapee-devel|graphics/rawtherapee|2017-0 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 Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Tue Aug 22 16:26:13 2017 (r448544) +++ head/misc/Makefile Tue Aug 22 16:33:59 2017 (r448545) @@ -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 Modified: head/misc/lazyread/Makefile ============================================================================== --- head/misc/lr/Makefile Tue Aug 22 16:26:13 2017 (r448544) +++ head/misc/lazyread/Makefile Tue Aug 22 16:33:59 2017 (r448545) @@ -1,53 +1,31 @@ # Created by: Michael L. Hostbaek (mich@freebsdcluster.org) # $FreeBSD$ -PORTNAME= lr +PORTNAME= lazyread PORTVERSION= 2.0 CATEGORIES= misc -MASTER_SITES= SF/lazyread/lazyread/lazyread%20${PORTVERSION} -DISTNAME= lazyread-${PORTVERSION} +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 -OPTIONS_DEFINE= DOCS -CONFLICTS_INSTALL= lrfiles-[0-9]* - -.include <bsd.port.pre.mk> - -.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 +PLIST_FILES= bin/${PORTNAME} +PORTDOCS= * +OPTIONS_DEFINE= DOCS + do-build: - cd ${WRKSRC}; ${CC} ${CFLAGS} -o lr lazyread.c ${LDFLAGS} + cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} lazyread.c ${LDFLAGS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lr ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.if defined(INSTALL_LESSPIPE) - ${INSTALL_SCRIPT} ${FILESDIR}/lesspipe.sh ${STAGEDIR}${PREFIX}/bin -.endif - +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/misc/lazyread/distinfo ============================================================================== --- head/misc/lr/distinfo Tue Aug 22 16:26:13 2017 (r448544) +++ head/misc/lazyread/distinfo Tue Aug 22 16:33:59 2017 (r448545) @@ -1,2 +1,3 @@ +TIMESTAMP = 1501778211 SHA256 (lazyread-2.0.tar.gz) = 7e462c5c9fe104d69e410c537336af838a30a030699dd9320f75fe85a20746a1 SIZE (lazyread-2.0.tar.gz) = 12583 Added: head/misc/lazyread/files/patch-lazyread.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/lazyread/files/patch-lazyread.c Tue Aug 22 16:33:59 2017 (r448545) @@ -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, '|'))) { Modified: head/misc/lazyread/pkg-descr ============================================================================== --- head/misc/lr/pkg-descr Tue Aug 22 16:26:13 2017 (r448544) +++ head/misc/lazyread/pkg-descr Tue Aug 22 16:33:59 2017 (r448545) @@ -5,7 +5,4 @@ features, such as being able to choose the speed at wh 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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708221634.v7MGY00Y089612>