Ticket #12668: popt-1.12.diff
File popt-1.12.diff, 3.1 KB (added by nox@…, 17 years ago) |
---|
-
files/patch-popt.c
1 --- ./popt.c.orig 2007-06-14 15:31:10.000000000 +02002 +++ ./popt.c 2007-06-21 22:34:24.000000000 +02003 @@ -396,7 +396,7 @@4 if (!strchr(item->argv[0], '/') && con->execPath != NULL) {5 char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));6 if (s)7 - sprintf(s, "%s/%s", con->execPath, item->argv[-1]);8 + sprintf(s, "%s/%s", con->execPath, item->argv[0]);9 argv[argc] = s;10 } else11 argv[argc] = POPT_findProgramPath(item->argv[0]); -
files/patch-poptint.c
1 --- poptint.c.varargs 2007-06-17 13:09:50.000000000 -04002 +++ poptint.c 2007-06-17 13:11:54.000000000 -04003 @@ -97,10 +97,15 @@4 {5 char *buffer = NULL;6 char c;7 + va_list apc;8 +9 + va_copy(apc, ap); /* XXX linux amd64/ppc needs a copy. */10 11 buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);12 vsprintf (buffer, format, ap);13 14 + va_end(apc);15 +16 return buffer;17 }18 -
Portfile
3 3 PortSystem 1.0 4 4 5 5 name popt 6 version 1.11 7 revision 1 6 version 1.12 8 7 categories devel 9 8 maintainers n3npq@mac.com 10 9 description A getopt(3) like library with a number of enhancements 10 11 11 long_description popt is a command line parsing library. It contains a number of \ 12 12 enhancements over getopt(3), including being fully reentrant, allowing users to \ 13 13 alias command line arguments, providing convience functions for parsing strings \ … … 15 15 16 16 platforms darwin freebsd 17 17 18 homepage http://rpm5.org 19 master_sites ${homepage} /files/popt/18 homepage http://rpm5.org/ 19 master_sites ${homepage}files/popt/ 20 20 21 21 depends_lib port:gettext \ 22 22 port:libiconv 23 23 24 patchfiles patch-poptint.c patch-popt.c25 26 platform darwin {27 post-patch {28 file copy -force /usr/share/libtool/config.guess ${worksrcpath}/config.guess29 file copy -force /usr/share/libtool/config.sub ${worksrcpath}/config.sub30 }31 }32 33 configure.args --mandir=${prefix}/share/man --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix}34 35 destroot.args localedir=${prefix}/share/locale36 24 post-destroot { 37 25 file delete -force ${destroot}${prefix}/share/locale/locale.alias 38 26 file delete -force ${destroot}${prefix}/lib/charset.alias 27 28 set docdir ${prefix}/share/doc/${name}-${version} 29 xinstall -d ${destroot}${docdir} 30 xinstall -m 0644 -W ${worksrcpath} ABOUT-NLS CHANGES COPYING README \ 31 ${destroot}${docdir} 39 32 } 40 33 41 checksums md5 3c36cb9d40a46a3190369002f6cda984 34 test.run yes 35 test.target check 36 37 checksums md5 f45290e9ac4b1cf209d0042eb6755543 \ 38 sha1 113669bd952913307044ed67d8120a2d3e05626b \ 39 rmd160 95bd1960fd896df8f521fff2ea4c8570b2984eec 42 40 43 41 platform darwin 7 { 44 42 depends_build-append port:autoconf