[96281] trunk/dports/textproc/pinfo
ryandesign at macports.org
ryandesign at macports.org
Mon Aug 6 19:38:12 PDT 2012
Revision: 96281
https://trac.macports.org/changeset/96281
Author: ryandesign at macports.org
Date: 2012-08-06 19:38:08 -0700 (Mon, 06 Aug 2012)
Log Message:
-----------
pinfo:
* update to 0.6.10 (#35549)
* license GPL-2
* use bzip2 distfile
* use autoreconf
* blacklist clang on Xcode 4.4 and up (#35546)
* add missing dependencies on ncurses and readline (#35547)
* enable natural language support and add gettext dependency
* use a patchfile instead of a pure reinplace
* add patches from debian to fix typos in documentation, fix mishandling of files whose names begin with "dir", and ensure we don't close a file that hasn't been opened
* add configure.args to specify the location of ncurses and readline so headers from the system version don't get used
* fix livecheck
Modified Paths:
--------------
trunk/dports/textproc/pinfo/Portfile
Added Paths:
-----------
trunk/dports/textproc/pinfo/files/
trunk/dports/textproc/pinfo/files/patch-doc-pinfo.1.in.diff
trunk/dports/textproc/pinfo/files/patch-doc-pinfo.texi.diff
trunk/dports/textproc/pinfo/files/patch-src-datatypes.c.diff
trunk/dports/textproc/pinfo/files/patch-src-filehandling_functions.c.diff
Modified: trunk/dports/textproc/pinfo/Portfile
===================================================================
--- trunk/dports/textproc/pinfo/Portfile 2012-08-07 02:20:28 UTC (rev 96280)
+++ trunk/dports/textproc/pinfo/Portfile 2012-08-07 02:38:08 UTC (rev 96281)
@@ -2,9 +2,11 @@
PortSystem 1.0
name pinfo
-version 0.6.9
+version 0.6.10
categories textproc
maintainers iaas.msu.ru:master
+license GPL-2
+
description Pinfo - Ncurses based info documentation browser
long_description \
Pinfo is a hypertext info file viewer \
@@ -16,15 +18,34 @@
platforms darwin
homepage http://pinfo.alioth.debian.org/
-master_sites http://alioth.debian.org/download.php/1502/
+master_sites http://alioth.debian.org/frs/download.php/3351
+use_bzip2 yes
-checksums md5 c3298d36537601753558b3e9240b00b7
+checksums rmd160 46d6990cda262f50ea4682d5ff94d4e15d91111a \
+ sha256 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d
-pre-patch {
- reinplace "s#/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info#/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info:${prefix}/share/info#" "${worksrcpath}/src/datatypes.c"
- }
+depends_lib port:gettext \
+ port:ncurses \
+ port:readline
-configure.cflags-append -I${prefix}/include
+patchfiles patch-doc-pinfo.1.in.diff \
+ patch-doc-pinfo.texi.diff \
+ patch-src-datatypes.c.diff \
+ patch-src-filehandling_functions.c.diff
-configure.args --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
- --with-ncurses --disable-nls
+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/datatypes.c
+}
+
+use_autoreconf yes
+
+configure.args --with-curses=${prefix} \
+ --with-readline=${prefix}
+
+if {[vercmp ${xcodeversion} 4.4] >= 0} {
+ compiler.blacklist clang
+}
+
+livecheck.type regex
+livecheck.url https://alioth.debian.org/frs/?group_id=30592
+livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
Added: trunk/dports/textproc/pinfo/files/patch-doc-pinfo.1.in.diff
===================================================================
--- trunk/dports/textproc/pinfo/files/patch-doc-pinfo.1.in.diff (rev 0)
+++ trunk/dports/textproc/pinfo/files/patch-doc-pinfo.1.in.diff 2012-08-07 02:38:08 UTC (rev 96281)
@@ -0,0 +1,68 @@
+--- doc/pinfo.1.in.orig 2006-03-09 23:54:43.000000000 +0300
++++ doc/pinfo.1.in 2012-08-06 14:44:33.000000000 +0400
+@@ -27,7 +27,7 @@
+ .IR "filehandling_functions.c".
+ .P
+ When the search for info pages fails, man is called with the infopage
+-argument, and it's output is parsed by pinfo. This means that when you don't
++argument, and its output is parsed by pinfo. This means that when you don't
+ have the appropriate info page, but have a man page instead; the man page
+ will be viewed.
+ .P
+@@ -53,10 +53,10 @@
+ .P
+ You can also call the man function of pinfo in another way. When pinfo is
+ called with an argv[0] (the program file name), which contains the word 'man'
+-in it's name, the man functions are enabled automatically.
++in its name, the man functions are enabled automatically.
+ .P
+ Previously there was a symlink to pinfo, called pman, but I had to remove it
+-from the distribution, since it's name was in conflict with some other
++from the distribution, since its name was in conflict with some other
+ utility. Anyway, you can feel free to create such a link if you wish.
+ .P
+ .BR "-r",
+@@ -188,7 +188,7 @@
+ KEY_BACK_1=KEY_LEFT
+ KEY_BACK_2='l'
+ KEY_FOLLOWLINK_1=KEY_RIGHT
+-KEY_FOLLOWLINK_2='\n'
++KEY_FOLLOWLINK_2='\\n'
+ # 12 is a code for ctrl+l
+ KEY_REFRESH_1=12
+ KEY_REFRESH_2='~'
+@@ -237,10 +237,10 @@
+ blinking attribute, or highlighted background in some other configurations.
+ .P
+ Now let's move to the key definitions. Here we first put a key name (again
+-all keys are present in the example); then we enter it's value -- either
++all keys are present in the example); then we enter its value -- either
+ surrounded
+ by apostrophes, or a keycode number (like in KEY_REFRESH_1), or its mnemonic
+-code name if it's a special key (like i.e. in KEY_FOLLOWLINK_1).
++code name if its a special key (like i.e. in KEY_FOLLOWLINK_1).
+ .P
+ If you wish to specify key by code value, use the supplied program 'testkey'
+ to obtain the needed value. It mainly is a feature, when you want to add
+@@ -274,10 +274,10 @@
+ Alternate key for repeating the last search.
+ .TP
+ .B KEY_GOTO_1
+-Key for explicitly going to a node (by specifying it's name).
++Key for explicitly going to a node (by specifying its name).
+ .TP
+ .B KEY_GOTO_2
+-Alternate key for explicitly going to a node (by specifying it's name).
++Alternate key for explicitly going to a node (by specifying its name).
+ .TP
+ .B KEY_PREVNODE_1
+ Key for going to a node marked as 'Prev' in the header. In man page viewer
+@@ -441,7 +441,7 @@
+ C/C++ ;).
+ .TP
+ .B [number]
+-\- you can also specify key as it's code number. It is useful e.g. when
++\- you can also specify key as its code number. It is useful e.g. when
+ specifying control keys, and some nonstandard keys.
+ A numerical value of zero turns given key binding off.
+ .sp
Added: trunk/dports/textproc/pinfo/files/patch-doc-pinfo.texi.diff
===================================================================
--- trunk/dports/textproc/pinfo/files/patch-doc-pinfo.texi.diff (rev 0)
+++ trunk/dports/textproc/pinfo/files/patch-doc-pinfo.texi.diff 2012-08-07 02:38:08 UTC (rev 96281)
@@ -0,0 +1,121 @@
+--- doc/pinfo.texi.orig 2006-03-16 18:40:38.000000000 +0300
++++ doc/pinfo.texi 2012-08-06 12:11:37.000000000 +0400
+@@ -60,13 +60,13 @@
+ @value{DATE}.
+
+ @menu
+-* Invoking:: Comman line options.
++* Invoking:: Command line options.
+ * Configuration:: Configurable behaviour of pinfo.
+ * Internationalization Support:: Localization.
+ * Author:: Who wrote pinfo.
+ * Bugs:: Help debugging.
+ * Copyright:: Copying.
+-* Index:: Search.
++* Index:: Index.
+
+ @detailmenu
+ --- The Detailed Node Listing ---
+@@ -80,7 +80,7 @@
+
+ * Color:: Color settings.
+ * Keys:: Bindable keyboard.
+-* Options:: Confiruration options.
++* Options:: Configuration options.
+ * Example config file:: Build in values.
+
+ Keys
+@@ -100,8 +100,7 @@
+ @value{PROGRAM} [@var{options}] [@var{info_page}]
+
+ @value{PROGRAM} is a program for viewing info files. You specify which
+-page you want to read by passing it an @var{info_page} argument. This argumen
+-t
++page you want to read by passing it an @var{info_page} argument. This argument
+ contains the name of an info page (i.e. @samp{bash}). The program
+ will then (by default) search for it in the current diectory, @file{/usr/share/info},
+ @file{/usr/info}, @file{/usr/local/share/info}, @file{/usr/local/info},
+@@ -113,7 +112,7 @@
+ to the function @code{openinfo()} in @file{filehandling_functions.c}.
+
+ When the search for info pages fails, man is called with the @var{info_page}
+-argument, and it's output is parsed by @value{PROGRAM}. This means that
++argument, and its output is parsed by @value{PROGRAM}. This means that
+ when you don't have the appropriate info page, but have a man page
+ instead; the man page will be viewed.
+
+@@ -132,16 +131,16 @@
+ could be used as a manual pager). Warning: Everything what follows this
+ option is passed to the @code{man} program. Don't be confused if
+ @value{PROGRAM} options, which followed @samp{-m} don't work.
+-When using this option, pinfo does not parse the info options as ussual!
++When using this option, pinfo does not parse the info options as usual!
+ It invokes the man part of program.
+
+ You can also call the man function of @value{PROGRAM} in another way.
+ When @value{PROGRAM} is called with an @code{argv[0]} (the program file
+-name), which contains the word @code{man} in it's name, the man
++name), which contains the word @code{man} in its name, the man
+ functions are enabled automatically.
+
+ Previously there was a symlink to @value{PROGRAM}, called @code{pman},
+-but I had to remove it from the distribution, since it's name was in
++but I had to remove it from the distribution, since its name was in
+ conflict with some other utility. Anyway, you can feel free to create
+ such a link if you wish.
+ @item -r, --raw-filename
+@@ -161,7 +160,7 @@
+ @item -t, --force-manual-tag-table
+ forces manual detection of tag table. This allows you to view info
+ pages, which may be corrupted. (as i.e. version of jed's pages,
+-shipped with RH5.0). The tag table corruption ussualy appears in that
++shipped with RH5.0). The tag table corruption usualy appears in that
+ the info links, which you follow, move you to quite unexpected nodes.
+ @item --node=@var{nodename}, --node @var{nodename}
+ Go to the node @var{nodename} of info file. Since 0.6.7 it is also
+@@ -239,9 +238,9 @@
+ @cindex How to use it
+
+ Now let's move to the key definitions. Here we first put a key name
+-(again all keys are present in the example); then we enter it's value --
++(again all keys are present in the example); then we enter its value --
+ either surrounded by apostrophes, or a keycode number (like in
+- at var{KEY_REFRESH_1}), or its mnemonic code name if it's a special key
++ at var{KEY_REFRESH_1}), or its mnemonic code name if its a special key
+ (like i.e. in @var{KEY_FOLLOWLINK_1}).
+
+ If you wish to specify key by code value, use the supplied program
+@@ -284,10 +283,10 @@
+ Alternate key for repeating the last search.
+
+ @item KEY_GOTO_1
+-Key for explicitly going to a node (by specifing it's name).
++Key for explicitly going to a node (by specifing its name).
+
+ @item KEY_GOTO_2
+-Alternate key for explicitly going to a node (by specifing it's name).
++Alternate key for explicitly going to a node (by specifing its name).
+
+ @item KEY_PREVNODE_1
+ Key for going to a node marked as 'Prev' in the header. In manpage viewer
+@@ -443,7 +442,7 @@
+ this means a printable character c. The syntax is just like in C/C++ ;).
+
+ @item [number]
+-you can also specify key as it's code number. It is useful e.g. when
++you can also specify key as its code number. It is useful e.g. when
+ specifing control keys, and some nonstandard keys. A numerical value of
+ zero turns given keybinding off.
+
+@@ -703,8 +702,9 @@
+ @email{pborys@@zeus.polsl.gliwice.pl}, or
+ @email{pborys@@p-soft.silesia.linux.org.pl}.
+
+-There was also a lot of other people, who contributed to this code. See
+-the @file{AUTHORS} file.
++A lot of other people also contributed
++to this code.
++See the @file{AUTHORS} file.
+
+ Please send bug reports to the author: @value{AUTHOR} @value{CONTACT}.
+
Added: trunk/dports/textproc/pinfo/files/patch-src-datatypes.c.diff
===================================================================
--- trunk/dports/textproc/pinfo/files/patch-src-datatypes.c.diff (rev 0)
+++ trunk/dports/textproc/pinfo/files/patch-src-datatypes.c.diff 2012-08-07 02:38:08 UTC (rev 96281)
@@ -0,0 +1,11 @@
+--- src/datatypes.c.orig 2006-03-09 14:54:43.000000000 -0600
++++ src/datatypes.c 2012-08-06 01:51:24.000000000 -0500
+@@ -31,7 +31,7 @@
+ char *maileditor = "mail";
+ char *printutility = "lpr";
+ char *manlinks = "1:8:2:3:4:5:6:7:9:n:l:p:o:3X11:3Xt:3X:3x";
+-char *configuredinfopath = ".:/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info";
++char *configuredinfopath = ".:@PREFIX@/share/info:/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info";
+ char *ignoredmacros = 0;
+ char *rcfile = NULL;
+
Added: trunk/dports/textproc/pinfo/files/patch-src-filehandling_functions.c.diff
===================================================================
--- trunk/dports/textproc/pinfo/files/patch-src-filehandling_functions.c.diff (rev 0)
+++ trunk/dports/textproc/pinfo/files/patch-src-filehandling_functions.c.diff 2012-08-07 02:38:08 UTC (rev 96281)
@@ -0,0 +1,20 @@
+--- src/filehandling_functions.c.orig 2010-09-19 17:20:39.000000000 +0400
++++ src/filehandling_functions.c 2012-08-06 14:52:03.000000000 +0400
+@@ -200,7 +202,7 @@
+ }
+
+ /* if we haven't found anything, clean up and exit */
+- if (!goodHit)
++ if ( id && !goodHit )
+ {
+ fclose(id);
+ id = 0;
+@@ -742,7 +744,7 @@
+ int i, j;
+ char *tmpfilename;
+
+- if (strncmp(filename, "dir", 3) == 0)
++ if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3]))
+ {
+ xfree(buf);
+ return opendirfile(number);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120806/770d092f/attachment.html>
More information about the macports-changes
mailing list