[46129] trunk/dports/net/wget
ryandesign at macports.org
ryandesign at macports.org
Thu Jan 29 18:11:51 PST 2009
Revision: 46129
http://trac.macports.org/changeset/46129
Author: ryandesign at macports.org
Date: 2009-01-29 18:11:50 -0800 (Thu, 29 Jan 2009)
Log Message:
-----------
wget: Fix the fix from r46127; see #18269
* Don't patch wget.1, wget.info or wget.pod; these are generated from wget.texi
* Declare build dependency on makeinfo (used to make wget.info) and perl (used to make wget.pod which via pod2man makes wget.1)
* Also reinplace in ChangeLog
Modified Paths:
--------------
trunk/dports/net/wget/Portfile
trunk/dports/net/wget/files/patch-prefix.diff
Modified: trunk/dports/net/wget/Portfile
===================================================================
--- trunk/dports/net/wget/Portfile 2009-01-30 00:52:42 UTC (rev 46128)
+++ trunk/dports/net/wget/Portfile 2009-01-30 02:11:50 UTC (rev 46129)
@@ -4,7 +4,7 @@
name wget
version 1.11.4
-revision 1
+revision 2
categories net www
maintainers ryandesign
homepage http://www.gnu.org/software/wget/
@@ -29,6 +29,10 @@
configure.args \
--with-libssl-prefix=${prefix}
+depends_build \
+ bin:makeinfo:texinfo \
+ bin:pod2man:perl5
+
depends_lib \
port:openssl \
port:gettext
@@ -48,12 +52,10 @@
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
+ ${worksrcpath}/ChangeLog \
${worksrcpath}/README \
${worksrcpath}/NEWS \
${worksrcpath}/doc/sample.wgetrc \
- ${worksrcpath}/doc/wget.1 \
- ${worksrcpath}/doc/wget.info \
- ${worksrcpath}/doc/wget.pod \
${worksrcpath}/doc/wget.texi
}
Modified: trunk/dports/net/wget/files/patch-prefix.diff
===================================================================
--- trunk/dports/net/wget/files/patch-prefix.diff 2009-01-30 00:52:42 UTC (rev 46128)
+++ trunk/dports/net/wget/files/patch-prefix.diff 2009-01-30 02:11:50 UTC (rev 46129)
@@ -64,71 +64,9 @@
## Think well before you change them, since they may reduce wget's
## functionality, and make it behave contrary to the documentation:
##
---- doc/wget.1 2008-06-29 20:41:51.000000000 -0500
-+++ doc/wget.1 2009-01-29 17:41:25.000000000 -0600
-@@ -1729,9 +1729,9 @@
- \&\fIbelow\fR a certain hierarchy will be downloaded.
- .SH "FILES"
- .IX Header "FILES"
--.IP "\fB/usr/local/etc/wgetrc\fR" 4
--.IX Item "/usr/local/etc/wgetrc"
--Default location of the \fIglobal\fR startup file.
-+.IP "\fB at PREFIX@/etc/wgetrc\fR" 4
-+.IX Item "@PREFIX@/etc/wgetrc"
-+Location of the \fIglobal\fR startup file.
- .IP "\fB.wgetrc\fR" 4
- .IX Item ".wgetrc"
- User startup file.
---- doc/wget.info 2008-06-29 21:10:19.000000000 -0500
-+++ doc/wget.info 2009-01-29 17:40:44.000000000 -0600
-@@ -113,8 +113,7 @@
- * Most of the features are fully configurable, either through
- command line options, or via the initialization file `.wgetrc'
- (*note Startup File::). Wget allows you to define "global"
-- startup files (`/usr/local/etc/wgetrc' by default) for site
-- settings.
-+ startup files (`@PREFIX@/etc/wgetrc') for site settings.
-
- * Finally, GNU Wget is free software. This means that everyone may
- use it, redistribute it and/or modify it under the terms of the
-@@ -2211,9 +2210,7 @@
- ===================
-
- When initializing, Wget will look for a "global" startup file,
--`/usr/local/etc/wgetrc' by default (or some prefix other than
--`/usr/local', if Wget was not installed there) and read commands from
--there, if it exists.
-+`@PREFIX@/etc/wgetrc', and read commands from there, if it exists.
-
- Then it will look for the user's file. If the environmental variable
- `WGETRC' is set, Wget will try to load that file. Failing that, no
-@@ -2223,8 +2220,7 @@
-
- The fact that user's settings are loaded after the system-wide ones
- means that in case of collision user's wgetrc _overrides_ the
--system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist
--admins, away!
-+system-wide wgetrc (in `@PREFIX@/etc/wgetrc'). Fascist admins, away!
-
-
- File: wget.info, Node: Wgetrc Syntax, Next: Wgetrc Commands, Prev: Wgetrc Location, Up: Startup File
---- doc/wget.pod 2008-06-29 20:41:51.000000000 -0500
-+++ doc/wget.pod 2009-01-29 17:40:44.000000000 -0600
-@@ -1855,9 +1855,9 @@
- =over 4
-
-
--=item B</usr/local/etc/wgetrc>
-+=item B<@PREFIX@/etc/wgetrc>
-
--Default location of the I<global> startup file.
-+Location of the I<global> startup file.
-
-
- =item B<.wgetrc>
--- doc/wget.texi 2008-06-29 21:10:16.000000000 -0500
-+++ doc/wget.texi 2009-01-29 17:40:44.000000000 -0600
-@@ -191,12 +191,12 @@
++++ doc/wget.texi 2009-01-29 19:40:08.000000000 -0600
+@@ -191,13 +191,13 @@
Most of the features are fully configurable, either through command line
options, or via the initialization file @file{.wgetrc} (@pxref{Startup
File}). Wget allows you to define @dfn{global} startup files
@@ -139,10 +77,12 @@
@c man begin FILES
@table @samp
- at item /usr/local/etc/wgetrc
+-Default location of the @dfn{global} startup file.
+ at item @PREFIX@/etc/wgetrc
- Default location of the @dfn{global} startup file.
++Location of the @dfn{global} startup file.
@item .wgetrc
+ User startup file.
@@ -2516,9 +2516,7 @@
@cindex location of wgetrc
@@ -154,12 +94,14 @@
Then it will look for the user's file. If the environmental variable
@code{WGETRC} is set, Wget will try to load that file. Failing that, no
-@@ -2528,7 +2526,7 @@
+@@ -2528,8 +2526,8 @@
The fact that user's settings are loaded after the system-wide ones
means that in case of collision user's wgetrc @emph{overrides} the
-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default).
-+system-wide wgetrc (in @file{@PREFIX@/etc/wgetrc}).
- Fascist admins, away!
+-Fascist admins, away!
++system-wide wgetrc (in @file{@PREFIX@/etc/wgetrc}). Fascist admins,
++away!
@node Wgetrc Syntax
+ @section Wgetrc Syntax
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090129/01955691/attachment-0001.html>
More information about the macports-changes
mailing list